X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=2edd7dc5231a84d5fa148270f815b124dbeb2e2b;hb=a8ba9cc44e1ae9aeca62fb579a3105c625e59133;hp=9409bf33b8d5aac08b06b1d054ce2e104f590f38;hpb=ec90a4b46865009c1e1b1679f6926e35d2ee3f12;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 9409bf3..2edd7dc 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -15,6 +15,7 @@
 
 #define SR_NETWORKED
 #define VG_DEVWINDOW
+
 #include "common.h"
 #include "conf.h"
 #include "steam.h"
@@ -27,14 +28,14 @@
 #include "entity.c"
 #include "workshop.c"
 
-VG_STATIC struct player_avatar localplayer_avatar;
-VG_STATIC struct player_model  localplayer_models[3];
-VG_STATIC int skaterift_status = 0;
-
 #include "network.h"
 #include "menu.h"
 #include "vehicle.h"
 
+static struct player_avatar localplayer_avatar;
+static struct player_model  localplayer_models[3];
+
+
 int main( int argc, char *argv[] )
 {
    vg_mem.use_libc_malloc = 0;
@@ -80,12 +81,6 @@ VG_STATIC void load_playermodels(void)
    player_model_load( &localplayer_models[0], "models/ch_new.mdl" );
    player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" );
    player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" );
-   
-   /* load default board */
-#if 0
-   player_board_load( &localplayer_boards[0], 
-                      "models/boards/skaterift_fish.mdl" );
-#endif
 
    /* FIXME: hack */
    shader_model_character_view_register();
@@ -99,14 +94,16 @@ void temp_update_playermodel(void){
 
 VG_STATIC void async_skaterift_complete( void *payload, u32 size )
 {
-   skaterift_status = 1;
-
    localplayer.viewable_world = get_active_world();
    localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
+
+   skaterift_end_op();
 }
 
 VG_STATIC void vg_load(void)
 {
+   vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
+
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
    vg_loader_step( world_init, NULL );
@@ -128,7 +125,6 @@ VG_STATIC void vg_load(void)
    player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
    player__use_avatar( &localplayer, &localplayer_avatar );
    player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
-   //localplayer.board = &localplayer_boards[0];
    player__bind( &localplayer );
 
    /* --------------------- */
@@ -137,10 +133,8 @@ VG_STATIC void vg_load(void)
    vg_loader_step( audio_init, audio_free );
 
    /* 'systems' are completely loaded now */
-   /* load home world */
-
+   /* load home/permanent world */
    world_load( 0, "maps/mp_spawn.mdl" );
-   world_load( 1, "maps/mp_mtzero.mdl" );
 
    vg_console_load_autos();
    menu_link();
@@ -155,64 +149,65 @@ VG_STATIC void draw_origin_axis(void)
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
 
+static void skaterift_change_world_preupdate(void);
 VG_STATIC void vg_update(void)
 {
    steam_update();
-
    skaterift_preupdate_inputs();
+   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.async_op == k_async_op_world_preloading ){
+      skaterift_change_world_preupdate();
+   }
 
-   if( skaterift_status == 1 ){
-      draw_origin_axis();
-      network_update();
-      
-      player__pre_update( &localplayer );
-      global_skateshop_preupdate();
+   draw_origin_axis();
+   network_update();
+   
+   player__pre_update( &localplayer );
+   global_skateshop_preupdate();
 
-      world_update( get_active_world(), localplayer.rb.co );
-      audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
-      //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
-   }
+   world_update( get_active_world(), localplayer.rb.co );
+   audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
+   //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
 }
 
 VG_STATIC void vg_update_fixed(void)
 {
-   if( skaterift_status == 1 ){
-      world_routes_fixedupdate( get_active_world() );
+   if( skaterift.async_op == k_async_op_clientloading ) return;
 
-      player__update( &localplayer );
-      vehicle_update_fixed();
-   }
+   world_routes_fixedupdate( get_active_world() );
+   player__update( &localplayer );
+   vehicle_update_fixed();
 }
 
 VG_STATIC void vg_update_post(void)
 {
-   if( skaterift_status == 1 ){
-      player__post_update( &localplayer );
+   if( skaterift.async_op == k_async_op_clientloading ) return;
 
-      float dist;
-      int sample_index;
-      world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
+   player__post_update( &localplayer );
 
-      audio_lock();
-      vg_dsp.echo_distances[sample_index] = dist;
+   float dist;
+   int sample_index;
+   world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
 
-      v3f ears = { 1.0f,0.0f,0.0f };
-      m3x3_mulv( main_camera.transform, ears, ears );
-      v3_copy( ears, vg_audio.external_listener_ears );
-      v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
-
-      if( localplayer.gate_waiting ){
-         m4x3_mulv( localplayer.gate_waiting->transport,
-                    vg_audio.external_listener_pos, 
-                    vg_audio.external_listener_pos );
-      }
+   audio_lock();
+   vg_dsp.echo_distances[sample_index] = dist;
 
-      v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
-      audio_unlock();
+   v3f ears = { 1.0f,0.0f,0.0f };
+   m3x3_mulv( main_camera.transform, ears, ears );
+   v3_copy( ears, vg_audio.external_listener_ears );
+   v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
 
-      vg.time_rate = 1.0f-menu.factive;
-      vehicle_update_post();
+   if( localplayer.gate_waiting ){
+      m4x3_mulv( localplayer.gate_waiting->transport,
+                 vg_audio.external_listener_pos, 
+                 vg_audio.external_listener_pos );
    }
+
+   v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
+   audio_unlock();
+
+   vg.time_rate = 1.0f-menu.factive;
+   vehicle_update_post();
 }
 
 VG_STATIC void vg_framebuffer_resize( int w, int h )
@@ -296,7 +291,12 @@ VG_STATIC void render_scene(void)
       return;
    }
 
-   world_prerender( view_world );
+   for( u32 i=0; i<vg_list_size(world_global.worlds); i++ ){
+      if( world_global.worlds[i].status == k_world_status_loaded ){
+         world_prerender( &world_global.worlds[i] );
+      }
+   }
+
    render_world( view_world, &main_camera, 0 );
 
    render_water_texture( view_world, &main_camera, 0 );
@@ -354,7 +354,7 @@ VG_STATIC void render_main_game(void)
 
 VG_STATIC void vg_render(void)
 {
-   if( skaterift_status == 0 ){
+   if( skaterift.async_op == k_async_op_clientloading ){
       _vg_loader_render();
       return;
    }
@@ -382,9 +382,7 @@ VG_STATIC void vg_render(void)
 
 VG_STATIC void vg_gui(void)
 {
-   if( skaterift_status == 0 ){
-      return;
-   }
+   if( skaterift.async_op == k_async_op_clientloading ) return;
 
    menu_update();
    if( menu.active ){
@@ -401,6 +399,78 @@ VG_STATIC void vg_gui(void)
    render_view_framebuffer_ui();
 }
 
+static void async_skaterift_world_loaded( void *payload, u32 size )
+{
+   skaterift_end_op();
+}
+
+static void skaterift_world_changer_thread( void *data )
+{
+   const char *path = data;
+   world_load( 1, world_global.load_target );
+   vg_async_call( async_skaterift_world_loaded, NULL, 0 );
+}
+
+/* holding pattern before we can start loading the new world, since we might be
+ * waiting for audio to stop */
+static void skaterift_change_world_preupdate(void)
+{
+   for( u32 i=1; i<vg_list_size(world_global.worlds); i++ ){
+      world_instance *inst = &world_global.worlds[i];
+      
+      if( inst->status == k_world_status_unloading ){
+         if( world_freeable( inst ) ){
+            world_free( inst );
+         }
+         return;
+      }
+   }
+
+   vg_info( "worlds cleared, begining load\n" );
+   skaterift_shift_op( k_async_op_world_loading );
+
+   /* finally can start the loader */
+   vg_loader_start( skaterift_world_changer_thread, NULL );
+}
+
+/* places all loaded worlds into unloading state */
+static void skaterift_change_world( const char *world_path )
+{
+   vg_info( "switching to %s\n", world_path );
+
+   if( world_global.active_world != 0 ){
+      vg_error( "Cannot change worlds while in non-root world\n" );
+   }
+   else{
+      skaterift_begin_op( k_async_op_world_preloading );
+
+      vg_linear_clear( vg_mem.scratch );
+      world_global.load_target = vg_linear_alloc( vg_mem.scratch, 1024 );
+      vg_strncpy( world_path, world_global.load_target, 
+                  1024, k_strncpy_overflow_fatal );
+      
+      vg_info( "unloading old worlds\n" );
+      world_unlink_nonlocal( &world_global.worlds[0] );
+      
+      for( u32 i=1; i<vg_list_size(world_global.worlds); i++ ){
+         world_instance *inst = &world_global.worlds[i];
+
+         if( inst->status == k_world_status_loaded ){
+            inst->status = k_world_status_unloading;
+            world_fadeout_audio( inst );
+         }
+      }
+   }
+}
+
+static int skaterift_change_world_command( int argc, const char *argv[] )
+{
+   if( argc == 1 )
+      skaterift_change_world( argv[0] );
+
+   return 0;
+}
+
 #else
 
 #include "skaterift_imgui_dev.c"