X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=d8d91078357af8a8db70af7190cd7b991841d848;hb=960d442e442efab5e1dff05ad3d6613bf228dd71;hp=457aa22e27e11b0ff5a646d0e9d26f2503764750;hpb=6a6539bcfeb7bd693251f7aae31056671a65c0f0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 457aa22..d8d9107 100644 --- a/skaterift.c +++ b/skaterift.c @@ -15,25 +15,40 @@ #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" - -VG_STATIC struct player_avatar localplayer_avatar; -VG_STATIC struct player_model localplayer_models[3]; -VG_STATIC int skaterift_status = 0; - #include "network.h" #include "menu.h" #include "vehicle.h" +#include "pointcloud.h" +#include "save.h" + +/* 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[] ) { @@ -43,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" ); @@ -64,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 ); @@ -77,46 +81,92 @@ 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" ); - - /* load default board */ -#if 0 - player_board_load( &localplayer_boards[0], - "models/boards/skaterift_fish.mdl" ); -#endif - /* 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 ) -{ - skaterift_status = 1; +static void async_call_ready( void *payload, u32 size ){ + skaterift.op = k_async_op_none; +} - localplayer.viewable_world = get_active_world(); - localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); +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 ); + } + + 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) { + vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); + vg_loader_step( render_init, NULL ); vg_loader_step( menu_init, NULL ); + vg_loader_step( pointcloud_init, NULL ); 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 ); @@ -125,10 +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] ); - //localplayer.board = &localplayer_boards[0]; + player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); player__bind( &localplayer ); /* --------------------- */ @@ -137,25 +186,72 @@ VG_STATIC void vg_load(void) vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ - /* load home world */ + + /* 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; + } -#if 1 - world_load( 0, "maps/mp_spawn.mdl" ); -#else - world_load( 0, "maps/mp_mtzero.mdl" ); -#endif + /* 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; + } -#if 0 - world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" ); - world_link_nonlocal_gates( 0, 1 ); - world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" ); - world_link_nonlocal_gates( 0, 2 ); -#endif + 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) @@ -165,64 +261,66 @@ VG_STATIC void draw_origin_axis(void) vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff ); } +static void skaterift_change_world_preupdate(void); VG_STATIC void vg_update(void) { steam_update(); - skaterift_preupdate_inputs(); + if( skaterift.op == k_async_op_clientloading ) return; - if( skaterift_status == 1 ){ - draw_origin_axis(); - network_update(); - - 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 ); - //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" ); + if( world_loader.state == k_world_loader_preload ){ + skaterift_change_world_preupdate(); } + + draw_origin_axis(); + network_update(); + + player__pre_update( &localplayer ); + global_skateshop_preupdate(); + + 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_status == 1 ){ - world_routes_fixedupdate( get_active_world() ); + if( skaterift.op == k_async_op_clientloading ) return; - player__update( &localplayer ); - vehicle_update_fixed(); - } + world_routes_fixedupdate( world_current_instance() ); + player__update( &localplayer ); + vehicle_update_fixed(); } VG_STATIC void vg_update_post(void) { - if( skaterift_status == 1 ){ - player__post_update( &localplayer ); - - float dist; - int sample_index; - world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); + if( skaterift.op == k_async_op_clientloading ) return; - audio_lock(); - vg_dsp.echo_distances[sample_index] = dist; + player__post_update( &localplayer ); - v3f ears = { 1.0f,0.0f,0.0f }; - m3x3_mulv( main_camera.transform, ears, ears ); - v3_copy( ears, vg_audio.external_listener_ears ); - v3_copy( main_camera.transform[3], vg_audio.external_listener_pos ); + float dist; + int sample_index; + world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); - if( localplayer.gate_waiting ){ - m4x3_mulv( localplayer.gate_waiting->transport, - vg_audio.external_listener_pos, - vg_audio.external_listener_pos ); - } + audio_lock(); + vg_dsp.echo_distances[sample_index] = dist; - v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); - audio_unlock(); + v3f ears = { 1.0f,0.0f,0.0f }; + m3x3_mulv( main_camera.transform, ears, ears ); + v3_copy( ears, vg_audio.external_listener_ears ); + v3_copy( main_camera.transform[3], vg_audio.external_listener_pos ); - vg.time_rate = 1.0f-menu.factive; - vehicle_update_post(); + if( localplayer.gate_waiting ){ + m4x3_mulv( localplayer.gate_waiting->transport, + vg_audio.external_listener_pos, + vg_audio.external_listener_pos ); } + + v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); + audio_unlock(); + + vg.time_rate = 1.0f-menu.factive; + vehicle_update_post(); } VG_STATIC void vg_framebuffer_resize( int w, int h ) @@ -243,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 ); @@ -306,7 +404,12 @@ VG_STATIC void render_scene(void) return; } - world_prerender( view_world ); + for( u32 i=0; i