challenge effects

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 5804a3d647c3604072989d5e6a6b236fe6cc92ae..9b90548c3f64a28f4e62949ce5c83f77b7d240cd 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -13,7 +13,7 @@
 
 #if 1
 
-#define SR_NETWORKED
+//#define SR_NETWORKED
 
 #ifndef VG_RELEASE
  #define VG_DEVWINDOW
@@ -143,15 +143,17 @@ 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();
+      }
+
+      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 );
-      }
    }
 }
 
@@ -297,7 +299,7 @@ VG_STATIC void vg_pre_update(void){
    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 );
@@ -467,8 +469,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 );
@@ -507,6 +509,19 @@ VG_STATIC void render_main_game(void){
 
    /* --------------------------------------------------------------------- */
 
+   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 );