X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=7da7109f0afb0ff4952cd8629d73369fa091836a;hb=70ff4a83e5a4b35436388d9bb999c939559ac23f;hp=254c80df27e6a28700d52ed788bdf2b657408ac3;hpb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 254c80d..7da7109 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -151,36 +151,6 @@ static void skaterift_restore_state(void){
       addon_cache_create_viewer( k_addon_type_player, player_reg_id );
 
    kvsav.cur = orig;
-
-#if 0
-   if( vg_msg_seekframe( &kvsav, "world" ) ){
-      addon_alias q;
-
-      /* world */
-      skaterift_read_addon_alias( &kvsav, "alias", k_addon_type_world, &q );
-      u32 reg_id = addon_match( &q );
-      if( reg_id != 0xffffffff ){
-         addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
-
-         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_set_active_instance( vg_msg_getkvu32( &kvsav, "index", 0 ) );
-         world_static.active_trigger_volume_count = 0;
-         localplayer.viewable_world = world_current_instance();
-      }
-
-      v3f pos;
-      vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} );
-
-      if( v3_length2(pos) > 1.0f )
-         player__setpos( pos );
-   }
-#endif
 }
 
 static void vg_load(void){
@@ -325,7 +295,7 @@ static void vg_pre_update(void){
    /* time rate */
    f32 target = 1;
    if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
-                             k_skaterift_respawning) ) {
+                             k_skaterift_respawning) ){
       target = 0;
    }
 
@@ -483,6 +453,34 @@ static void render_scene(void){
       }
    }
 
+   if( skaterift.activity == k_skaterift_respawning ){
+      world_instance *world = world_current_instance();
+      glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
+      
+      v3f bg;
+      v3_muls( world->ub_lighting.g_daysky_colour,
+                  world->ub_lighting.g_day_phase - 
+                  world->ub_lighting.g_sunset_phase*0.1f, bg );
+
+      v3_muladds( bg, world->ub_lighting.g_sunset_colour,
+                  (1.0f-0.5f)*world->ub_lighting.g_sunset_phase, bg );
+
+      v3_muladds( bg, world->ub_lighting.g_nightsky_colour,
+                  (1.0f-world->ub_lighting.g_day_phase), bg );
+
+      glClearColor( bg[0], bg[1], bg[2], 0.0f );
+      glClear( GL_COLOR_BUFFER_BIT );
+      glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, 
+                                    GL_COLOR_ATTACHMENT1 } );
+
+      m4x3f identity;
+      m4x3_identity( identity );
+      render_world_override( world, world, identity, &skaterift.cam, 
+                             respawn_chooser.spawn, 1.0f );
+      render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
+      return;
+   }
+
    render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 );
 
    world_instance *holdout_world = NULL;
@@ -531,6 +529,12 @@ 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;
+   }
+
    if( global_miniworld.transition ){
       f32 dt = vg.time_frame_delta / 2.0f,
           s  = vg_signf( global_miniworld.transition );
@@ -545,12 +549,6 @@ static void skaterift_composite_maincamera(void){
       }
    }
 
-   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 );
    camera_update_view( &skaterift.cam );
    camera_update_projection( &skaterift.cam );
@@ -571,7 +569,8 @@ static void render_main_game(void){
    skaterift_composite_maincamera();
 
    /* --------------------------------------------------------------------- */
-   render_world_cubemaps( world_current_instance() );
+   if( skaterift.activity != k_skaterift_respawning )
+      render_world_cubemaps( world_current_instance() );
 
    /* variable res target */
    render_fb_bind( gpipeline.fb_main, 1 );
@@ -590,7 +589,8 @@ static void render_main_game(void){
                                    portals */
 
    /* continue with variable rate */
-   if( !global_miniworld.transition ){
+   if( !global_miniworld.transition && 
+         (skaterift.activity != k_skaterift_respawning) ){
       render_fb_bind( gpipeline.fb_main, 1 );
       render_world_gates( world_current_instance(), &skaterift.cam );
    }
@@ -652,10 +652,8 @@ static void vg_gui(void){
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-
    if( skaterift.activity == k_skaterift_respawning ){
-      remote_players_imgui_world( world_current_instance(), vg.pv, 
-                                  2000.0f, 0 );
+      remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
       remote_players_imgui_lobby();
    }
    else {