its ot'

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index aa90b02bdc25d39d127155a874fc9971d668ff51..0219a66463261341751e391e2e6a14e3e7247121 100644 (file)
--- a/main.c
+++ b/main.c
@@ -90,7 +90,7 @@ static int playermodel( int argc, char const *argv[] )
 void vg_start(void)
 {
    vg_convar_push( (struct vg_convar){
-      .name = "freecam",
+      .name = "fc",
       .data = &freecam,
       .data_type = k_convar_dtype_i32,
       .opt_i32 = { .min=0, .max=1, .clamp=1 },
@@ -121,6 +121,14 @@ void vg_start(void)
       .persistent = 1
    });
 
+   vg_convar_push( (struct vg_convar){
+      .name = "dt",
+      .data = &ktimestep,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 0
+   });
+
    vg_convar_push( (struct vg_convar){
       .name = "debugcam",
       .data = &sv_debugcam,
@@ -146,13 +154,13 @@ void vg_start(void)
    
    init_other();
 
-   character_load( &player.mdl, "ch_mike" );
+   character_load( &player.mdl, "ch_default" );
    character_init_ragdoll( &player.mdl );
 
    world_load();
 
-   reset_player( 1, (const char *[]){ "tutorial" } );
-   player_transform_update();
+   reset_player( 1, (const char *[]){ "start" } );
+   rb_init( &player.rb );
 }
 
 void vg_free(void)
@@ -163,6 +171,14 @@ void vg_free(void)
 void vg_update(void)
 {
    player_update();
+   world_update();
+   //traffic_visualize( world.traffic, world.traffic_count );
+   //
+   /* TEMP */
+   if( glfwGetKey( vg_window, GLFW_KEY_J ))
+   {
+      v3_copy( player.camera_pos, world.mr_ball.co );
+   }
 }
 
 static void vg_framebuffer_resize( int w, int h )
@@ -181,7 +197,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 );
 
-   float speed = freecam? 0.0f: v3_length( player.v );
+   float speed = freecam? 0.0f: v3_length( player.rb.v );
    v3f shake = { vg_randf()-0.5f, vg_randf()-0.5f, vg_randf()-0.5f };
    v3_muls( shake, speed*0.01f, shake );