X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=2ae90c83a42ec35dcc8baf079723951e1745353b;hb=6a4dafa6fe9a3dd4bb88698bbe964154364390ec;hp=e053c42177fb515e180930775d1c2486e251b948;hpb=d57b7661518800479c00300ce57407378696eec9;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/main.c b/main.c
index e053c42..2ae90c8 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,17 @@ 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
+
+/* uncomment this to run the game without any graphics being drawn */
+//#define SR_NETWORK_TEST
+
+#include "steam.h"
+#include "network.h"
+
 #include "road.h"
 #include "scene.h"
 #include "ik.h"
@@ -39,6 +47,7 @@ static int sv_scene = 0;
 #include "shaders/unlit.h"
 
 #include "physics_test.h"
+#include "anim_test.h"
 
 void vg_register(void)
 {
@@ -46,6 +55,7 @@ void vg_register(void)
    shader_standard_register();
    shader_vblend_register();
    shader_unlit_register();
+   shader_viewchar_register();
 
    world_register();
    character_register();
@@ -93,6 +103,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 +121,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,
@@ -166,29 +186,41 @@ void vg_start(void)
 
    if( sv_scene == 0 )
    {
-      character_load( &player.mdl, "ch_outlaw" );
+      character_load( &player.mdl, "ch_default" );
       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();
 }
 
 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 +235,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 )
@@ -231,7 +267,7 @@ static void render_main_game(void)
    gpipeline.fov = freecam? 60.0f: 135.0f; /* 120 */
    m4x4_projection( vg_pv, gpipeline.fov, 
          (float)vg_window_x / (float)vg_window_y, 
-         0.1f, 2100.0f );
+         0.02f, 2100.0f );
 
    m4x4_mul( vg_pv, world_4x4, vg_pv );
 
@@ -240,20 +276,15 @@ static void render_main_game(void)
    /* 
     * Draw world
     */
-
+   
    render_world( vg_pv, player.camera );
    render_water_texture( player.camera );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    render_water_surface( vg_pv, player.camera );
 
-   vg_tex2d_bind( &tex_water, 1 );
-
-   for( int i=0; i<world.gate_count; i++ )
-   {
-      render_gate( &world.gates[i], player.camera );
-   }
-
+   vg_tex2d_bind( &tex_water, 1 ); /*TODO: ?*/
+   render_world_gates( vg_pv, player.camera );
    
    /* Copy the RGB of what we have into the background buffer */
    glBindFramebuffer( GL_READ_FRAMEBUFFER, 0 );
@@ -276,7 +307,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();
@@ -314,6 +345,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 )
@@ -324,6 +356,11 @@ void vg_render(void)
    {
       physics_test_render();
    }
+   else if( sv_scene == 2 )
+   {
+      anim_test_render( &tex_pallet );
+   }
+#endif
 }
 
 static void run_light_widget( struct light_widget *lw )
@@ -344,27 +381,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 );
       }
    }
@@ -373,8 +409,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;
@@ -409,4 +447,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<world.routes.routes[0].ui.segment_count; i++ )
+            world_routes_ui_popfirst(0);
+
+         vg_info( "new: %u\n",world.routes.routes[0].ui.segment_count );
+      }
+#endif
 }