X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=skaterift.c;h=d8d91078357af8a8db70af7190cd7b991841d848;hb=960d442e442efab5e1dff05ad3d6613bf228dd71;hp=daac040234cbfd89f99c2c063f26a6b159680ba6;hpb=0310bab3c018e23f5516c3e3c3653b844a8106ed;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index daac040..d8d9107 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -16,26 +16,39 @@
 #define SR_NETWORKED
 #define VG_DEVWINDOW
 
-#include "common.h"
-#include "conf.h"
+/* 
+ *     system headers
+ * --------------------- */
+
+#include "skaterift.h"
 #include "steam.h"
 #include "render.h"
 #include "audio.h"
+
 #include "world.h"
+
 #include "font.h"
 #include "player.h"
 
-#include "entity.c"
-#include "workshop.c"
-
 #include "network.h"
 #include "menu.h"
 #include "vehicle.h"
 #include "pointcloud.h"
+#include "save.h"
 
-static struct player_avatar localplayer_avatar;
-static struct player_model  localplayer_models[3];
+/*    unity build
+ * ----------------- */
 
+#include "world.c"
+#include "player.c"
+#include "vehicle.c"
+#include "entity.c"
+#include "workshop.c"
+#include "addon.c"
+#include "highscores.c"
+#include "save.c"
+
+static struct player_avatar localplayer_avatar;
 
 int main( int argc, char *argv[] )
 {
@@ -45,18 +58,13 @@ int main( int argc, char *argv[] )
    return 0;
 }
 
-VG_STATIC void highscores_save_at_exit(void)
-{
-   highscores_serialize_all();
-}
-
 VG_STATIC void vg_launch_opt(void)
 {
 }
 
 VG_STATIC void vg_preload(void)
 {
-   g_conf_init();
+   skaterift_read_savedata();
 
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
@@ -66,12 +74,6 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
-   highscores_init( 2000, 50 );
-   if( !highscores_read() )
-      highscores_create_db();
-
-   vg_loader_step( NULL, highscores_save_at_exit );
-
    steam_init();
    vg_loader_step( NULL, steam_end );
    vg_loader_step( network_init, network_end );
@@ -79,26 +81,73 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
 
 VG_STATIC void load_playermodels(void)
 {
-   player_model_load( &localplayer_models[0], "models/ch_new.mdl" );
-   player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" );
-   player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" );
-
    /* FIXME: hack */
    shader_model_character_view_register();
    shader_model_board_view_register();
    shader_model_entity_register();
 }
 
-void temp_update_playermodel(void){
-   player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
+VG_STATIC void async_skaterift_player_start( void *payload, u32 size ){
+   localplayer.viewable_world = world_current_instance();
+   localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
 }
 
-VG_STATIC void async_skaterift_complete( void *payload, u32 size )
-{
-   localplayer.viewable_world = get_active_world();
-   localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
+static void async_call_ready( void *payload, u32 size ){
+   skaterift.op = k_async_op_none;
+}
+
+static void skaterift_restore_state(void){
+   vg_msg sav = {0};
+   sav.buf = savedata.buf;
+   sav.len = savedata.len;
+   sav.max = sizeof(savedata.buf);
+
+   vg_msg player = sav;
+   if( vg_msg_seekframe( &player, "player", 0 ) ){
+      addon_alias q;
+
+      /* 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 );
+      }
+
+      /* 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 );
+   }
 
-   skaterift_end_op();
+   vg_msg world = sav;
+   if( vg_msg_seekframe( &world, "world", 0 ) ){
+      addon_alias q;
+
+      /* world */
+      skaterift_read_addon_alias( &world, "alias", k_addon_type_world, &q );
+      u32 reg_id = addon_match( &q );
+      if( reg_id != 0xffffffff ){
+         addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
+
+         world_loader.generate_point_cloud = 0;
+         world_loader.reg = reg;
+         world_loader.state = k_world_loader_load;
+         skaterift_world_changer_thread(NULL);
+
+         world_static.active_world = 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 );
+         vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3,
+                             localplayer.rb.co );
+      }
+   }
 }
 
 VG_STATIC void vg_load(void)
@@ -111,11 +160,13 @@ VG_STATIC void vg_load(void)
    vg_loader_step( world_init, NULL );
    vg_loader_step( vehicle_init, NULL );
    vg_loader_step( font3d_init, NULL );
-
-   font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory );
+   vg_loader_step( gui_init, NULL );
 
    vg_loader_step( player_init, NULL );
    vg_loader_step( player_ragdoll_init, NULL );
+
+   /* content stuff */
+   vg_loader_step( addon_system_init, NULL );
    vg_loader_step( workshop_init, NULL );
    vg_loader_step( skateshop_init, NULL );
    
@@ -124,9 +175,9 @@ VG_STATIC void vg_load(void)
   
    /* player setup */
    player__create( &localplayer );
-   player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
+   player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
    player__use_avatar( &localplayer, &localplayer_avatar );
-   player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
+   player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind( &localplayer );
 
    /* --------------------- */
@@ -135,13 +186,72 @@ VG_STATIC void vg_load(void)
    vg_loader_step( audio_init, audio_free );
 
    /* 'systems' are completely loaded now */
-   /* load home/permanent world */
-   world_load( 0, "maps/mp_spawn.mdl" );
+   
+   /* load home/permanent world manually */
+   world_loader.reg = NULL;
+   strcpy( world_loader.override_name, "mp_spawn" );
+   world_loader.generate_point_cloud = 1;
+   world_loader.world_index = 0;
+   world_load_mdl( "maps/mp_spawn/main.mdl" );
+
+   vg_async_call( async_skaterift_player_start, NULL, 0 );
+   vg_async_stall();
+
+   /* Completing addon registrations
+    * -------------------------------------
+    */
+
+   /* understate diy. */
+   addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
+                                                k_addon_type_world, 
+                                                ".mdl" );
+   {
+      vg_msg msg = {0};
+      msg.buf = spawn->metadata;
+      msg.max = sizeof(spawn->metadata);
+      vg_msg_frame( &msg, "workshop" );
+      vg_msg_wkvstr( &msg, "title", "Understate DIY" );
+      vg_msg_end_frame( &msg );
+      vg_msg_wkvstr( &msg, "location", "USA" );
+      spawn->metadata_len = msg.cur;
+   }
+
+   /* mtzero island */
+   addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
+                                                k_addon_type_world,
+                                                ".mdl" );
+   {
+      vg_msg msg = {0};
+      msg.buf = mtzero->metadata;
+      msg.max = sizeof(mtzero->metadata);
+      vg_msg_frame( &msg, "workshop" );
+      vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" );
+      vg_msg_end_frame( &msg );
+      vg_msg_wkvstr( &msg, "location", "Australia" );
+      mtzero->metadata_len = msg.cur;
+   }
+
+   global_skateshop.selected_world_id=1;
+   global_skateshop.pointcloud_world_id=1;
+   skateshop_world_preview_loader_thread( mtzero ); /* HACK */
 
    vg_console_load_autos();
    menu_link();
 
-   vg_async_call( async_skaterift_complete, NULL, 0 );
+   addon_mount_content_folder( k_addon_type_player, 
+                               "playermodels", ".mdl" );
+   addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
+   addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
+   addon_mount_workshop_items();
+   vg_async_call( async_addon_reg_update, NULL, 0 );
+   vg_async_stall();
+
+   /* and now */
+   skaterift_restore_state();
+   vg_loader_step( NULL, skaterift_write_savedata );
+
+   board_processview_thread(NULL);
+   vg_async_call( async_call_ready, NULL, 0 );
 }
 
 VG_STATIC void draw_origin_axis(void)
@@ -156,8 +266,9 @@ VG_STATIC void vg_update(void)
 {
    steam_update();
    skaterift_preupdate_inputs();
-   if( skaterift.async_op == k_async_op_clientloading ) return;
-   if( skaterift.async_op == k_async_op_world_preloading ){
+   if( skaterift.op == k_async_op_clientloading ) return;
+
+   if( world_loader.state == k_world_loader_preload ){
       skaterift_change_world_preupdate();
    }
 
@@ -167,23 +278,23 @@ VG_STATIC void vg_update(void)
    player__pre_update( &localplayer );
    global_skateshop_preupdate();
 
-   world_update( get_active_world(), localplayer.rb.co );
-   audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
+   world_update( world_current_instance(), localplayer.rb.co );
+   audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
    //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
 }
 
 VG_STATIC void vg_update_fixed(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
-   world_routes_fixedupdate( get_active_world() );
+   world_routes_fixedupdate( world_current_instance() );
    player__update( &localplayer );
    vehicle_update_fixed();
 }
 
 VG_STATIC void vg_update_post(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
    player__post_update( &localplayer );
 
@@ -230,11 +341,11 @@ VG_STATIC void present_view_with_post_processing(void)
    v2f inverse;
    render_fb_inverse_ratio( gpipeline.fb_main, inverse );
 
-   if( cl_blur ){
+   if( k_blur_effect ){
       shader_blitblur_use();
       shader_blitblur_uTexMain( 0 );
       shader_blitblur_uTexMotion( 1 );
-      shader_blitblur_uBlurStrength( cl_blur_strength / 
+      shader_blitblur_uBlurStrength( k_blur_strength / 
                                      (vg.time_frame_delta*60.0) );
       shader_blitblur_uInverseRatio( inverse );
 
@@ -293,9 +404,9 @@ VG_STATIC void render_scene(void)
       return;
    }
 
-   for( u32 i=0; i<vg_list_size(world_global.worlds); i++ ){
-      if( world_global.worlds[i].status == k_world_status_loaded ){
-         world_prerender( &world_global.worlds[i] );
+   for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
+      if( world_static.worlds[i].status == k_world_status_loaded ){
+         world_prerender( &world_static.worlds[i] );
       }
    }
 
@@ -310,6 +421,7 @@ 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; /* ??? */
 
    int depth = 1;
    if( localplayer.gate_waiting ) depth = 0;
@@ -356,7 +468,7 @@ VG_STATIC void render_main_game(void)
 
 VG_STATIC void vg_render(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ){
+   if( skaterift.op == k_async_op_clientloading ){
       _vg_loader_render();
       return;
    }
@@ -384,7 +496,7 @@ VG_STATIC void vg_render(void)
 
 VG_STATIC void vg_gui(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
    menu_update();
    if( menu.active ){
@@ -395,83 +507,12 @@ VG_STATIC void vg_gui(void)
 #if 0
    player__im_gui( &localplayer );
 #endif
-   world_instance *world = get_active_world();
+   world_instance *world = world_current_instance();
 
    workshop_form_gui();
    render_view_framebuffer_ui();
 }
 
-static void async_skaterift_world_loaded( void *payload, u32 size )
-{
-   skaterift_end_op();
-}
-
-static void skaterift_world_changer_thread( void *data )
-{
-   const char *path = data;
-   world_load( 1, world_global.load_target );
-   vg_async_call( async_skaterift_world_loaded, NULL, 0 );
-}
-
-/* holding pattern before we can start loading the new world, since we might be
- * waiting for audio to stop */
-static void skaterift_change_world_preupdate(void)
-{
-   for( u32 i=1; i<vg_list_size(world_global.worlds); i++ ){
-      world_instance *inst = &world_global.worlds[i];
-      
-      if( inst->status == k_world_status_unloading ){
-         if( world_freeable( inst ) ){
-            world_free( inst );
-         }
-         return;
-      }
-   }
-
-   vg_info( "worlds cleared, begining load\n" );
-   skaterift_shift_op( k_async_op_world_loading );
-
-   /* finally can start the loader */
-   vg_loader_start( skaterift_world_changer_thread, NULL );
-}
-
-/* places all loaded worlds into unloading state */
-static void skaterift_change_world( const char *world_path )
-{
-   vg_info( "switching to %s\n", world_path );
-
-   if( world_global.active_world != 0 ){
-      vg_error( "Cannot change worlds while in non-root world\n" );
-   }
-   else{
-      skaterift_begin_op( k_async_op_world_preloading );
-
-      vg_linear_clear( vg_mem.scratch );
-      world_global.load_target = vg_linear_alloc( vg_mem.scratch, 1024 );
-      vg_strncpy( world_path, world_global.load_target, 
-                  1024, k_strncpy_overflow_fatal );
-      
-      vg_info( "unloading old worlds\n" );
-      world_unlink_nonlocal( &world_global.worlds[0] );
-      
-      for( u32 i=1; i<vg_list_size(world_global.worlds); i++ ){
-         world_instance *inst = &world_global.worlds[i];
-
-         if( inst->status == k_world_status_loaded ){
-            inst->status = k_world_status_unloading;
-            world_fadeout_audio( inst );
-         }
-      }
-   }
-}
-
-static int skaterift_change_world_command( int argc, const char *argv[] )
-{
-   if( argc == 1 )
-      skaterift_change_world( argv[0] );
-
-   return 0;
-}
 
 #else