X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=3fec7e0e6a3161ab4dd792aecb223909cc0ede9c;hb=9eb3de757a997becb8406417a4bf613f4cb04900;hp=fe1c5bc23ce06aecd64540ecff2870a7bb3f398e;hpb=2b7784846e2f2ee57ba336a2aa040adb2d0ca461;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index fe1c5bc..3fec7e0 100644 --- a/skaterift.c +++ b/skaterift.c @@ -20,8 +20,7 @@ * system headers * --------------------- */ -#include "common.h" -#include "conf.h" +#include "skaterift.h" #include "steam.h" #include "render.h" #include "audio.h" @@ -35,6 +34,7 @@ #include "menu.h" #include "vehicle.h" #include "pointcloud.h" +#include "save.h" /* unity build * ----------------- */ @@ -46,9 +46,9 @@ #include "workshop.c" #include "addon.c" #include "highscores.c" +#include "save.c" static struct player_avatar localplayer_avatar; -static struct player_model localplayer_models[3]; int main( int argc, char *argv[] ) { @@ -58,20 +58,13 @@ int main( int argc, char *argv[] ) return 0; } -#if 0 -VG_STATIC void highscores_save_at_exit(void) -{ - highscores_serialize_all(); -} -#endif - 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" ); @@ -81,14 +74,6 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); - /* 31.05.23 (hgn): this is only a server feature now */ -#if 0 - highscores_init( 2000, 50 ); - if( !highscores_read() ) - highscores_create_db(); - vg_loader_step( NULL, highscores_save_at_exit ); -#endif - steam_init(); vg_loader_step( NULL, steam_end ); vg_loader_step( network_init, network_end ); @@ -96,26 +81,74 @@ 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_complete( void *payload, u32 size ) -{ +VG_STATIC void async_skaterift_player_start( void *payload, u32 size ){ localplayer.viewable_world = world_current_instance(); 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 ); - skaterift_end_op(); + if( reg_id == 0xffffffff ) reg_id = 0; + localplayer.playermodel_view_slot = + addon_cache_create_viewer( k_addon_type_player, reg_id ); + } + + 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 ); + v3f pos; + vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos ); + player__setpos( &localplayer, pos ); + } + } } VG_STATIC void vg_load(void) @@ -142,10 +175,11 @@ VG_STATIC void vg_load(void) vg_loader_step( load_playermodels, NULL ); /* player setup */ + local_replay_init( (1024*1024*1)/2 ); 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 ); /* --------------------- */ @@ -162,43 +196,64 @@ VG_STATIC void vg_load(void) 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 * ------------------------------------- */ - vg_msg msg; /* understate diy. */ addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", - k_workshop_file_type_world, + k_addon_type_world, ".mdl" ); - vg_msg_init( &msg, spawn->metadata, 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; + { + 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_workshop_file_type_world, + k_addon_type_world, ".mdl" ); - vg_msg_init( &msg, mtzero->metadata, 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; + { + 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_preview_loader_thread( mtzero ); /* HACK */ + skateshop_world_preview_loader_thread( mtzero ); /* HACK */ - vg_async_call( async_addon_reg_update, NULL, 0 ); vg_console_load_autos(); menu_link(); - temp_update_playermodel(); - //vg_mem_log( vg_mem.rtmemory, 0, "Root" ); - 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) @@ -213,8 +268,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(); } @@ -231,16 +287,15 @@ VG_STATIC void vg_update(void) 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( 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; +VG_STATIC void vg_update_post(void){ + if( skaterift.op == k_async_op_clientloading ) return; player__post_update( &localplayer ); @@ -265,7 +320,11 @@ VG_STATIC void vg_update_post(void) v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); audio_unlock(); - vg.time_rate = 1.0f-menu.factive; + f32 target = 1.0f-(f32)(menu.active||k_replay_test); + skaterift.time_rate = vg_lerpf( skaterift.time_rate, target, + vg.time_frame_delta * 6.0f ); + + vg.time_rate = skaterift.time_rate; vehicle_update_post(); } @@ -287,17 +346,20 @@ 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 ); - v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu.factive, menu_blurring ); - shader_blitblur_uOverrideDir( menu_blurring ); + v2f override; + if( menu.active ) + v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override ); + else + v2_zero( override ); + shader_blitblur_uOverrideDir( override ); render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); render_fb_bind_texture( gpipeline.fb_main, 1, 1 ); @@ -414,7 +476,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; } @@ -442,7 +504,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 ){ @@ -450,11 +512,10 @@ VG_STATIC void vg_gui(void) menu_render(); } -#if 0 player__im_gui( &localplayer ); -#endif world_instance *world = world_current_instance(); + replay_imgui( &localplayer ); workshop_form_gui(); render_view_framebuffer_ui(); }