more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 357c59375710d67a9285b9e2c8ef250884935f99..25a89e652d9421c0a6a367e885334048dc9d58c1 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -13,7 +13,7 @@
 
 #if 1
 
-//#define SR_NETWORKED
+#define SR_NETWORKED
 
 #ifndef VG_RELEASE
  #define VG_DEVWINDOW
@@ -132,12 +132,11 @@ static void skaterift_restore_state(void){
       if( reg_id != 0xffffffff ){
          addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
 
-         world_loader.generate_point_cloud = 0;
-         world_loader.reg = reg;
-         world_loader.state = k_world_loader_load;
-         skaterift_world_changer_thread(NULL);
+         world_static.addon_client = reg;
+         world_static.load_state = k_world_loader_load;
+         skaterift_client_world_changer_thread(NULL);
 
-         world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 );
+         world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
          world_static.active_trigger_volume_count = 0;
          localplayer.viewable_world = world_current_instance();
 
@@ -189,16 +188,6 @@ VG_STATIC void vg_load(void){
    vg_loader_step( audio_init, audio_free );
 
    /* 'systems' are completely loaded now */
-   
-   /* load home/permanent world manually */
-   world_loader.reg = NULL;
-   strcpy( world_loader.override_name, "mp_spawn" );
-   world_loader.generate_point_cloud = 1;
-   world_loader.world_index = 0;
-   world_load_mdl( "maps/mp_spawn/main.mdl" );
-
-   vg_async_call( async_skaterift_player_start, NULL, 0 );
-   vg_async_stall();
 
    /* Completing addon registrations
     * -------------------------------------
@@ -234,6 +223,14 @@ VG_STATIC void vg_load(void){
       mtzero->metadata_len = msg.cur;
    }
 
+   /* load home/permanent world manually */
+   world_static.addon_hub = spawn;
+   world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+
+   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 */
@@ -262,7 +259,7 @@ VG_STATIC void draw_origin_axis(void){
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
-static void skaterift_change_world_preupdate(void);
+static void skaterift_change_client_world_preupdate(void);
 
 /* 
  * UPDATE LOOP
@@ -274,8 +271,8 @@ VG_STATIC void vg_pre_update(void){
    steam_update();
    skaterift_preupdate_inputs();
    if( skaterift.op == k_async_op_clientloading ) return;
-   if( world_loader.state == k_world_loader_preload )
-      skaterift_change_world_preupdate();
+   if( world_static.load_state == k_world_loader_preload )
+      skaterift_change_client_world_preupdate();
 
    draw_origin_axis();
    network_update();
@@ -429,9 +426,9 @@ VG_STATIC void render_scene(void){
       return;
    }
 
-   for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
-      if( world_static.worlds[i].status == k_world_status_loaded ){
-         world_prerender( &world_static.worlds[i] );
+   for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+      if( world_static.instances[i].status == k_world_status_loaded ){
+         world_prerender( &world_static.instances[i] );
       }
    }
 
@@ -480,12 +477,13 @@ VG_STATIC void skaterift_composite_maincamera(void){
 }
 
 VG_STATIC void render_main_game(void){
-   player__animate( &localplayer );
    if( skaterift.activity == k_skaterift_replay ){
       player__animate_from_replay( &localplayer, &skaterift.replay );
    }
-   else
+   else{
+      player__animate( &localplayer );
       skaterift_record_frame( &skaterift.replay, 0 );
+   }
    player__pre_render( &localplayer );
 
    skaterift_composite_maincamera();
@@ -508,8 +506,6 @@ VG_STATIC void render_main_game(void){
                                    it up with the oblique rendering inside the
                                    portals */
 
-   world_render_challenges( localplayer.viewable_world );
-
    /* continue with variable rate */
    render_scene_gate_subview();