diff --git a/MAKE.bat b/MAKE.bat index 8fa272b..fdcdafd 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -824,29 +824,21 @@ rem !echo! workbench && !cc! !o! workbench.exe workbench\workbench.c -Iworkbench rem demos if "!demos!"=="yes" ( -!echo! 00-ui && !cc! !o! 00-ui.exe demos\00-ui.c !import! !args! || set rc=1 -!echo! 00-script && !cc! !o! 00-script.exe demos\00-script.c !import! !args! || set rc=1 -!echo! 00-hello && !cc! !o! 00-hello.exe demos\00-hello.c !import! !args! || set rc=1 -!echo! 01-sprite && !cc! !o! 01-sprite.exe demos\01-sprite.c !import! !args! || set rc=1 -!echo! 01-demo2d && !cc! !o! 01-demo2d.exe demos\01-demo2d.c !import! !args! || set rc=1 -!echo! 01-easing && !cc! !o! 01-easing.exe demos\01-easing.c !import! !args! || set rc=1 -!echo! 01-font && !cc! !o! 01-font.exe demos\01-font.c !import! !args! || set rc=1 -!echo! 02-ddraw && !cc! !o! 02-ddraw.exe demos\02-ddraw.c !import! !args! || set rc=1 -!echo! 02-frustum && !cc! !o! 02-frustum.exe demos\02-frustum.c !import! !args! || set rc=1 -!echo! 03-anims && !cc! !o! 03-anims.exe demos\03-anims.c !import! !args! || set rc=1 -!echo! 04-actor && !cc! !o! 04-actor.exe demos\04-actor.c !import! !args! || set rc=1 -!echo! 04-lod && !cc! !o! 04-lod.exe demos\04-lod.c !import! !args! || set rc=1 -!echo! 05-scene && !cc! !o! 05-scene.exe demos\05-scene.c !import! !args! || set rc=1 -!echo! 06-controller && !cc! !o! 06-controller.exe demos\06-controller.c !import! !args! || set rc=1 -!echo! 06-material && !cc! !o! 06-material.exe demos\06-material.c !import! !args! || set rc=1 -!echo! 07-network && !cc! !o! 07-network.exe demos\07-network.c !import! !args! || set rc=1 -!echo! 07-netsync && !cc! !o! 07-netsync.exe demos\07-netsync.c !import! !args! || set rc=1 -!echo! 08-audio && !cc! !o! 08-audio.exe demos\08-audio.c !import! !args! || set rc=1 -!echo! 08-video && !cc! !o! 08-video.exe demos\08-video.c !import! !args! || set rc=1 -!echo! 09-cubemap && !cc! !o! 09-cubemap.exe demos\09-cubemap.c !import! !args! || set rc=1 -!echo! 09-shadertoy && !cc! !o! 09-shadertoy.exe demos\09-shadertoy.c !import! !args! || set rc=1 + for %%f in ("demos\??-*") do ( + set "fname=%%~nf" + echo !fname!| findstr /R "^[0-9][0-9]-" >nul && ( + if not "!fname:~0,2!"=="99" ( + set limport=!import! + >nul find "V4K_IMPLEMENTATION" "demos\!fname!.c" && ( + set limport= + ) + !echo! !fname! && !cc! !o! !fname!.exe "demos\!fname!.c" !limport! !args! || set rc=1 + ) + ) + ) ) + rem lab if "!lab!"=="yes" ( for %%f in ("demos\99-*") do ( diff --git a/demos/99-splines.c b/demos/99-splines.c index 6ae9adf..75909d6 100644 --- a/demos/99-splines.c +++ b/demos/99-splines.c @@ -12,7 +12,7 @@ int main() { curve_add(&cv, vec3(cos(t*TO_RAD)*5,0,sin(t*TO_RAD)*5)); } int num_points = 11; // beware with these: 8,11,17,20,61,100,200 - curve_finish(&cv, num_points); + curve_end(&cv, num_points); while(window_swap() && !input_down(KEY_ESC)) { // fps camera @@ -44,7 +44,7 @@ int main() { ddraw_sphere(pos, 0.5); if( ui_panel("Path",PANEL_OPEN)) { - if(ui_int("Points", &num_points)) { if(num_points < 6) num_points = 6; curve_finish(&cv, num_points); } + if(ui_int("Points", &num_points)) { if(num_points < 6) num_points = 6; curve_end(&cv, num_points); } if(ui_int("Delay", &delay)) { if(delay <= 0) delay = 1; } ui_panel_end(); }