X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=bfac7fd7fe2a93c7ac3d495778fa8f61fb1f5669;hb=0945c6c301e38138b6ac54a02d5b3aea602de526;hp=a747e6fc2caea0a1edc144c29de32b0538ef3a1d;hpb=e364c19156187c346c19295c0480062e57eb6d7c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/main.c b/main.c
index a747e6f..bfac7fd 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,14 @@ static int lightedit = 0;
 static int sv_scene = 0;
 
 /* 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"
@@ -93,6 +101,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,
@@ -173,6 +183,8 @@ void vg_start(void)
 
       reset_player( 1, (const char *[]){ "start" } );
       rb_init( &player.rb );
+
+      network_init();
    }
    else
    {
@@ -182,13 +194,19 @@ void vg_start(void)
 
 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 );
@@ -309,6 +327,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 +338,7 @@ void vg_render(void)
    {
       physics_test_render();
    }
+#endif
 }
 
 static void run_light_widget( struct light_widget *lw )
@@ -339,27 +359,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 +387,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;