v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for fwk/v4k plugins

main
Dominik Madarász 2024-02-11 15:34:47 +01:00
parent f23b2b6e08
commit 86cbafa06c
6 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MAKE.bat
View File

@ -606,6 +606,9 @@ if "%1"=="addons[" (
shift shift
) else ( ) else (
set "addon_names=%1 %addon_names%" set "addon_names=%1 %addon_names%"
rem depot folder
if exist "depot\deps\%1" (
set "addon_includes=-Idepot\deps\%1 %addon_includes%" set "addon_includes=-Idepot\deps\%1 %addon_includes%"
if exist "depot\deps\%1\%1.cpp" ( if exist "depot\deps\%1\%1.cpp" (
set "addons=depot\deps\%1\%1.cpp %addons%" set "addons=depot\deps\%1\%1.cpp %addons%"
@ -615,6 +618,23 @@ if "%1"=="addons[" (
if exist "depot\deps\%1\include" ( if exist "depot\deps\%1\include" (
set "addon_includes=-Idepot\deps\%1\include %addon_includes%" set "addon_includes=-Idepot\deps\%1\include %addon_includes%"
) )
)
if exist "plugins\%1" (
set "addon_includes=-Iplugins\%1 %addon_includes%"
if exist "plugins\%1\%1.cpp" (
set "addons=plugins\%1\%1.cpp %addons%"
) else (
set "addons=plugins\%1\%1.c %addons%"
)
if exist "plugins\%1\plugin.cpp" (
set "addons=plugins\%1\plugin.cpp %addons%"
) else (
set "addons=plugins\%1\plugin.c %addons%"
)
if exist "plugins\%1\include" (
set "addon_includes=-Iplugins\%1\include %addon_includes%"
)
)
shift && goto parse_addons shift && goto parse_addons
) )
) )

2
bind/v4k.lua
View File

@ -681,9 +681,9 @@ typedef struct font_metrics_t {
void font_goto(float x, float y); void font_goto(float x, float y);
vec2 font_print(const char *text); vec2 font_print(const char *text);
vec2 font_clip(const char *text, vec4 rect); vec2 font_clip(const char *text, vec4 rect);
const char* font_wrap(const char *text, float max_width);
vec2 font_rect(const char *text); vec2 font_rect(const char *text);
font_metrics_t font_metrics(const char *text); font_metrics_t font_metrics(const char *text);
const char* font_wrap(const char *text, float max_width);
void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords);
vec2 font_highlight(const char *text, const void *colors); vec2 font_highlight(const char *text, const void *colors);
void ui_font(); void ui_font();

2
engine/fwk.h 100644
View File

@ -0,0 +1,2 @@
// compatibility header for fwk plugins
#include "v4k.h"

4
engine/joint/v4k.h
View File

@ -16147,10 +16147,12 @@ API vec2 font_xy();
API void font_goto(float x, float y); API void font_goto(float x, float y);
API vec2 font_print(const char *text); API vec2 font_print(const char *text);
API vec2 font_clip(const char *text, vec4 rect); API vec2 font_clip(const char *text, vec4 rect);
API const char* font_wrap(const char *text, float max_width);
API vec2 font_rect(const char *text); API vec2 font_rect(const char *text);
API font_metrics_t font_metrics(const char *text); API font_metrics_t font_metrics(const char *text);
// utilities
API const char* font_wrap(const char *text, float max_width);
// syntax highlighting // syntax highlighting
API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result. API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result.
API vec2 font_highlight(const char *text, const void *colors); API vec2 font_highlight(const char *text, const void *colors);

4
engine/split/v4k_font.h
View File

@ -90,10 +90,12 @@ API vec2 font_xy();
API void font_goto(float x, float y); API void font_goto(float x, float y);
API vec2 font_print(const char *text); API vec2 font_print(const char *text);
API vec2 font_clip(const char *text, vec4 rect); API vec2 font_clip(const char *text, vec4 rect);
API const char* font_wrap(const char *text, float max_width);
API vec2 font_rect(const char *text); API vec2 font_rect(const char *text);
API font_metrics_t font_metrics(const char *text); API font_metrics_t font_metrics(const char *text);
// utilities
API const char* font_wrap(const char *text, float max_width);
// syntax highlighting // syntax highlighting
API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result. API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result.
API vec2 font_highlight(const char *text, const void *colors); API vec2 font_highlight(const char *text, const void *colors);

4
engine/v4k.h
View File

@ -2214,10 +2214,12 @@ API vec2 font_xy();
API void font_goto(float x, float y); API void font_goto(float x, float y);
API vec2 font_print(const char *text); API vec2 font_print(const char *text);
API vec2 font_clip(const char *text, vec4 rect); API vec2 font_clip(const char *text, vec4 rect);
API const char* font_wrap(const char *text, float max_width);
API vec2 font_rect(const char *text); API vec2 font_rect(const char *text);
API font_metrics_t font_metrics(const char *text); API font_metrics_t font_metrics(const char *text);
// utilities
API const char* font_wrap(const char *text, float max_width);
// syntax highlighting // syntax highlighting
API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result. API void* font_colorize(const char *text, const char *comma_types, const char *comma_keywords); // comma separated tokens. expensive, please cache result.
API vec2 font_highlight(const char *text, const void *colors); API vec2 font_highlight(const char *text, const void *colors);