X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=6e94231edd9d0e4407ec530225170bafbf2e60cb;hb=1361a6d6ffda17feca6395beccf269763d3a76fa;hp=535205c3837715d93cf112a91c91a6ddd0e9a42c;hpb=4f4458d229e40a852708319861224b7cc48ad0b9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index 535205c..6e94231 100644 --- a/main.c +++ b/main.c @@ -17,10 +17,10 @@ vg_tex2d tex_water = { .path = "textures/water.qoi" }; static int debugview = 0; static int sv_debugcam = 0; static int lightedit = 0; -static int sv_scene = 0; +static int sv_scene = 2; /* Components */ -#define SR_NETWORKED +//#define SR_NETWORKED /* uncomment this to run the game without any graphics being drawn */ //#define SR_NETWORK_TEST @@ -47,6 +47,7 @@ static int sv_scene = 0; #include "shaders/unlit.h" #include "physics_test.h" +#include "anim_test.h" void vg_register(void) { @@ -119,6 +120,14 @@ void vg_start(void) .persistent = 1 }); + vg_convar_push( (struct vg_convar){ + .name = "fcs", + .data = &fc_speed, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + vg_convar_push( (struct vg_convar){ .name = "ledit", .data = &lightedit, @@ -186,11 +195,14 @@ void vg_start(void) network_init(); } - else + else if( sv_scene == 1 ) { physics_test_start(); } - + else if( sv_scene == 2 ) + { + anim_test_start(); + } } void vg_free(void) @@ -222,6 +234,10 @@ void vg_update(void) { physics_test_update(); } + else if( sv_scene == 2 ) + { + anim_test_update(); + } } static void vg_framebuffer_resize( int w, int h ) @@ -290,7 +306,7 @@ static void render_main_game(void) { m4x4_projection( vg_pv, gpipeline.fov, (float)vg_window_x / (float)vg_window_y, - 0.04f, 600.0f ); + 0.01f, 600.0f ); m4x4_mul( vg_pv, world_4x4, vg_pv ); } draw_player(); @@ -339,6 +355,10 @@ void vg_render(void) { physics_test_render(); } + else if( sv_scene == 2 ) + { + anim_test_render(); + } #endif }