X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=9b90548c3f64a28f4e62949ce5c83f77b7d240cd;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=4c0f70e4e8e26a125304ce6fba2d3ea9dd2a7155;hpb=f1fe55f957a3dbdb6ca20a696f0c1171e2d5e7ca;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 4c0f70e..9b90548 100644 --- a/skaterift.c +++ b/skaterift.c @@ -13,8 +13,11 @@ #if 1 -#define SR_NETWORKED -#define VG_DEVWINDOW +//#define SR_NETWORKED + +#ifndef VG_RELEASE + #define VG_DEVWINDOW +#endif /* * system headers @@ -60,7 +63,7 @@ int main( int argc, char *argv[] ){ VG_STATIC void vg_launch_opt(void){} VG_STATIC void vg_preload(void){ - skaterift_read_savedata(); + //skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); @@ -92,12 +95,16 @@ static void async_call_ready( void *payload, u32 size ){ } static void skaterift_restore_state(void){ - vg_msg sav = {0}; - sav.buf = savedata.buf; - sav.len = savedata.len; - sav.max = sizeof(savedata.buf); + savedata_file sav; + strcpy( sav.path, str_skaterift_main_save ); + savedata_file_read( &sav ); - vg_msg player = sav; + vg_msg kvsav = {0}; + kvsav.buf = sav.buf; + kvsav.len = sav.len; + kvsav.max = sizeof(sav.buf); + + vg_msg player = kvsav; if( vg_msg_seekframe( &player, "player", 0 ) ){ addon_alias q; @@ -119,7 +126,7 @@ static void skaterift_restore_state(void){ addon_cache_create_viewer( k_addon_type_player, reg_id ); } - vg_msg world = sav; + vg_msg world = kvsav; if( vg_msg_seekframe( &world, "world", 0 ) ){ addon_alias q; @@ -129,20 +136,24 @@ static void skaterift_restore_state(void){ 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.load_state = k_world_loader_load; + struct world_load_args args = { + .purpose = k_world_purpose_client, + .reg = reg + }; + skaterift_world_load_thread( &args ); - world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 ); + world_set_active_instance( 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 ); + 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 ); + + if( v3_length2(pos) > 1.0f ) player__setpos( &localplayer, pos ); - } } } @@ -186,16 +197,6 @@ VG_STATIC void vg_load(void){ vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ - - /* 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 * ------------------------------------- @@ -231,6 +232,18 @@ VG_STATIC void vg_load(void){ mtzero->metadata_len = msg.cur; } + /* load home/permanent world manually */ + world_static.load_state = k_world_loader_load; + struct world_load_args args = { + .purpose = k_world_purpose_hub, + .reg = spawn + }; + skaterift_world_load_thread( &args ); + + vg_async_call( async_skaterift_player_start, NULL, 0 ); + vg_async_stall(); + + global_skateshop.selected_world_id=1; global_skateshop.pointcloud_world_id=1; skateshop_world_preview_loader_thread( mtzero ); /* HACK */ @@ -248,7 +261,7 @@ VG_STATIC void vg_load(void){ /* and now */ skaterift_restore_state(); - vg_loader_step( NULL, skaterift_write_savedata ); + vg_loader_step( NULL, skaterift_autosave_synchronous ); board_processview_thread(NULL); vg_async_call( async_call_ready, NULL, 0 ); @@ -259,7 +272,7 @@ VG_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_world_preupdate(void); +static void skaterift_change_client_world_preupdate(void); /* * UPDATE LOOP @@ -271,8 +284,8 @@ VG_STATIC void vg_pre_update(void){ steam_update(); skaterift_preupdate_inputs(); if( skaterift.op == k_async_op_clientloading ) return; - if( world_loader.state == k_world_loader_preload ) - skaterift_change_world_preupdate(); + if( world_static.load_state == k_world_loader_preload ) + skaterift_change_client_world_preupdate(); draw_origin_axis(); network_update(); @@ -286,7 +299,7 @@ VG_STATIC void vg_pre_update(void){ vg.time_rate = vg_smoothstepf( skaterift.time_rate ); player__pre_update( &localplayer ); - global_skateshop_preupdate(); + world_entity_focus_preupdate(); skaterift_replay_pre_update(); world_update( world_current_instance(), localplayer.rb.co ); @@ -328,6 +341,12 @@ VG_STATIC 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; + } + } } /* @@ -426,9 +445,9 @@ VG_STATIC void render_scene(void){ return; } - for( u32 i=0; irendering_gate; + if( gate ){ + if( gate->flags & k_ent_gate_nonlocal ){ + world_instance *dest = &world_static.instances[ gate->target ]; + render_world_cubemaps( dest ); + } + } + } + /* variable res target */ render_fb_bind( gpipeline.fb_main, 1 ); glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); @@ -505,8 +538,6 @@ VG_STATIC void render_main_game(void){ it up with the oblique rendering inside the portals */ - world_render_challenges( localplayer.viewable_world ); - /* continue with variable rate */ render_scene_gate_subview();