X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=4d65145bea75c893ffb0eb4efe2702a273da8d7b;hb=fdd41609e59c7df548682b25001f0015dc1acbea;hp=d22846ff0fe65d57ff7b6626ec4c8b7b3477498c;hpb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index d22846f..4d65145 100644 --- a/skaterift.c +++ b/skaterift.c @@ -20,7 +20,7 @@ * system headers * --------------------- */ -#include "common.h" +#include "skaterift.h" #include "conf.h" #include "steam.h" #include "render.h" @@ -35,6 +35,7 @@ #include "menu.h" #include "vehicle.h" #include "pointcloud.h" +#include "save.h" /* unity build * ----------------- */ @@ -44,9 +45,15 @@ #include "vehicle.c" #include "entity.c" #include "workshop.c" +#include "addon.c" +#include "highscores.c" +#include "save.c" static struct player_avatar localplayer_avatar; + +#if 0 static struct player_model localplayer_models[3]; +#endif int main( int argc, char *argv[] ) { @@ -56,10 +63,12 @@ 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) { @@ -67,7 +76,8 @@ VG_STATIC void vg_launch_opt(void) VG_STATIC void vg_preload(void) { - g_conf_init(); + conf_init(); + skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); @@ -77,11 +87,13 @@ 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 ); @@ -90,9 +102,11 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " VG_STATIC void load_playermodels(void) { +#if 0 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" ); +#endif /* FIXME: hack */ shader_model_character_view_register(); @@ -101,15 +115,15 @@ VG_STATIC void load_playermodels(void) } void temp_update_playermodel(void){ - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); +#if 0 + player__use_model( &localplayer, &localplayer_models[k_playermdl_id] ); +#endif } -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" } ); - - skaterift_end_op(); } VG_STATIC void vg_load(void) @@ -126,6 +140,9 @@ VG_STATIC void vg_load(void) 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 ); @@ -136,7 +153,9 @@ VG_STATIC void vg_load(void) player__create( &localplayer ); player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); player__use_avatar( &localplayer, &localplayer_avatar ); - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); +#if 0 + player__use_model( &localplayer, &localplayer_models[k_playermdl_id] ); +#endif player__bind( &localplayer ); /* --------------------- */ @@ -147,16 +166,99 @@ VG_STATIC void vg_load(void) /* 'systems' are completely loaded now */ /* load home/permanent world manually */ - strcpy( world_loader.name, "mp_spawn" ); + world_loader.reg = NULL; + strcpy( world_loader.override_name, "mp_spawn" ); world_loader.generate_point_cloud = 1; world_loader.world_index = 0; - world_loader.location = k_world_load_type_local; world_load_mdl( "maps/mp_spawn/main.mdl" ); + /* Completing addon registrations + * ------------------------------------- + */ + + /* understate diy. */ + addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", + k_workshop_file_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_workshop_file_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_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_player_start, NULL, 0 ); + + skaterift_shift_op( k_async_op_board_scan ); + addon_mount_content_folder( k_workshop_file_type_player, + "playermodels", ".mdl" ); + addon_mount_content_folder( k_workshop_file_type_board, "boards", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); + vg_async_stall(); + + /* and now */ + + vg_msg sav = {0}; + sav.buf = savedata.buf; + sav.len = savedata.len; + sav.max = sizeof(savedata.buf); + + u64 query_workshop_id = 0; + const char *query_local_folder = ""; + + if( vg_msg_seekframe(&sav, "player",0) ){ + vg_msg_print( &sav ); + vg_msg_cmd board = vg_msg_seekkv( &sav, "board", 0 ); + if( board.code == k_vg_msg_kvstring ) + query_local_folder = board.value; + else + query_workshop_id = vg_msg_read_as_u64( &board ); + } + else{ + vg_error( "%u\n", sav.error ); + } + + vg_info( "search: %lu '%s'\n", query_workshop_id, query_local_folder ); + + u32 reg_id = addon_match( k_workshop_file_type_board, + query_workshop_id, query_local_folder ); + if( reg_id != 0xffffffff ){ + localplayer.board_view_slot = skateshop_cache_fetch_board( reg_id ); + vg_pool_watch( &addon_system.board_cache, localplayer.board_view_slot ); + } - vg_async_call( async_skaterift_complete, NULL, 0 ); + board_processview_thread(NULL); /* END_OP!! */ } VG_STATIC void draw_origin_axis(void) @@ -245,11 +347,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 ); @@ -325,6 +427,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;