X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=8c1ddef2811b537bcbec692426b676fa8f056ec7;hb=d045af680c6b8ca267a7aded69e2e510e659d2ab;hp=175f12efe879a4af4a8244c231bf57fd3f47117a;hpb=5ee174baa9b2c30e01dc0ca0dfa38f916f805636;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index 175f12e..8c1ddef 100644 --- a/main.c +++ b/main.c @@ -20,7 +20,7 @@ static int lightedit = 0; static int sv_scene = 0; /* Components */ -#define SR_NETWORKED +//#define SR_NETWORKED /* uncomment this to run the game without any graphics being drawn */ //#define SR_NETWORK_TEST @@ -119,6 +119,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, @@ -190,6 +198,7 @@ void vg_start(void) { physics_test_start(); } + } void vg_free(void) @@ -289,7 +298,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(); @@ -425,4 +434,40 @@ void vg_ui(void) render_update_lighting_ub(); } + + //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + render_world_routes_ui(); + //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + +#if 0 + static double last_b_press = 0.0; + + double localtime = vg_time - last_b_press; + + world_routes_ui_updatetime( 0, localtime ); + world_routes_ui_draw( 0, (v4f){ 1.0f,0.0f,1.0f,1.0f}, 9.0f ); + + if( glfwGetKey(vg_window,GLFW_KEY_B) ) + world_routes_ui_notch( 0, localtime ); + + if( vg_time-last_b_press > 1.0 ) + if( glfwGetKey(vg_window,GLFW_KEY_N) ) + { + last_b_press = vg_time; + world_routes_ui_newseg( 0 ); + } + + static double last_m_press; + if( vg_time-last_m_press > 1.0 ) + if( glfwGetKey( vg_window, GLFW_KEY_M) ) + { + last_m_press = vg_time; + + vg_info( "start: %u\n",world.routes.routes[0].ui.segment_count ); + for( int i=0; i