projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cubemaps
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 25a89e652d9421c0a6a367e885334048dc9d58c1..40be41ef0c7b9d4732b35509f37239987c79d1e4 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-63,7
+63,7
@@
int main( int argc, char *argv[] ){
VG_STATIC void vg_launch_opt(void){}
VG_STATIC void vg_preload(void){
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" );
vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" );
vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" );
@@
-95,12
+95,16
@@
static void async_call_ready( void *payload, u32 size ){
}
static void skaterift_restore_state(void){
}
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;
if( vg_msg_seekframe( &player, "player", 0 ) ){
addon_alias q;
@@
-122,7
+126,7
@@
static void skaterift_restore_state(void){
addon_cache_create_viewer( k_addon_type_player, reg_id );
}
addon_cache_create_viewer( k_addon_type_player, reg_id );
}
- vg_msg world = sav;
+ vg_msg world =
kv
sav;
if( vg_msg_seekframe( &world, "world", 0 ) ){
addon_alias q;
if( vg_msg_seekframe( &world, "world", 0 ) ){
addon_alias q;
@@
-132,9
+136,12
@@
static void skaterift_restore_state(void){
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
- world_static.addon_client = reg;
world_static.load_state = k_world_loader_load;
world_static.load_state = k_world_loader_load;
- skaterift_client_world_changer_thread(NULL);
+ struct world_load_args args = {
+ .purpose = k_world_purpose_client,
+ .reg = reg
+ };
+ skaterift_world_load_thread( &args );
world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
@@
-224,8
+231,12
@@
VG_STATIC void vg_load(void){
}
/* load home/permanent world manually */
}
/* load home/permanent world manually */
- world_static.addon_hub = spawn;
- world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+ 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();
vg_async_call( async_skaterift_player_start, NULL, 0 );
vg_async_stall();
@@
-248,7
+259,7
@@
VG_STATIC void vg_load(void){
/* and now */
skaterift_restore_state();
/* 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 );
board_processview_thread(NULL);
vg_async_call( async_call_ready, NULL, 0 );
@@
-328,6
+339,12
@@
VG_STATIC void vg_post_update(void){
audio_unlock();
vehicle_update_post();
audio_unlock();
vehicle_update_post();
+
+ if( vg.time - skaterift.last_autosave > 20.0 ){
+ if( skaterift_autosave(1) ){
+ skaterift.last_autosave = vg.time;
+ }
+ }
}
/*
}
/*
@@
-490,6
+507,12
@@
VG_STATIC void render_main_game(void){
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
+ /* cubemaps TODO: Need a cubemap mark dirty thing for pordals */
+ world_instance *view_world = localplayer.viewable_world;
+ if( view_world != NULL ){
+ render_world_cubemaps( view_world );
+ }
+
/* variable res target */
render_fb_bind( gpipeline.fb_main, 1 );
glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
/* variable res target */
render_fb_bind( gpipeline.fb_main, 1 );
glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );