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

diff --git a/skaterift.c b/skaterift.c
index 1d71132..8ed749c 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -37,7 +37,6 @@
 #include "network.h"
 #include "menu.h"
 #include "vehicle.h"
-#include "pointcloud.h"
 #include "save.h"
 #include "player_remote.h"
 
@@ -57,36 +56,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 +66,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 +90,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 );
 }
 
@@ -124,8 +108,7 @@ static void load_playermodels(void){
 }
 
 static void async_skaterift_player_start( void *payload, u32 size ){
-   localplayer.viewable_world = world_current_instance();
-   localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
+   world_switch_instance(0);
 }
 
 static void async_call_ready( void *payload, u32 size ){
@@ -168,6 +151,8 @@ static void skaterift_restore_state(void){
       addon_cache_create_viewer( k_addon_type_player, player_reg_id );
 
    kvsav.cur = orig;
+
+#if 0
    if( vg_msg_seekframe( &kvsav, "world" ) ){
       addon_alias q;
 
@@ -195,14 +180,21 @@ static void skaterift_restore_state(void){
       if( v3_length2(pos) > 1.0f )
          player__setpos( pos );
    }
+#endif
 }
 
 static void vg_load(void){
-   vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
+   if( k_tools_mode ){
+      vg_async_call( async_call_ready, NULL, 0 );
+      return;
+   }
+
+   vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
+   vg_console_reg_cmd( "switch_active_instance", 
+                        skaterift_switch_instance_cmd, NULL );
 
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
-   vg_loader_step( pointcloud_init, NULL );
    vg_loader_step( world_init, NULL );
    vg_loader_step( vehicle_init, NULL );
    vg_loader_step( font3d_init, NULL );
@@ -225,14 +217,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();
@@ -248,6 +233,11 @@ static void vg_load(void){
     * -------------------------------------
     */
 
+   /* hub world */
+   addon_reg *hub = 
+      addon_mount_local_addon( "maps/dev_hub", k_addon_type_world, ".mdl" );
+   hub->metadata_len = 0;
+
    /* understate diy. */
    addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
                                                 k_addon_type_world, 
@@ -278,20 +268,16 @@ static void vg_load(void){
 
    /* load home/permanent world manually */
    world_static.load_state = k_world_loader_load;
+
    struct world_load_args args = {
       .purpose = k_world_purpose_hub,
-      .reg = spawn
+      .reg = hub
    };
    skaterift_world_load_thread( &args );
 
    vg_async_call( async_skaterift_player_start, NULL, 0 );
    vg_async_stall();
 
-
-   global_skateshop.selected_world_id=1;
-   global_skateshop.pointcloud_world_id=1;
-   skateshop_world_preview_loader_thread( mtzero ); /* HACK */
-
    vg_console_load_autos();
    menu_link();
 
@@ -323,10 +309,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();
@@ -345,6 +332,7 @@ static void vg_pre_update(void){
    vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
    vg.time_rate = vg_smoothstepf( skaterift.time_rate );
    
+   /* TODO: how can we compress this? */
    player__pre_update();
    world_entity_focus_preupdate();
    skaterift_replay_pre_update();
@@ -356,6 +344,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 +353,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 +470,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){
@@ -504,12 +493,15 @@ static void render_scene(void){
    if( skaterift.activity == k_skaterift_respawning ){
       glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
       glClearColor( 0.624f, 0.659f, 0.769f, 0.0f );
+      glClearColor( 0.824f, 0.0f, 0.1f, 0.0f );
       glClear( GL_COLOR_BUFFER_BIT );
       glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, 
                                     GL_COLOR_ATTACHMENT1 } );
+#if 0
       view_world = &world_static.instances[respawn_chooser.world_id];
       render_world_override( view_world );
       render_world_routes( view_world, &skaterift.cam, 1 );
+#endif
    }
    else{
       render_world( view_world, &skaterift.cam, 0 );
@@ -517,7 +509,9 @@ static void render_scene(void){
       render_fb_bind( gpipeline.fb_main, 1 );
       render_water_surface( view_world, &skaterift.cam );
       render_remote_players( view_world, &skaterift.cam );
+      ent_miniworld_render( view_world );
    }
+
 }
 
 static void render_scene_gate_subview(void){
@@ -584,14 +578,6 @@ static void render_main_game(void){
    world_instance *view_world = localplayer.viewable_world;
    if( (view_world != NULL) && (skaterift.activity != k_skaterift_respawning) ){
       render_world_cubemaps( view_world );
-
-      ent_gate *gate = view_world->rendering_gate;
-      if( gate ){
-         if( gate->flags & k_ent_gate_nonlocal ){
-            world_instance *dest = &world_static.instances[ gate->target ];
-            render_world_cubemaps( dest );
-         }
-      }
    }
 
    /* variable res target */
@@ -616,23 +602,18 @@ static void render_main_game(void){
    /* composite */
    present_view_with_post_processing();
 
-   /* --------------------------------------------------------------------- */
-
-   /* capture the current resume frame at the very last point */
-   if( button_down( k_srbind_reset ) ){
-      if( skaterift.activity == k_skaterift_default ){
-         skaterift.activity = k_skaterift_replay;
-         skaterift_record_frame( &skaterift.replay, 1 );
-         if( skaterift.replay.head ){
-            skaterift.replay.cursor = skaterift.replay.head->time;
-            skaterift.replay.cursor_frame = skaterift.replay.head;
-         }
-         skaterift.replay_control = k_replay_control_scrub;
-      }
-   }
+   skaterift_replay_post_render();
 }
 
 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 +655,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 );
+   }
 }