X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=c2fc2664d0263c16d33f66e4c40d9452da4f2652;hb=dbbdf411d1aaf70cb995c3371cfae37fd0b7dbcc;hp=25a89e652d9421c0a6a367e885334048dc9d58c1;hpb=844527ec68c063d78d4993bd8e4053f9ddc47b78;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 25a89e6..c2fc266 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -63,7 +63,7 @@ int main( int argc, char *argv[] ){
 VG_STATIC void vg_launch_opt(void){}
 
 VG_STATIC void vg_preload(void){
-   skaterift_read_savedata();
+   //skaterift_read_savedata();
 
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
@@ -95,34 +95,43 @@ static void async_call_ready( void *payload, u32 size ){
 }
 
 static void skaterift_restore_state(void){
-   vg_msg sav = {0};
-   sav.buf = savedata.buf;
-   sav.len = savedata.len;
-   sav.max = sizeof(savedata.buf);
+   savedata_file sav;
+   strcpy( sav.path, str_skaterift_main_save );
+   savedata_file_read( &sav );
 
-   vg_msg player = sav;
+   vg_msg kvsav = {0};
+   kvsav.buf = sav.buf;
+   kvsav.len = sav.len;
+   kvsav.max = sizeof(sav.buf);
+
+   u32 board_reg_id = 0,
+       player_reg_id = 0;
+
+   vg_msg player = kvsav;
    if( vg_msg_seekframe( &player, "player", 0 ) ){
       addon_alias q;
 
       /* board */
       skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q );
       u32 reg_id = addon_match( &q );
-      if( reg_id != 0xffffffff ){
-         localplayer.board_view_slot = 
-            addon_cache_create_viewer( k_addon_type_board, reg_id );
-      }
+      if( reg_id != 0xffffffff ) 
+         board_reg_id = reg_id;
+
 
       /* playermodel */
       skaterift_read_addon_alias( &player, "playermodel", 
                                   k_addon_type_player, &q );
       reg_id = addon_match( &q );
-
-      if( reg_id == 0xffffffff ) reg_id = 0;
-      localplayer.playermodel_view_slot = 
-         addon_cache_create_viewer( k_addon_type_player, reg_id );
+      if( reg_id != 0xffffffff ) 
+         player_reg_id = reg_id;
    }
 
-   vg_msg world = sav;
+   localplayer.board_view_slot = 
+      addon_cache_create_viewer( k_addon_type_board, board_reg_id );
+   localplayer.playermodel_view_slot = 
+      addon_cache_create_viewer( k_addon_type_player, player_reg_id );
+
+   vg_msg world = kvsav;
    if( vg_msg_seekframe( &world, "world", 0 ) ){
       addon_alias q;
 
@@ -132,19 +141,24 @@ static void skaterift_restore_state(void){
       if( reg_id != 0xffffffff ){
          addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
 
-         world_static.addon_client = reg;
          world_static.load_state = k_world_loader_load;
-         skaterift_client_world_changer_thread(NULL);
+         struct world_load_args args = {
+            .purpose = k_world_purpose_client,
+            .reg = reg
+         };
+         skaterift_world_load_thread( &args );
 
-         world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
+         world_set_active_instance( vg_msg_seekkvu32( &world, "index", 0 ) );
          world_static.active_trigger_volume_count = 0;
          localplayer.viewable_world = world_current_instance();
+      }
+
+      vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+      v3f pos;
+      vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
 
-         vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
-         v3f pos;
-         vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+      if( v3_length2(pos) > 1.0f )
          player__setpos( &localplayer, pos );
-      }
    }
 }
 
@@ -224,8 +238,12 @@ VG_STATIC void vg_load(void){
    }
 
    /* load home/permanent world manually */
-   world_static.addon_hub = spawn;
-   world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+   world_static.load_state = k_world_loader_load;
+   struct world_load_args args = {
+      .purpose = k_world_purpose_hub,
+      .reg = spawn
+   };
+   skaterift_world_load_thread( &args );
 
    vg_async_call( async_skaterift_player_start, NULL, 0 );
    vg_async_stall();
@@ -248,7 +266,7 @@ VG_STATIC void vg_load(void){
 
    /* and now */
    skaterift_restore_state();
-   vg_loader_step( NULL, skaterift_write_savedata );
+   vg_loader_step( NULL, skaterift_autosave_synchronous );
 
    board_processview_thread(NULL);
    vg_async_call( async_call_ready, NULL, 0 );
@@ -286,7 +304,7 @@ VG_STATIC void vg_pre_update(void){
    vg.time_rate = vg_smoothstepf( skaterift.time_rate );
    
    player__pre_update( &localplayer );
-   global_skateshop_preupdate();
+   world_entity_focus_preupdate();
    skaterift_replay_pre_update();
 
    world_update( world_current_instance(), localplayer.rb.co );
@@ -328,6 +346,12 @@ VG_STATIC void vg_post_update(void){
    audio_unlock();
 
    vehicle_update_post();
+
+   if( vg.time - skaterift.last_autosave > 20.0 ){
+      if( skaterift_autosave(1) ){
+         skaterift.last_autosave = vg.time;
+      }
+   }
 }
 
 /*
@@ -450,8 +474,8 @@ VG_STATIC void render_scene_gate_subview(void){
 }
 
 VG_STATIC void skaterift_composite_maincamera(void){
-   camera_lerp( &localplayer.cam, &global_skateshop.cam, 
-                vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
+   camera_lerp( &localplayer.cam, &world_static.focus_cam,
+                vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
 
    if( skaterift.activity == k_skaterift_replay ){
       skaterift_get_replay_camera( &skaterift.cam );
@@ -490,6 +514,19 @@ VG_STATIC void render_main_game(void){
 
    /* --------------------------------------------------------------------- */
 
+   world_instance *view_world = localplayer.viewable_world;
+   if( view_world != NULL ){
+      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 */
    render_fb_bind( gpipeline.fb_main, 1 );
    glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );