basic animation

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index 4610d5288ff09b88247b14901aaa440b13e6bad7..6e94231edd9d0e4407ec530225170bafbf2e60cb 100644 (file)
--- 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,12 +195,14 @@ void vg_start(void)
 
       network_init();
    }
-   else
+   else if( sv_scene == 1 )
    {
       physics_test_start();
    }
-
-   world_routes_ui_newseg( 0, 0.0f );
+   else if( sv_scene == 2 )
+   {
+      anim_test_start();
+   }
 }
 
 void vg_free(void)
@@ -223,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 )
@@ -291,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();
@@ -340,6 +355,10 @@ void vg_render(void)
    {
       physics_test_render();
    }
+   else if( sv_scene == 2 )
+   {
+      anim_test_render();
+   }
 #endif
 }
 
@@ -427,13 +446,18 @@ 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 );
+   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 );
@@ -442,7 +466,7 @@ void vg_ui(void)
       if( glfwGetKey(vg_window,GLFW_KEY_N) )
       {
          last_b_press = vg_time;
-         world_routes_ui_newseg( 0, localtime );
+         world_routes_ui_newseg( 0 );
       }
 
    static double last_m_press;
@@ -450,6 +474,12 @@ void vg_ui(void)
       if( glfwGetKey( vg_window, GLFW_KEY_M) )
       {
          last_m_press = vg_time;
-         world_routes_ui_popfirst(0);
+
+         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
 }