X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=inline;f=skaterift.c;h=8543f6a4e864566749d6e1cf39b830fa8ca35e08;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=fee0039dc2c05dcea491e3c64f261f87521f058c;hpb=a109f126d8adab622e38fbcc2d4281e75255246a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index fee0039..8543f6a 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -20,8 +20,9 @@
 #include "skaterift.h"
 #include "steam.h"
 #include "render.h"
-#include "audio.h"
 #include "vg/vg_opt.h"
+#include "vg/vg_loader.h"
+#include "vg/vg_io.h"
 
 #include "world.h"
 
@@ -33,28 +34,24 @@
 #include "vehicle.h"
 #include "save.h"
 #include "player_remote.h"
-
-/*    unity build
- * ----------------- */
-
-#include "world.c"
-#include "player.c"
-#include "vehicle.c"
-#include "entity.c"
-#include "workshop.c"
-#include "addon.c"
-#include "save.c"
-#include "world_map.c"
-#include "network.c"
-#include "player_remote.c"
-#include "vg/vg_audio_dsp.h"
-#include "world_routes_ui.c"
-#include "particle.c"
-#include "player_effects.c"
-#include "freecam.c"
-#include "testing.c"
+#include "particle.h"
 #include "trail.h"
-#include "trail.c"
+#include "freecam.h"
+#include "ent_tornado.h"
+#include "ent_miniworld.h"
+#include "ent_skateshop.h"
+#include "ent_npc.h"
+#include "world_map.h"
+#include "gui.h"
+#include "workshop.h"
+#include "audio.h"
+#include "player_render.h"
+
+struct skaterift_globals skaterift = 
+{ 
+   .op = k_async_op_clientloading, .time_rate = 1.0f, .demo_mode = 1,
+   .hub_world = "maps/dev_hub",
+};
 
 static int k_tools_mode = 0;
 
@@ -124,20 +121,20 @@ static void async_call_ready( void *payload, u32 size ){
    skaterift.op = k_async_op_none;
 }
 
-static void skaterift_restore_state(void){
+static void skaterift_restore_state(void)
+{
    savedata_file sav;
-   strcpy( sav.path, str_skaterift_main_save );
-   savedata_file_read( &sav );
+   skaterift_read_main_savedata( &sav );
 
    vg_msg kvsav;
    vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
 
    u32 ach;
-   vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach );
+   vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach, NULL );
    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" ) ){
@@ -191,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;
-   skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
-   skaterift.replay.size = bytes;
-   replay_clear( &skaterift.replay );
-
+static void skaterift_load_player_content(void)
+{
    particle_alloc( &particles_grind, 300 );
    particle_alloc( &particles_env, 200 );
 
@@ -216,36 +209,30 @@ 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( "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 );
    vg_loader_step( world_init, NULL );
    vg_loader_step( vehicle_init, NULL );
-   vg_loader_step( font3d_init, NULL );
    vg_loader_step( gui_init, NULL );
 
    vg_loader_step( player_init, NULL );
    vg_loader_step( player_ragdoll_init, NULL );
+   vg_loader_step( npc_init, NULL );
 
    /* content stuff */
    vg_loader_step( addon_system_init, NULL );
    vg_loader_step( workshop_init, NULL );
    vg_loader_step( skateshop_init, NULL );
    vg_loader_step( ent_tornado_init, NULL );
-   vg_loader_step( testing_init, NULL );
-   vg_loader_step( trail_init, NULL );
-   vg_loader_step( particle_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 */
 
@@ -284,7 +271,7 @@ static void draw_origin_axis(void){
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
-static void skaterift_change_client_world_preupdate(void);
+void skaterift_change_client_world_preupdate(void);
 
 /* 
  * UPDATE LOOP
@@ -297,18 +284,20 @@ 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 */
    f32 target = 1;
    if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
-                             k_skaterift_world_map) ){
+                             k_skaterift_world_map) )
+   {
       target = 0;
    }
 
@@ -317,8 +306,8 @@ void vg_pre_update(void)
    
    /* TODO: how can we compress this? */
    ent_miniworld_preupdate();
-   player__pre_update();
    world_entity_focus_preupdate();
+   player__pre_update();
    skaterift_replay_pre_update();
    remote_sfx_pre_update();
    skateshop_world_preupdate( world_current_instance() );
@@ -336,7 +325,6 @@ void vg_fixed_update(void)
    world_routes_fixedupdate( world_current_instance() );
    player__update();
    vehicle_update_fixed();
-   testing_update();
 }
 
 void vg_post_update(void)
@@ -368,12 +356,7 @@ void vg_post_update(void)
    audio_unlock();
 
    vehicle_update_post();
-
-   if( vg.time - skaterift.last_autosave > 20.0 ){
-      if( skaterift_autosave(1) ){
-         skaterift.last_autosave = vg.time;
-      }
-   }
+   skaterift_autosave_update();
 }
 
 /*
@@ -415,10 +398,10 @@ static void present_view_with_post_processing(void){
       f32 glitch_strength = 0.0f;
       if( skaterift.activity == k_skaterift_replay ){
          glitch_strength = 0.005f;
-         if( skaterift.replay_control == k_replay_control_play )
+         if( player_replay.replay_control == k_replay_control_play )
             glitch_strength = 0.005f;
          else 
-            glitch_strength += 0.005f*skaterift.track_velocity;
+            glitch_strength += 0.005f*player_replay.track_velocity;
       }
       shader_blitblur_uGlitchStrength( glitch_strength );
 
@@ -443,7 +426,7 @@ static void present_view_with_post_processing(void){
 }
 
 static void render_player_transparent(void){
-   static camera small_cam;      /* DOES NOT NEED TO BE STATIC BUT MINGW 
+   static vg_camera small_cam;      /* DOES NOT NEED TO BE STATIC BUT MINGW 
                                     SAIS OTHERWISE */
 
    m4x3_copy( skaterift.cam.transform, small_cam.transform );
@@ -452,9 +435,9 @@ static void render_player_transparent(void){
    small_cam.nearz = 0.05f;
    small_cam.farz  = 60.0f;
 
-   camera_update_view( &small_cam );
-   camera_update_projection( &small_cam );
-   camera_finalize( &small_cam );
+   vg_camera_update_view( &small_cam );
+   vg_camera_update_projection( &small_cam );
+   vg_camera_finalize( &small_cam );
 
    /* Draw player to window buffer and blend background ontop */
    player__render( &small_cam );
@@ -561,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){
-   camera_lerp( &localplayer.cam, &world_static.focus_cam,
+static void skaterift_composite_maincamera(void)
+{
+   vg_camera_lerp( &localplayer.cam, &world_static.focus_cam,
                 vg_smoothstepf(world_static.focus_strength), &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 );
+   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 );
       }
    }
 
@@ -581,7 +568,7 @@ static void skaterift_composite_maincamera(void){
    skaterift.cam.farz  = 2100.0f;
 
    if( skaterift.activity == k_skaterift_world_map ){
-      camera_copy( &world_map.cam, &skaterift.cam );
+      vg_camera_copy( &world_map.cam, &skaterift.cam );
       skaterift.cam.nearz = 4.0f;
       skaterift.cam.farz = 3100.0f;
    }
@@ -597,19 +584,19 @@ static void skaterift_composite_maincamera(void){
       }
    }
 
-   camera_update_transform( &skaterift.cam );
-   camera_update_view( &skaterift.cam );
-   camera_update_projection( &skaterift.cam );
-   camera_finalize( &skaterift.cam );
+   vg_camera_update_transform( &skaterift.cam );
+   vg_camera_update_view( &skaterift.cam );
+   vg_camera_update_projection( &skaterift.cam );
+   vg_camera_finalize( &skaterift.cam );
 }
 
 static void render_main_game(void){
    if( skaterift.activity == k_skaterift_replay ){
-      player__animate_from_replay( &skaterift.replay );
+      player__animate_from_replay( &player_replay.local );
    }
    else{
       player__animate();
-      skaterift_record_frame( &skaterift.replay, 
+      skaterift_record_frame( &player_replay.local,
                               localplayer.deferred_frame_record );
       localplayer.deferred_frame_record = 0;
    }
@@ -653,7 +640,6 @@ static void render_main_game(void){
 
    /* composite */
    present_view_with_post_processing();
-
    skaterift_replay_post_render();
 }
 
@@ -741,3 +727,58 @@ void vg_gui(void)
       remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
    }
 }
+
+#include "addon.c"
+#include "addon_types.c"
+#include "audio.c"
+#include "ent_challenge.c"
+#include "ent_glider.c"
+#include "entity.c"
+#include "ent_miniworld.c"
+#include "ent_objective.c"
+#include "ent_region.c"
+#include "ent_relay.c"
+#include "ent_route.c"
+#include "ent_skateshop.c"
+#include "ent_tornado.c"
+#include "ent_traffic.c"
+#include "freecam.c"
+#include "menu.c"
+#include "network.c"
+#include "particle.c"
+#include "player_basic_info.c"
+#include "player.c"
+#include "player_common.c"
+#include "player_dead.c"
+#include "player_drive.c"
+#include "player_effects.c"
+#include "player_glide.c"
+#include "player_ragdoll.c"
+#include "player_remote.c"
+#include "player_render.c"
+#include "player_replay.c"
+#include "player_skate.c"
+#include "player_walk.c"
+#include "render.c"
+#include "save.c"
+#include "scene.c"
+#include "steam.c"
+#include "trail.c"
+#include "vehicle.c"
+#include "workshop.c"
+#include "world_audio.c"
+#include "world.c"
+#include "world_entity.c"
+#include "world_gate.c"
+#include "world_gen.c"
+#include "world_load.c"
+#include "world_map.c"
+#include "world_physics.c"
+#include "world_render.c"
+#include "world_routes.c"
+#include "world_routes_ui.c"
+#include "world_sfd.c"
+#include "world_volumes.c"
+#include "world_water.c"
+#include "ent_npc.c"
+#include "model.c"