initial gui for remote players lobby

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 1d7113265d590f539274dee6357ff25cc4652d32..0e1f85221bbb9cd8abbcb03c1992af2e822664b9 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -58,35 +58,9 @@
 #include "vg/vg_audio_dsp.h"
 
 static struct player_avatar localplayer_avatar;
+static int k_tools_mode = 0;
 
 int main( int argc, char *argv[] ){
-#if 0
-   u8 buf[ 512 ];
-   bitpack_ctx ctx = {
-      .buffer = buf,
-      .buffer_len = 512,
-      .bytes = 0,
-      .mode = k_bitpack_compress
-   };
-
-   v4f q = {  0.388, -0.565, 0.515, 0.515 };
-   vg_info( "q: %f %f %f %f\n", q[0], q[1], q[2], q[3] );
-
-   /* compress */
-   bitpack_qquat( &ctx, q );
-
-   vg_info( "compressed bytes: %u\n", ctx.bytes );
-
-   /* decompress */
-   ctx.bytes = 0;
-   ctx.mode = k_bitpack_decompress;
-
-   bitpack_qquat( &ctx, q );
-   vg_info( "q: %f %f %f %f\n", q[0], q[1], q[2], q[3] );
-
-   return 0;
-#endif
-
    vg_mem.use_libc_malloc = 0;
    vg_set_mem_quota( 160*1024*1024 );
    vg_enter( argc, argv, "Voyager Game Engine" ); 
@@ -94,9 +68,19 @@ int main( int argc, char *argv[] ){
 }
 
 static void vg_launch_opt(void){
+   const char *arg;
    if( vg_long_opt( "noauth" ) ){
       network_client.auth_mode = eServerModeNoAuthentication;
    }
+
+   if( (arg = vg_long_opt_arg( "server" )) ){
+      vg_strncpy( arg, network_client.server_adress, 64, 
+                  k_strncpy_overflow_fatal );
+   }
+
+   if( vg_long_opt( "tools" ) ){
+      k_tools_mode = 1;
+   }
 }
 
 static void vg_preload(void){
@@ -110,6 +94,9 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   if( k_tools_mode )
+      return;
+
    steam_init();
    vg_loader_step( NULL, steam_end );
    vg_loader_step( remote_players_init, NULL );
@@ -198,6 +185,11 @@ static void skaterift_restore_state(void){
 }
 
 static void vg_load(void){
+   if( k_tools_mode ){
+      vg_async_call( async_call_ready, NULL, 0 );
+      return;
+   }
+
    vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
 
    vg_loader_step( render_init, NULL );
@@ -324,9 +316,11 @@ static void skaterift_change_client_world_preupdate(void);
 
 static void vg_pre_update(void){
    srinput.enabled = 1;
+   skaterift_preupdate_inputs();
+
+   if( k_tools_mode ) return;
 
    steam_update();
-   skaterift_preupdate_inputs();
    if( skaterift.op == k_async_op_clientloading ) return;
    if( world_static.load_state == k_world_loader_preload )
       skaterift_change_client_world_preupdate();
@@ -356,6 +350,7 @@ static void vg_pre_update(void){
 }
 
 static void vg_fixed_update(void){
+   if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
    world_routes_fixedupdate( world_current_instance() );
@@ -364,6 +359,7 @@ static void vg_fixed_update(void){
 }
 
 static void vg_post_update(void){
+   if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
    player__post_update();
@@ -633,6 +629,14 @@ static void render_main_game(void){
 }
 
 static void vg_render(void){
+   if( k_tools_mode ){
+      glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+      glViewport( 0,0, vg.window_x, vg.window_y );
+      glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
+      glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
+      return;
+   }
+
    if( skaterift.op == k_async_op_clientloading ){
       _vg_loader_render();
       return;
@@ -674,6 +678,7 @@ static void vg_gui(void){
    workshop_form_gui();
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
+   remote_players_imgui();
 }