X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=e639d05eb0deade48ee1cab867f830fe6d903967;hb=5bfb36032928ba9f8d12e72961af68bfab9ea648;hp=b06db689de4648c2c0217f9b9d16d468ea00d1c5;hpb=6c84fa207dec2cf8e92b3882492bdd2f92ee7afe;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index b06db68..e639d05 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -14,7 +14,10 @@
 #if 1
 
 #define SR_NETWORKED
-#define VG_DEVWINDOW
+
+#ifndef VG_RELEASE
+ #define VG_DEVWINDOW
+#endif
 
 /* 
  *     system headers
@@ -60,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" );
@@ -92,12 +95,16 @@ 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 kvsav = {0};
+   kvsav.buf = sav.buf;
+   kvsav.len = sav.len;
+   kvsav.max = sizeof(sav.buf);
 
-   vg_msg player = sav;
+   vg_msg player = kvsav;
    if( vg_msg_seekframe( &player, "player", 0 ) ){
       addon_alias q;
 
@@ -119,7 +126,7 @@ static void skaterift_restore_state(void){
          addon_cache_create_viewer( k_addon_type_player, reg_id );
    }
 
-   vg_msg world = sav;
+   vg_msg world = kvsav;
    if( vg_msg_seekframe( &world, "world", 0 ) ){
       addon_alias q;
 
@@ -129,20 +136,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_static.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 );
-      }
    }
 }
 
@@ -169,7 +180,7 @@ VG_STATIC void vg_load(void){
    vg_loader_step( load_playermodels, NULL );
   
    /* player setup */
-   u32 bytes = (1024*1024*1)/2;
+   u32 bytes = 1024*1024*10;
    skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
    skaterift.replay.size = bytes;
    replay_clear( &skaterift.replay );
@@ -186,16 +197,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
     * -------------------------------------
@@ -231,6 +232,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 */
@@ -248,7 +261,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 );
@@ -259,7 +272,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
@@ -271,8 +284,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();
@@ -282,7 +295,7 @@ VG_STATIC void vg_pre_update(void){
    if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) 
       target = 0;
 
-   vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * 6.0f );
+   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 );
@@ -328,6 +341,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;
+      }
+   }
 }
 
 /*
@@ -358,6 +377,24 @@ VG_STATIC void present_view_with_post_processing(void){
                                      (vg.time_frame_delta*60.0) );
       shader_blitblur_uInverseRatio( inverse );
 
+      inverse[0] -= 0.0001f;
+      inverse[1] -= 0.0001f;
+      shader_blitblur_uClampUv( inverse );
+
+      static f64 effect_time = 133.0;
+      effect_time += vg.time_frame_delta;
+      shader_blitblur_uTime( effect_time );
+
+      f32 glitch_strength = 0.0f;
+      if( skaterift.activity == k_skaterift_replay ){
+         glitch_strength = 0.005f;
+         if( skaterift.replay_control == k_replay_control_play )
+            glitch_strength = 0.005f;
+         else 
+            glitch_strength += 0.005f*skaterift.track_velocity;
+      }
+      shader_blitblur_uGlitchStrength( glitch_strength );
+
       v2f override;
       if( skaterift.activity == k_skaterift_menu )
          v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
@@ -393,16 +430,10 @@ VG_STATIC void render_player_transparent(void){
    camera_finalize( &small_cam );
 
    /* Draw player to window buffer and blend background ontop */
-   glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-   glViewport( 0,0, vg.window_x, vg.window_y );
    player__render( &small_cam, &localplayer );
 }
 
 VG_STATIC void render_scene(void){
-   render_fb_bind( gpipeline.fb_main, 1 );
-   glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
-   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
-
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
 
@@ -414,9 +445,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] );
       }
    }
 
@@ -442,10 +473,7 @@ VG_STATIC void skaterift_composite_maincamera(void){
                 vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
 
    if( skaterift.activity == k_skaterift_replay ){
-      camera temp;
-      replay_get_camera( &skaterift.replay, &temp );
-      camera_lerp( &skaterift.cam, &temp, 1.0f-skaterift.time_rate,
-                   &skaterift.cam );
+      skaterift_get_replay_camera( &skaterift.cam );
    }
 
    skaterift.cam.nearz = 0.1f;
@@ -468,30 +496,66 @@ 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
-      player_record_replay_frame( &localplayer, &skaterift.replay, 0 );
+   else{
+      player__animate( &localplayer );
+      skaterift_record_frame( &skaterift.replay, 0 );
+   }
    player__pre_render( &localplayer );
 
    skaterift_composite_maincamera();
 
-   render_scene();
+   /* --------------------------------------------------------------------- */
+
+   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 );
+   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
 
+   render_scene();
    glEnable( GL_DEPTH_TEST );
 
-   render_player_transparent();
+   /* full res target */
+   glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+   glViewport( 0,0, vg.window_x, vg.window_y );
+
+   render_player_transparent(); /* needs to read the depth buffer before we fuck
+                                   it up with the oblique rendering inside the
+                                   portals */
+
+   /* continue with variable rate */
    render_scene_gate_subview();
 
+   /* 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;
-         player_record_replay_frame( &localplayer, &skaterift.replay, 1 );
+         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;
       }
    }
 }