X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=edbfb23fa3829ab7d4b0a419f44a0306e703935f;hb=9c0893a71497912deecdcd84dff9afbeac32f8f4;hp=1d7113265d590f539274dee6357ff25cc4652d32;hpb=6b036c10d38e7d691eb0bc06c29235b450c3ff10;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 1d71132..edbfb23 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -57,36 +57,9 @@
 #include "player_remote.c"
 #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,14 +67,22 @@ 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){
-   //skaterift_read_savedata();
-
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -110,9 +91,13 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   vg_loader_step( remote_players_init, NULL );
+
+   if( k_tools_mode )
+      return;
+
    steam_init();
    vg_loader_step( NULL, steam_end );
-   vg_loader_step( remote_players_init, NULL );
    vg_loader_step( network_init, network_end );
 }
 
@@ -198,6 +183,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 );
@@ -225,14 +215,7 @@ static void vg_load(void){
    skaterift.replay.size = bytes;
    replay_clear( &skaterift.replay );
 
-   player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
-   player__use_avatar( &localplayer_avatar );
-
-   /* FIXME FIXME FIXME FIXME FIXME */
-   u32 mtx_size = sizeof(m4x3f)*localplayer_avatar.sk.bone_count;
-   localplayer.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size );
-   netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory, 
-                                           mtx_size*NETWORK_MAX_PLAYERS );
+   player_load_animation_reference( "models/ch_none.mdl" );
 
    player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind();
@@ -323,10 +306,14 @@ static void skaterift_change_client_world_preupdate(void);
  * ---------------------------------------------------------------------------*/
 
 static void vg_pre_update(void){
-   srinput.enabled = 1;
+   if( !netplayers.chatting ) /* FIXME */
+      srinput.enabled = 1;
 
-   steam_update();
    skaterift_preupdate_inputs();
+
+   if( k_tools_mode ) return;
+
+   steam_update();
    if( skaterift.op == k_async_op_clientloading ) return;
    if( world_static.load_state == k_world_loader_preload )
       skaterift_change_client_world_preupdate();
@@ -356,6 +343,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 +352,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();
@@ -480,7 +469,6 @@ static void render_player_transparent(void){
 
    /* Draw player to window buffer and blend background ontop */
    player__render( &small_cam );
-   render_remote_players_tags( localplayer.viewable_world, &skaterift.cam );
 }
 
 static void render_scene(void){
@@ -633,6 +621,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 +670,17 @@ static void vg_gui(void){
    workshop_form_gui();
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
+
+
+   if( skaterift.activity == k_skaterift_respawning ){
+      remote_players_imgui_world( world_current_instance(), vg.pv, 
+                                  2000.0f, 0 );
+      remote_players_imgui_lobby();
+   }
+   else {
+      remote_players_chat_imgui(); /* TODO: conditional */
+      remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
+   }
 }