X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=39dec86a993115c9058cdd17118f9a8ae2b24cb6;hb=9c915fa64d52d8ecfcb6c2a892829f2419dea8a1;hp=7898f5877d33d7fe185c70a0124d915a0d69963f;hpb=7b1e8a237acc3121c86fab9b5946da6a8d3bf6c4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 7898f58..39dec86 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -14,6 +14,7 @@ #include "highscores.h" #include "steam.h" #include "addon.h" +#include "save.h" /* * Checks string equality but does a hash check first @@ -42,6 +43,7 @@ VG_STATIC struct cache_board *skateshop_cache_fetch_board( u32 registry_index ) } } +#if 0 /* lru eviction. should be a linked list maybe... */ double min_time = 1e300; struct cache_board *min_board = NULL; @@ -58,6 +60,12 @@ VG_STATIC struct cache_board *skateshop_cache_fetch_board( u32 registry_index ) min_board = cache_ptr; } } +#else + + SDL_AtomicLock( &global_skateshop.sl_cache_access ); + struct cache_board *min_board = lru_volatile_cache_board(); + +#endif if( min_board ){ if( min_board->state == k_cache_board_state_loaded ){ @@ -75,7 +83,6 @@ VG_STATIC struct cache_board *skateshop_cache_fetch_board( u32 registry_index ) min_board->reg_ptr = reg; min_board->reg_index = registry_index; - min_board->last_use_time = vg.time; min_board->ref_count = 0; min_board->state = k_cache_board_state_load_request; } @@ -114,7 +121,6 @@ VG_STATIC void skateshop_async_board_loaded( void *payload, u32 size ) { SDL_AtomicLock( &global_skateshop.sl_cache_access ); struct cache_board *cache_ptr = payload; - cache_ptr->last_use_time = vg.time; cache_ptr->state = k_cache_board_state_loaded; cache_ptr->reg_ptr->userdata = cache_ptr; @@ -145,12 +151,13 @@ VG_STATIC void workshop_visibile_load_loop(void) /* continue with the request */ SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); - cache_ptr->reg_ptr = get_addon_from_index( k_workshop_file_type_board, - cache_ptr->reg_index ); + addon_reg *reg = get_addon_from_index( k_workshop_file_type_board, + cache_ptr->reg_index ); + cache_ptr->reg_ptr = reg; vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( !addon_get_content_folder( cache_ptr->reg_ptr, &folder ) ) + if( !addon_get_content_folder( reg, &folder ) ) goto file_is_broken; @@ -159,9 +166,11 @@ VG_STATIC void workshop_visibile_load_loop(void) vg_str content_path = folder; - vg_msg root; - vg_msg_init( &root, cache_ptr->reg_ptr->metadata, - cache_ptr->reg_ptr->metadata_len ); + + vg_msg root = {0}; + root.buf = reg->metadata; + root.len = reg->metadata_len; + root.max = sizeof(reg->metadata); const char *kv_content = vg_msg_seekkvstr( &root, "content", 0 ); if( kv_content ){ @@ -237,27 +246,49 @@ VG_STATIC void skateshop_op_processview(void){ * ----------------------------------------------------------------------------- */ -/* we can only keep using a viewslot pointer for multiple frames if we watch it - * using this function */ +/* adds one more watch */ VG_STATIC void watch_cache_board( struct cache_board *ptr ){ if( ptr->ref_count >= 32 ){ vg_fatal_error( "dynamic board watch missmatch (limit is 32)\n" ); } - ptr->last_use_time = vg.time; ptr->ref_count ++; } -/* after this is called, the calling code only has access to the pointer for the - * duration of the rest of the frame */ +/* if after this no more watches, places back into the volatile list */ VG_STATIC void unwatch_cache_board( struct cache_board *ptr ){ if( ptr->ref_count == 0 ){ vg_fatal_error( "dynamic board unwatch missmatch (no watchers)\n" ); } ptr->ref_count --; + if( !ptr->ref_count ){ + struct cache_board *head = global_skateshop.cache_head, + *tail = global_skateshop.cache_tail; + + if( tail ) tail->right = ptr; + ptr->left = tail; + global_skateshop.cache_tail = ptr; + + if( !head ) global_skateshop.cache_head = ptr; + } } +/* retrieve oldest pointer from the volatile list (and remove it) */ +VG_STATIC struct cache_board *lru_volatile_cache_board(void){ + struct cache_board *head = global_skateshop.cache_head, + *tail = global_skateshop.cache_tail; + + if( head ){ + if( head == tail ) global_skateshop.cache_tail = NULL; + global_skateshop.cache_head = head->right; + + head->left = NULL; + head->right = NULL; + return head; + } + else return NULL; +} /* * VG event init @@ -267,14 +298,24 @@ VG_STATIC void skateshop_init(void){ global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size ); memset( global_skateshop.cache, 0, cache_size ); - for( u32 i=0; istate = k_cache_board_state_none; - board->reg_ptr= NULL; - board->reg_index = 0xffffffff; - board->last_use_time = -99999.9; - board->ref_count = 0; + for( i32 ib=0; ib=0? &arr[ia]: NULL, + *pc = icleft = pa; + pb->right = pc; + + pb->state = k_cache_board_state_none; + pb->reg_ptr= NULL; + pb->reg_index = 0xffffffff; + pb->ref_count = 0; } + + global_skateshop.cache_head = global_skateshop.cache; + global_skateshop.cache_tail = + &global_skateshop.cache[SKATESHOP_BOARD_CACHE_MAX-1]; } VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void) @@ -300,14 +341,12 @@ VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void) VG_STATIC void pointcloud_async_end(void *_, u32 __) { pointcloud_animate( k_pointcloud_anim_opening ); - skaterift_end_op(); } VG_STATIC void pointcloud_clear_async(void *_, u32 __) { pointcloud.count = 0; pointcloud_animate( k_pointcloud_anim_opening ); - skaterift_end_op(); } VG_STATIC void skateshop_preview_loader_thread( void *_data ) @@ -348,10 +387,15 @@ VG_STATIC void skateshop_preview_loader_thread( void *_data ) } } +VG_STATIC void skateshop_preview_loader_thread_and_end( void *_data ){ + skateshop_preview_loader_thread( _data ); + skaterift_end_op(); +} + VG_STATIC void skateshop_load_world_preview( addon_reg *reg ) { skaterift_begin_op( k_async_op_world_load_preview ); - vg_loader_start( skateshop_preview_loader_thread, reg ); + vg_loader_start( skateshop_preview_loader_thread_and_end, reg ); } /* @@ -403,6 +447,8 @@ VG_STATIC void global_skateshop_preupdate(void) /* input */ if( shop->type == k_skateshop_type_boardshop ){ + if( skaterift.async_op != k_async_op_none ) return; + gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); gui_helper_action( button_display_string( k_srbind_mback ), "exit" ); @@ -415,6 +461,8 @@ VG_STATIC void global_skateshop_preupdate(void) /* * Controls * ---------------------- + * + * TODO: Crash if switch page too quick, delist browse if loading.... */ u32 opage = global_skateshop.selected_board_id/SKATESHOP_VIEW_SLOT_MAX; @@ -450,6 +498,7 @@ VG_STATIC void global_skateshop_preupdate(void) localplayer.board_view_slot = selected_cache; watch_cache_board( localplayer.board_view_slot ); global_skateshop_exit(); + skaterift_write_savedata(); return; } } @@ -459,21 +508,21 @@ VG_STATIC void global_skateshop_preupdate(void) gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); if( button_down( k_srbind_mleft ) ){ - if( cl_playermdl_id > 0 ){ - cl_playermdl_id --; + if( k_playermdl_id > 0 ){ + k_playermdl_id --; } else{ - cl_playermdl_id = 2; /* HACK */ + k_playermdl_id = 2; /* HACK */ } temp_update_playermodel(); /* HACK */ } if( button_down( k_srbind_mright ) ){ - if( cl_playermdl_id+1 < 3 ){ - cl_playermdl_id ++; + if( k_playermdl_id+1 < 3 ){ + k_playermdl_id ++; } else{ - cl_playermdl_id = 0; /* HACK */ + k_playermdl_id = 0; /* HACK */ } temp_update_playermodel(); /* HACK */ /*lol*/ @@ -686,8 +735,10 @@ fade_out:; global_skateshop.render.item_title = ""; global_skateshop.render.item_desc = ""; addon_reg *reg = cache_ptr->reg_ptr; - vg_msg root; - vg_msg_init( &root, reg->metadata, reg->metadata_len ); + vg_msg root = {0}; + root.buf = reg->metadata; + root.len = reg->metadata_len; + root.max = sizeof(reg->metadata); vg_msg workshop = root; if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){ @@ -749,8 +800,10 @@ VG_STATIC void skateshop_render_worldshop(void) addon_reg *reg = get_addon_from_index( k_workshop_file_type_world, global_skateshop.selected_world_id ); - vg_msg root; - vg_msg_init( &root, reg->metadata, reg->metadata_len ); + vg_msg root = {0}; + root.buf = reg->metadata; + root.len = reg->metadata_len; + root.max = sizeof(reg->metadata); vg_msg workshop = root; if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){ global_skateshop.render.world_title = vg_msg_seekkvstr( &workshop,