X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=983ca9ba99c5fddc1b7d112fa7d36b5053ecf259;hb=f252ecb6f870260e0e944579ef732b94d1ed0ebe;hp=9781920b88c596e41265a37b633c4b6651db38b8;hpb=f48c3935c01da796b7ecb011a42d6576788b7648;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 9781920..983ca9b 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -50,6 +50,7 @@
 #include "addon.c"
 #include "highscores.c"
 #include "save.c"
+#include "respawn.c"
 
 static struct player_avatar localplayer_avatar;
 
@@ -63,7 +64,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 +96,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,20 +142,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_loader.generate_point_cloud = 0;
-         world_loader.reg = reg;
-         world_loader.state = k_world_loader_load;
-         skaterift_world_changer_thread(NULL);
+         world_static.load_state = k_world_loader_load;
+         struct world_load_args args = {
+            .purpose = k_world_purpose_client,
+            .reg = reg
+         };
+         skaterift_world_load_thread( &args );
 
-         world_static.active_world = 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 );
-      }
    }
 }
 
@@ -189,16 +203,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 +238,18 @@ VG_STATIC void vg_load(void){
       mtzero->metadata_len = msg.cur;
    }
 
+   /* 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
+   };
+   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 */
@@ -251,7 +267,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 );
@@ -262,7 +278,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,26 +290,29 @@ 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();
 
    /* time rate */
    f32 target = 1;
-   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) 
+   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
+                             k_skaterift_respawning) ) {
       target = 0;
+   }
 
    vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
    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 );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+   respawn_chooser_pre_update();
 }
 
 VG_STATIC void vg_fixed_update(void){
@@ -331,6 +350,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;
+      }
+   }
 }
 
 /*
@@ -429,23 +454,34 @@ 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] );
       }
    }
 
-   render_world( view_world, &skaterift.cam, 0 );
-
-   render_water_texture( view_world, &skaterift.cam, 0 );
-   render_fb_bind( gpipeline.fb_main, 1 );
-   render_water_surface( view_world, &skaterift.cam );
+   if( skaterift.activity == k_skaterift_respawning ){
+      glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
+      glClearColor( 0.624f, 0.659f, 0.769f, 0.0f );
+      glClear( GL_COLOR_BUFFER_BIT );
+      glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, 
+                                    GL_COLOR_ATTACHMENT1 } );
+      view_world = &world_static.instances[respawn_chooser.world_id];
+      render_world_override( view_world );
+   }
+   else{
+      render_world( view_world, &skaterift.cam, 0 );
+      render_water_texture( view_world, &skaterift.cam, 0 );
+      render_fb_bind( gpipeline.fb_main, 1 );
+      render_water_surface( view_world, &skaterift.cam );
+   }
 }
 
 VG_STATIC void render_scene_gate_subview(void){
    render_fb_bind( gpipeline.fb_main, 1 );
    world_instance *view_world = localplayer.viewable_world;
    if( !view_world ) return; /* ??? */
+   if( skaterift.activity == k_skaterift_respawning ) return;
 
    int depth = 1;
    if( localplayer.gate_waiting ) depth = 0;
@@ -453,8 +489,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 );
@@ -463,15 +499,23 @@ VG_STATIC void skaterift_composite_maincamera(void){
    skaterift.cam.nearz = 0.1f;
    skaterift.cam.farz  = 2100.0f;
 
+   if( skaterift.activity == k_skaterift_respawning ){
+      camera_copy( &respawn_chooser.cam, &skaterift.cam );
+      skaterift.cam.nearz = 4.0f;
+      skaterift.cam.farz  = 3100.0f;
+   }
+
    camera_update_transform( &skaterift.cam );
 
-   if( localplayer.gate_waiting ){
-      m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, 
-                skaterift.cam.transform );
-   }
-   else{
-      m3x3_mul( localplayer.basis, skaterift.cam.transform, 
-                skaterift.cam.transform );
+   if( skaterift.activity != k_skaterift_respawning ){
+      if( localplayer.gate_waiting ){
+         m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, 
+                   skaterift.cam.transform );
+      }
+      else{
+         m3x3_mul( localplayer.basis, skaterift.cam.transform, 
+                   skaterift.cam.transform );
+      }
    }
    
    camera_update_view( &skaterift.cam );
@@ -480,18 +524,32 @@ 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();
 
    /* --------------------------------------------------------------------- */
 
+   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 );
@@ -508,8 +566,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();