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

diff --git a/skaterift.c b/skaterift.c
index 011fa26..7da7109 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -294,7 +294,8 @@ static void vg_pre_update(void){
 
    /* 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;
    }
 
@@ -310,6 +311,7 @@ static void vg_pre_update(void){
 
    world_update( world_current_instance(), localplayer.rb.co );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+   respawn_chooser_pre_update();
 }
 
 static void vg_fixed_update(void){
@@ -451,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;
@@ -499,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 );
@@ -533,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 );
@@ -552,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 );
    }
@@ -614,8 +652,14 @@ static void vg_gui(void){
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-   remote_players_chat_imgui(); /* TODO: conditional */
-   remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
+   if( skaterift.activity == k_skaterift_respawning ){
+      remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
+      remote_players_imgui_lobby();
+   }
+   else {
+      remote_players_chat_imgui(); /* TODO: conditional */
+      remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
+   }
 }