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

update editor

main
Dominik Madarász 2023-10-27 09:43:43 +02:00
parent b8b1043aad
commit 036f0cce09
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/labs.osc/MAKE.bat
View File

@ -16,14 +16,12 @@
exit /b exit /b
) )
cl ..\editor2.c -I ..\..\tools -DCOOK_ON_DEMAND if not exist "*.zip" ..\..\..\tools\cook --cook-ini=..\..\cook.ini
pushd ..\.. && call make amalgamation && popd
taskkill /im "oscedit.exe" > nul 2> nul taskkill /im "oscedit.exe" > nul 2> nul
call ..\..\tools\tcc oscgame.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* call ..\..\..\tools\tcc oscgame.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
call ..\..\tools\tcc oscsend.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* call ..\..\..\tools\tcc oscsend.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
call ..\..\tools\tcc oscedit.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* && start oscedit.exe call ..\..\..\tools\tcc oscedit.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* && start oscedit.exe
timeout 3 timeout 3

2
tools/editor/labs.osc/oscedit.h
View File

@ -215,7 +215,7 @@ void osc_edit_sync(int server_fd, int client_fd, unsigned timeout_ms) {
ui_window_end(); ui_window_end();
} }
ui_demo(); ui_demo(0);
} }
} }

2
tools/editor/labs.osc/oscrecv.h
View File

@ -42,7 +42,7 @@ typedef struct osc_message {
const char *s[8]; // for blobs and strings const char *s[8]; // for blobs and strings
float f[8]; // floating point interpretation of first 8 params float f[8]; // floating point interpretation of first 8 params
#else #else
union variant { union /*variant*/ {
int64_t i; int64_t i;
const char *s; const char *s;
double f; double f;