basic features of replay editor

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index d295ccfd04bae45c092dc22d1ce078efda7072d7..4f86538fde095c96866194887c2fca26d6acf398 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -22,6 +22,7 @@
 #include "render.h"
 #include "vg/vg_opt.h"
 #include "vg/vg_loader.h"
+#include "vg/vg_io.h"
 
 #include "world.h"
 
@@ -132,8 +133,8 @@ static void skaterift_restore_state(void)
    vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach );
    skaterift.achievements |= ach;
 
-   u32 board_reg_id = 0,
-       player_reg_id = 0;
+   u32 board_reg_id = time(NULL) % addon_count( k_addon_type_board, 0 ),
+       player_reg_id = (time(NULL)+44) % addon_count( k_addon_type_player, 0 );
 
    vg_msg_cursor orig = kvsav.cur;
    if( vg_msg_seekframe( &kvsav, "player" ) ){
@@ -187,12 +188,8 @@ static void skaterift_load_world_content(void){
    skaterift_world_load_thread( &args );
 }
 
-static void skaterift_load_player_content(void){
-   u32 bytes = 1024*1024*10;
-   player_replay.local.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
-   player_replay.local.size = bytes;
-   replay_clear( &player_replay.local );
-
+static void skaterift_load_player_content(void)
+{
    particle_alloc( &particles_grind, 300 );
    particle_alloc( &particles_env, 200 );
 
@@ -212,7 +209,6 @@ void vg_load(void)
    vg_audio.always_keep_compressed = 1;
 
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, 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 );
@@ -230,12 +226,13 @@ void vg_load(void)
    vg_loader_step( workshop_init, NULL );
    vg_loader_step( skateshop_init, NULL );
    vg_loader_step( ent_tornado_init, NULL );
+   vg_loader_step( skaterift_replay_init, NULL );
    vg_loader_step( skaterift_load_player_content, NULL );
 
    /* --------------------- */
 
    vg_bake_shaders();
-   vg_loader_step( audio_init, audio_free );
+   vg_loader_step( audio_init, NULL );
 
    /* 'systems' are completely loaded now */
 
@@ -287,12 +284,13 @@ void vg_pre_update(void)
    if( k_tools_mode ) return;
 
    steam_update();
+   skaterift_change_client_world_preupdate();
+
    if( skaterift.op == k_async_op_clientloading ) return;
-   if( world_static.load_state == k_world_loader_preload )
-      skaterift_change_client_world_preupdate();
 
    draw_origin_axis();
-   skateshop_autostart_loading();
+   addon_system_pre_update();
+   skateshop_world_preview_preupdate();
    network_update();
 
    /* time rate */
@@ -546,19 +544,23 @@ static void render_scene(void){
    render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 );
 }
 
-static void skaterift_composite_maincamera(void){
+static void skaterift_composite_maincamera(void)
+{
    vg_camera_lerp( &localplayer.cam, &world_static.focus_cam,
                 vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
 
-   if( player_replay.freecam ){
-      freecam_preupdate();
-      v3_copy( player_replay.replay_freecam.pos, skaterift.cam.pos );
-      v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles );
-      skaterift.cam.fov = player_replay.replay_freecam.fov;
-   }
-   else {
-      if( skaterift.activity == k_skaterift_replay ){
-         replay_get_camera( &player_replay.local, &skaterift.cam );
+   if( skaterift.activity == k_skaterift_replay )
+   {
+      if( player_replay.use_freecam )
+      {
+         freecam_preupdate();
+         v3_copy( player_replay.replay_freecam.pos, skaterift.cam.pos );
+         v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles );
+         skaterift.cam.fov = player_replay.replay_freecam.fov;
+      }
+      else
+      {
+         skaterift_get_replay_cam( &skaterift.cam );
       }
    }
 
@@ -779,3 +781,4 @@ void vg_gui(void)
 #include "world_volumes.c"
 #include "world_water.c"
 #include "ent_npc.c"
+#include "model.c"