refactor world rendering code

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index c7e2d42f0e57e0632e03f023e55b58f27087959a..23b1db0311dd68a53079e491f714f16bd94d1983 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -58,6 +58,7 @@
 #include "world_routes_ui.c"
 #include "particle.c"
 #include "player_effects.c"
+#include "freecam.c"
 
 static int k_tools_mode = 0;
 
@@ -97,6 +98,12 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   /* please forgive me! */
+   u32 sz; char *drm;
+   if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) )
+      if( !strcmp(drm, "blibby!") )
+         skaterift.demo_mode = 0;
+
    vg_loader_step( remote_players_init, NULL );
 
    if( k_tools_mode )
@@ -175,6 +182,8 @@ static void vg_load(void){
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
    vg_console_reg_cmd( "switch_active_instance", 
                         skaterift_switch_instance_cmd, NULL );
+   vg_console_reg_cmd( "fc", freecam_cmd, NULL );
+   vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 );
 
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
@@ -540,8 +549,16 @@ static void skaterift_composite_maincamera(void){
    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 );
+   if( skaterift.freecam ){
+      freecam_preupdate();
+      v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos );
+      v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles );
+      skaterift.cam.fov = skaterift.replay_freecam.fov;
+   }
+   else {
+      if( skaterift.activity == k_skaterift_replay ){
+         replay_get_camera( &skaterift.replay, &skaterift.cam );
+      }
    }
 
    skaterift.cam.nearz = 0.1f;