X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=7495ff34d9b5368422934a50063a89a64c2d8cdc;hb=ba5f879f85b9cab1e2b37241399d79709fe4f584;hp=a747e6fc2caea0a1edc144c29de32b0538ef3a1d;hpb=91d035f4845a6f9f62487b43e5142c4148e7f047;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index a747e6f..7495ff3 100644 --- a/main.c +++ b/main.c @@ -18,19 +18,27 @@ static int debugview = 0; static int sv_debugcam = 0; static int lightedit = 0; static int sv_scene = 0; +static int cl_ui = 1; /* Components */ -#include "road.h" +#define SR_NETWORKED + +/* uncomment this to run the game without any graphics being drawn */ +//#define SR_NETWORK_TEST + +#include "steam.h" +#include "network.h" + +#include "model.h" +//#include "road.h" #include "scene.h" -#include "ik.h" +//#include "ik.h" #include "audio.h" -#include "terrain.h" -#include "character.h" +//#include "terrain.h" +//#include "character.h" #include "ragdoll.h" #include "rigidbody.h" #include "render.h" -#include "gate.h" -#include "water.h" #include "world.h" #include "player.h" @@ -39,6 +47,10 @@ static int sv_scene = 0; #include "shaders/unlit.h" #include "physics_test.h" +#include "anim_test.h" + +#include "gate.h" +#include "water.h" void vg_register(void) { @@ -76,6 +88,7 @@ vg_tex2d *texture_list[] = int main( int argc, char *argv[] ) { + highscores_init( 2000, 50 ); vg_init( argc, argv, "Voyager Game Engine" ); } @@ -93,6 +106,8 @@ static int playermodel( int argc, char const *argv[] ) void vg_start(void) { + steam_init(); + vg_convar_push( (struct vg_convar){ .name = "fc", .data = &freecam, @@ -109,6 +124,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, @@ -117,6 +140,14 @@ void vg_start(void) .persistent = 1 }); + vg_convar_push( (struct vg_convar){ + .name = "cl_ui", + .data = &cl_ui, + .data_type = k_convar_dtype_i32, + .opt_i32 = { .min=0, .max=1, .clamp=1 }, + .persistent = 1 + }); + vg_convar_push( (struct vg_convar){ .name = "walk_speed", .data = &k_walkspeed, @@ -125,6 +156,38 @@ void vg_start(void) .persistent = 1 }); + vg_convar_push( (struct vg_convar){ + .name = "run_speed", + .data = &k_runspeed, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + + vg_convar_push( (struct vg_convar){ + .name = "walk_accel", + .data = &k_walk_accel, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + + vg_convar_push( (struct vg_convar){ + .name = "rd_floaty", + .data = &k_ragdoll_floatyiness, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + + vg_convar_push( (struct vg_convar){ + .name = "rd_floatd", + .data = &k_ragdoll_floatydrag, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + vg_convar_push( (struct vg_convar){ .name = "dt", .data = &ktimestep, @@ -166,29 +229,44 @@ void vg_start(void) if( sv_scene == 0 ) { - character_load( &player.mdl, "ch_default" ); + character_load( &player.mdl, "ch_new" ); character_init_ragdoll( &player.mdl ); world_load(); reset_player( 1, (const char *[]){ "start" } ); rb_init( &player.rb ); + + network_init(); } - else + else if( sv_scene == 1 ) { physics_test_start(); } + else if( sv_scene == 2 ) + { + anim_test_start(); + } } void vg_free(void) { + network_end(); vg_tex2d_free( texture_list, vg_list_size(texture_list) ); + /* TODO: THE REST OF THE GOD DAMN FREEING STUFF */ + steam_end(); + + highscores_serialize_all(); + highscores_free(); } void vg_update(void) { + steam_update(); + if( sv_scene == 0 ) { + network_update(); player_update(); world_update(); //traffic_visualize( world.traffic, world.traffic_count ); @@ -203,6 +281,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 ) @@ -228,7 +310,7 @@ static void render_main_game(void) m4x4f world_4x4; m4x3_expand( player.camera_inverse, world_4x4 ); - gpipeline.fov = freecam? 60.0f: 135.0f; /* 120 */ + gpipeline.fov = freecam? 60.0f: 125.0f; /* 120 */ m4x4_projection( vg_pv, gpipeline.fov, (float)vg_window_x / (float)vg_window_y, 0.02f, 2100.0f ); @@ -240,8 +322,12 @@ static void render_main_game(void) /* * Draw world */ + + int draw_solid = player.is_dead | freecam; render_world( vg_pv, player.camera ); + if( draw_solid ) + draw_player(); render_water_texture( player.camera ); glBindFramebuffer( GL_FRAMEBUFFER, 0 ); @@ -267,14 +353,14 @@ static void render_main_game(void) else glClear( GL_COLOR_BUFFER_BIT ); - if( !player.is_dead ) + if( !draw_solid ) { 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(); } - draw_player(); /* Draw back in the background * @@ -309,6 +395,7 @@ void vg_render(void) glClearColor( 0.11f, 0.35f, 0.37f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT ); +#ifndef SR_NETWORK_TEST draw_origin_axis(); if( sv_scene == 0 ) @@ -319,6 +406,11 @@ void vg_render(void) { physics_test_render(); } + else if( sv_scene == 2 ) + { + anim_test_render( &tex_characters ); + } +#endif } static void run_light_widget( struct light_widget *lw ) @@ -339,27 +431,26 @@ static void run_light_widget( struct light_widget *lw ) } } -void vg_ui(void) +static void run_debug_info(void) { - char buf[20]; - -#if 0 - snprintf( buf, 20, "%.2fm/s", v3_length( player.v ) ); + char buf[40]; + + snprintf( buf, 40, "%.2fm/s", v3_length( player.rb.v ) ); gui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left ); - snprintf( buf, 20, "%.2f %.2f %.2f m/s", + snprintf( buf, 40, "%.2f %.2f %.2f m/s", player.a[0], player.a[1], player.a[2] ); gui_text( (ui_px [2]){ 0, 20 }, buf, 1, k_text_align_left ); - snprintf( buf, 20, "pos %.2f %.2f %.2f", - player.co[0], player.co[1], player.co[2] ); + snprintf( buf, 40, "pos %.2f %.2f %.2f", + player.rb.co[0], player.rb.co[1], player.rb.co[2] ); gui_text( (ui_px [2]){ 0, 40 }, buf, 1, k_text_align_left ); if( vg_gamepad_ready ) { for( int i=0; i<6; i++ ) { - snprintf( buf, 20, "%.2f", vg_gamepad.axes[i] ); + snprintf( buf, 40, "%.2f", vg_gamepad.axes[i] ); gui_text( (ui_px [2]){ 0, (i+3)*20 }, buf, 1, k_text_align_left ); } } @@ -368,8 +459,10 @@ void vg_ui(void) gui_text( (ui_px [2]){ 0, 60 }, "Gamepad not ready", 1, k_text_align_left ); } -#endif - +} + +void vg_ui(void) +{ if( lightedit ) { ui_global_ctx.cursor[0] = 10; @@ -404,4 +497,46 @@ void vg_ui(void) render_update_lighting_ub(); } + + //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + if( cl_ui ) + { + render_world_routes_ui(); + } + //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + + audio_debug_soundscapes(); + world_audio_debug(); + +#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