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

diff --git a/skaterift.c b/skaterift.c
index e56a43a..983ca9b 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -13,7 +13,7 @@
 
 #if 1
 
-//#define SR_NETWORKED
+#define SR_NETWORKED
 
 #ifndef VG_RELEASE
  #define VG_DEVWINDOW
@@ -50,6 +50,7 @@
 #include "addon.c"
 #include "highscores.c"
 #include "save.c"
+#include "respawn.c"
 
 static struct player_avatar localplayer_avatar;
 
@@ -104,6 +105,9 @@ static void skaterift_restore_state(void){
    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;
@@ -111,21 +115,23 @@ static void skaterift_restore_state(void){
       /* 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;
    }
 
+   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;
@@ -143,7 +149,7 @@ static void skaterift_restore_state(void){
          };
          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();
       }
@@ -292,8 +298,10 @@ VG_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;
+   }
 
    vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
    vg.time_rate = vg_smoothstepf( skaterift.time_rate );
@@ -304,6 +312,7 @@ VG_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();
 }
 
 VG_STATIC void vg_fixed_update(void){
@@ -451,17 +460,28 @@ VG_STATIC void render_scene(void){
       }
    }
 
-   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;
@@ -479,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 );