#define VG_GAME
#include "vg/vg.h"
#include "vg/vg_steam_ugc.h"
+#include "vg/vg_msg.h"
#include "ent_skateshop.h"
#include "world.h"
#include "player.h"
#include "menu.h"
#include "pointcloud.h"
#include "highscores.h"
+#include "steam.h"
+#include "addon.h"
/*
* Checks string equality but does a hash check first
* Get an existing cache instance, allocate a new one to be loaded, or NULL if
* there is no space
*/
-VG_STATIC struct cache_board *skateshop_cache_fetch( u32 registry_index )
+VG_STATIC struct cache_board *skateshop_cache_fetch_board( u32 registry_index )
{
- struct registry_board *reg = NULL;
+ addon_reg *reg = NULL;
- if( registry_index < global_skateshop.registry_count ){
- reg = &global_skateshop.registry[ registry_index ];
+ if( registry_index < addon_count( k_workshop_file_type_board ) ){
+ reg = get_addon_from_index( k_workshop_file_type_board, registry_index );
- if( reg->cache_ptr ){
- return reg->cache_ptr;
+ if( reg->userdata ){
+ return reg->userdata;
}
}
if( min_board ){
if( min_board->state == k_cache_board_state_loaded ){
- struct registry_board *other =
- &global_skateshop.registry[ min_board->registry_id ];
-
- vg_info( "Deallocating board: '%s'\n", min_board, other->filename );
-
player_board_unload( &min_board->board );
- other->cache_ptr = NULL;
+ min_board->reg_ptr->userdata = NULL;
}
if( reg ){
vg_info( "Allocating board (reg:%u) '%s'\n",
- registry_index, reg->filename );
+ registry_index, reg->foldername );
}
else{
vg_info( "Pre-allocating board (reg:%u) 'null'\n", registry_index );
}
- min_board->registry_id = 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;
VG_STATIC void skateshop_update_viewpage(void)
{
- u32 page = global_skateshop.selected_registry_id/SKATESHOP_VIEW_SLOT_MAX;
+ u32 page = global_skateshop.selected_board_id/SKATESHOP_VIEW_SLOT_MAX;
for( u32 i=0; i<SKATESHOP_VIEW_SLOT_MAX; i++ ){
struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
if( slot->cache_ptr ) unwatch_cache_board( slot->cache_ptr );
- slot->cache_ptr = skateshop_cache_fetch( request_id );
+ slot->cache_ptr = skateshop_cache_fetch_board( request_id );
if( slot->cache_ptr ) watch_cache_board( slot->cache_ptr );
}
}
cache_ptr->last_use_time = vg.time;
cache_ptr->state = k_cache_board_state_loaded;
- struct registry_board *reg =
- &global_skateshop.registry[ cache_ptr->registry_id ];
- reg->cache_ptr = cache_ptr;
+ cache_ptr->reg_ptr->userdata = cache_ptr;
SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
-
- vg_success( "Async board loaded (%s)\n", reg->filename );
+ vg_success( "Async board loaded (%s)\n", cache_ptr->reg_ptr->foldername );
}
/*
* Thread(or subroutine of thread), for checking view slots that weve installed.
* Load the model if a view slot wants it
*/
-VG_STATIC void workshop_visibile_load_loop_thread( void *_args )
+VG_STATIC void workshop_visibile_load_loop(void)
{
- char path[1024];
+ vg_info( "Running load loop\n" );
+ char path_buf[4096];
+ vg_str folder;
+
for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
struct cache_board *cache_ptr = &global_skateshop.cache[i];
SDL_AtomicLock( &global_skateshop.sl_cache_access );
if( cache_ptr->state == k_cache_board_state_load_request ){
- if( cache_ptr->registry_id >= global_skateshop.registry_count ){
+ if( cache_ptr->reg_index >= addon_count(k_workshop_file_type_board) ){
/* should maybe have a different value for this case */
cache_ptr->state = k_cache_board_state_none;
SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
/* continue with the request */
SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
- struct registry_board *reg =
- &global_skateshop.registry[ cache_ptr->registry_id ];
+ cache_ptr->reg_ptr = get_addon_from_index( k_workshop_file_type_board,
+ cache_ptr->reg_index );
- if( reg->workshop_id ){
+ if( cache_ptr->reg_ptr->workshop_id ){
vg_async_item *call =
vg_async_alloc( sizeof(struct async_workshop_filepath_info) );
struct async_workshop_filepath_info *info = call->payload;
- info->buf = path;
- info->id = reg->workshop_id;
- info->len = vg_list_size(path) - strlen("/board.mdl")-1;
+ info->buf = path_buf;
+ info->id = cache_ptr->reg_ptr->workshop_id;
+ info->len = vg_list_size(path_buf);
vg_async_dispatch( call, async_workshop_get_filepath );
vg_async_stall(); /* too bad! */
- if( path[0] == '\0' ){
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
- cache_ptr->state = k_cache_board_state_none;
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
-
+ if( path_buf[0] == '\0' ){
vg_error( "Failed SteamAPI_GetItemInstallInfo(" PRINTF_U64 ")\n",
- reg->workshop_id );
- continue;
- }
- else{
- strcat( path, "/board.mdl" );
+ cache_ptr->reg_ptr->workshop_id );
+ goto file_is_broken;
}
+
+ folder.buffer = path_buf;
+ folder.i = strlen(path_buf);
+ folder.len = 4096;
}
else{
- snprintf( path, 256, "models/boards/%s", reg->filename );
+ vg_strnull( &folder, path_buf, 4096 );
+ vg_strcat( &folder, "boards/" );
+ vg_strcat( &folder, cache_ptr->reg_ptr->foldername );
}
- player_board_load( &cache_ptr->board, path );
- vg_async_call( skateshop_async_board_loaded, cache_ptr, 0 );
- }
- else
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
- }
- vg_async_call( workshop_async_any_complete, NULL, 0 );
-}
-
-/*
- * op: k_workshop_op_item_scan
- * -----------------------------------------------------------------------------
- */
-
-/*
- * Reciever for scan completion. copies the registry_count back into t0
- */
-VG_STATIC void workshop_async_reg_update( void *data, u32 size )
-{
- vg_info( "Registry update notify\n" );
- global_skateshop.registry_count = global_skateshop.t1_registry_count;
-}
-
-VG_STATIC void workshop_steam_scan(void)
-{
- /*
- * Steam workshop scan
- */
- vg_info( "Scanning steam workshop for boards\n" );
- PublishedFileId_t workshop_ids[ SKATESHOP_REGISTRY_MAX ];
- u32 workshop_count = SKATESHOP_REGISTRY_MAX;
-
- vg_async_item *call = vg_async_alloc(
- sizeof(struct async_workshop_installed_files_info));
- struct async_workshop_installed_files_info *info = call->payload;
- info->buffer = workshop_ids;
- info->len = &workshop_count;
- vg_async_dispatch( call, async_workshop_get_installed_files );
- vg_async_stall();
+ /* load content files
+ * --------------------------------- */
- for( u32 j=0; j<workshop_count; j++ ){
- PublishedFileId_t id = workshop_ids[j];
+ vg_str content_path = folder;
- for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
- struct registry_board *reg = &global_skateshop.registry[i];
+ vg_msg root;
+ vg_msg_init( &root, cache_ptr->reg_ptr->metadata,
+ cache_ptr->reg_ptr->metadata_len );
- if( reg->workshop_id == id ){
- reg->state = k_registry_board_state_indexed;
- goto next_file_workshop;
+ const char *kv_content = vg_msg_seekkvstr( &root, "content", 0 );
+ if( kv_content ){
+ vg_strcat( &content_path, "/" );
+ vg_strcat( &content_path, kv_content );
}
- }
-
- if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){
- vg_error( "You have too many boards installed!\n" );
- break;
- }
-
- vg_info( "new listing from the steam workshop!: "PRINTF_U64"\n", id );
-
- struct registry_board *reg = &global_skateshop.registry[
- global_skateshop.t1_registry_count ++ ];
-
- reg->cache_ptr = NULL;
- snprintf( reg->filename, 64, PRINTF_U64, id );
- reg->filename_hash = vg_strdjb2( reg->filename );
- reg->workshop_id = id;
- reg->state = k_registry_board_state_indexed;
-
- workshop_file_info_clear( ®->workshop );
- strcpy( reg->workshop.title, "Workshop file" );
-
- /* load the metadata off the disk */
- vg_async_item *call =
- vg_async_alloc( sizeof(struct async_workshop_filepath_info) );
-
- const char *meta_file = "/board.mdl.inf";
- char path[ 1024 ];
- struct async_workshop_filepath_info *info = call->payload;
- info->buf = path;
- info->id = reg->workshop_id;
- info->len = vg_list_size(path) - strlen(meta_file)-1;
- vg_async_dispatch( call, async_workshop_get_filepath );
- vg_async_stall(); /* too bad! */
-
- strcat( path, meta_file );
- workshop_load_metadata( path, ®->workshop );
-
-next_file_workshop:;
- }
-}
-
-/*
- * Async thread which scans local files for boards, as well as scheduling
- * synchronous calls to the workshop
- */
-VG_STATIC void workshop_scan_thread( void *_args )
-{
- vg_linear_clear( vg_mem.scratch );
-
- for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
- struct registry_board *reg = &global_skateshop.registry[i];
- reg->state = k_registry_board_state_indexed_absent;
- }
-
- /*
- * Local disk scan
- */
- vg_info( "Scanning models/boards/*.mdl\n" );
- tinydir_dir dir;
- tinydir_open( &dir, "models/boards" );
-
- while( dir.has_next ){
- tinydir_file file;
- tinydir_readfile( &dir, &file );
-
- if( file.is_reg ){
- u32 hash = vg_strdjb2( file.name );
-
- for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
- struct registry_board *reg = &global_skateshop.registry[i];
-
- if( const_str_eq( hash, file.name, reg->filename ) ){
- reg->state = k_registry_board_state_indexed;
- goto next_file;
- }
+ else{
+ vg_error( "No content paths in metadata\n" );
+ goto file_is_broken;
}
- if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){
- vg_error( "You have too many boards installed!\n" );
- break;
+ if( !vg_strgood( &content_path ) ) {
+ vg_error( "Metadata path too long\n" );
+ goto file_is_broken;
}
+
+ vg_info( "Load content: %s\n", content_path.buffer );
+ player_board_load( &cache_ptr->board, content_path.buffer );
+ vg_async_call( skateshop_async_board_loaded, cache_ptr, 0 );
+ continue;
- vg_info( "new listing!: %s\n", file.name );
-
- struct registry_board *reg =
- &global_skateshop.registry[global_skateshop.t1_registry_count ++];
-
- reg->cache_ptr = NULL;
- vg_strncpy( file.name, reg->filename, 64, k_strncpy_always_add_null );
- vg_strncpy( file.name, reg->workshop.title,
- 64, k_strncpy_always_add_null );
- reg->filename_hash = hash;
- reg->workshop_id = 0;
- reg->state = k_registry_board_state_indexed;
- reg->workshop.author = 0;
- strcpy( reg->workshop.author_name, "custom" );
+file_is_broken:;
+ SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ cache_ptr->state = k_cache_board_state_none;
+ SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
}
-
-next_file: tinydir_next( &dir );
+ else
+ SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
}
-
- tinydir_close(&dir);
-
- if( steam_ready ) workshop_steam_scan();
-
- vg_async_call( workshop_async_reg_update, NULL, 0 );
- vg_async_stall();
- workshop_visibile_load_loop_thread(NULL);
-}
-
-/*
- * Asynchronous scan of local disk for items and add them to the registry
- */
-VG_STATIC void workshop_op_item_scan(void)
-{
- skaterift_begin_op( k_workshop_op_item_scan );
- vg_loader_start( workshop_scan_thread, NULL );
}
-/*
- * op: k_async_op_world_scan
- * -----------------------------------------------------------------------------
- */
-/*
- * Reciever for scan completion. copies the registry_count back into t0
- */
-VG_STATIC void workshop_async_world_reg_update( void *data, u32 size )
-{
- vg_info( "World registry update notify\n" );
- global_skateshop.world_registry_count =
- global_skateshop.t1_world_registry_count;
+VG_STATIC void world_scan_thread( void *_args ){
+ addon_mount_content_folder( k_workshop_file_type_world, "maps", ".mdl" );
+ addon_mount_workshop_items();
+ vg_async_call( async_addon_reg_update, NULL, 0 );
skaterift_end_op();
}
/*
- * Add a local world folder to the registry, it will verify existing ones are
- * still there too.
+ * Asynchronous scan of local disk for worlds
*/
-VG_STATIC void world_scan_register_local( const char *folder_name )
-{
- u32 hash = vg_strdjb2( folder_name );
- for( u32 i=0; i<global_skateshop.t1_world_registry_count; i++ ){
- struct registry_world *reg =
- &global_skateshop.world_registry[i];
-
- if( const_str_eq( hash, folder_name, reg->foldername ) ){
- reg->state = k_registry_board_state_indexed;
- return;
- }
- }
-
- if( global_skateshop.t1_world_registry_count == SKATESHOP_WORLDS_MAX ){
- vg_error( "You have too many worlds installed!\n" );
- return;
- }
-
- vg_info( "new listing!: %s\n", folder_name );
-
- struct registry_world *reg = &global_skateshop.world_registry[
- global_skateshop.t1_world_registry_count ++ ];
-
- vg_strncpy( folder_name, reg->foldername, 64, k_strncpy_overflow_fatal );
- reg->foldername_hash = hash;
- reg->state = k_registry_board_state_indexed;
- //reg->meta_present = 0;
- reg->type = k_world_load_type_local;
+VG_STATIC void skateshop_op_world_scan(void){
+ skaterift_begin_op( k_async_op_world_scan );
+ vg_loader_start( world_scan_thread, NULL );
}
-/*
- * Async thread which scans local files for boards, as well as scheduling
- * synchronous calls to the workshop
- */
-VG_STATIC void world_scan_thread( void *_args )
-{
- vg_linear_clear( vg_mem.scratch );
-
- for( u32 i=0; i<global_skateshop.t1_world_registry_count; i++ ){
- struct registry_world *reg = &global_skateshop.world_registry[i];
- reg->state = k_registry_board_state_indexed_absent;
- }
-
- /*
- * Local disk scan
- */
- vg_info( "Scanning maps/*.mdl\n" );
-
- char path_buf[4096];
- vg_str path;
- vg_strnull( &path, path_buf, 4096 );
- vg_strcat( &path, "maps/" );
-
- DIR *dir = opendir( path.buffer );
- if( !dir ){
- vg_error( "opendir('maps') failed\n" );
- vg_async_call( workshop_async_any_complete, NULL, 0 );
- return;
- }
-
- struct dirent *entry;
- while( (entry = readdir(dir)) ){
- if( entry->d_type == DT_DIR ){
- if( entry->d_name[0] == '.' ) continue;
-
- vg_str folder = path;
- char *folder_name = folder.buffer+folder.i;
-
- if( strlen( entry->d_name ) >
- vg_list_size(global_skateshop.world_registry[0].foldername)){
- vg_warn( "Map folder too long: %s\n", entry->d_name );
- continue;
- }
-
- vg_strcat( &folder, entry->d_name );
- if( !vg_strgood( &folder ) ) break;
-
- DIR *subdir = opendir( folder.buffer );
- while( (entry = readdir(subdir)) ){
- if( entry->d_type == DT_REG ){
- if( entry->d_name[0] == '.' ) continue;
-
- vg_str file = folder;
- vg_strcat( &file, "/" );
- vg_strcat( &file, entry->d_name );
- if( !vg_strgood( &file ) ) continue;
-
- char *ext = vg_strch( &file, '.' );
- if( !ext ) continue;
- if( strcmp(ext,".mdl") ) continue;
-
- vg_strcat( &folder, "" );
- world_scan_register_local( folder_name );
- }
- }
- closedir(subdir);
- }
- }
- closedir(dir);
-
- vg_async_call( workshop_async_world_reg_update, NULL, 0 );
-
-#if 0
- tinydir_close(&dir);
-
- if( steam_ready ) workshop_steam_scan();
-
- vg_async_call( workshop_async_reg_update, NULL, 0 );
+VG_STATIC void board_scan_thread( void *_args ){
+ 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();
- workshop_visibile_load_loop_thread(NULL);
-#endif
+ workshop_visibile_load_loop();
+ skaterift_end_op();
}
-/*
- * Asynchronous scan of local disk for worlds
- */
-VG_STATIC void skateshop_op_world_scan(void)
-{
- skaterift_begin_op( k_async_op_world_scan );
- vg_loader_start( world_scan_thread, NULL );
+VG_STATIC void skateshop_op_board_scan(void){
+ skaterift_begin_op( k_async_op_board_scan );
+ vg_loader_start( board_scan_thread, NULL );
}
/*
/* we can only keep using a viewslot pointer for multiple frames if we watch it
* using this function */
-VG_STATIC void watch_cache_board( struct cache_board *ptr )
-{
+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" );
}
/* after this is called, the calling code only has access to the pointer for the
* duration of the rest of the frame */
-VG_STATIC void unwatch_cache_board( struct cache_board *ptr )
-{
+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 --;
}
-/*
- * Callback handler for persona state changes,
- * it sets the author names on the registries
- */
-VG_STATIC void callback_persona_statechange( CallbackMsg_t *msg )
-{
- PersonaStateChange_t *info = (PersonaStateChange_t *)msg->m_pubParam;
- ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
-
- if( info->m_nChangeFlags & k_EPersonaChangeName ){
- for( u32 i=0; i<global_skateshop.registry_count; i++ ){
- struct registry_board *reg = &global_skateshop.registry[i];
- if( reg->workshop.author == info->m_ulSteamID ){
- const char *name = SteamAPI_ISteamFriends_GetFriendPersonaName(
- hSteamFriends, info->m_ulSteamID );
- str_utf8_collapse( name, reg->workshop.author_name, 32 );
- }
- }
- }
-}
/*
* VG event init
*/
-VG_STATIC void skateshop_init(void)
-{
- u32 reg_size = sizeof(struct registry_board)*SKATESHOP_REGISTRY_MAX,
- wreg_size = sizeof(struct registry_world)*SKATESHOP_WORLDS_MAX,
- cache_size = sizeof(struct cache_board)*SKATESHOP_BOARD_CACHE_MAX;
-
- global_skateshop.registry = vg_linear_alloc( vg_mem.rtmemory, reg_size );
- global_skateshop.world_registry =
- vg_linear_alloc( vg_mem.rtmemory, wreg_size );
+VG_STATIC void skateshop_init(void){
+ u32 cache_size = sizeof(struct cache_board)*SKATESHOP_BOARD_CACHE_MAX;
global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size );
-
memset( global_skateshop.cache, 0, cache_size );
for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
struct cache_board *board = &global_skateshop.cache[i];
board->state = k_cache_board_state_none;
- board->registry_id = 0xffffffff;
+ board->reg_ptr= NULL;
+ board->reg_index = 0xffffffff;
board->last_use_time = -99999.9;
board->ref_count = 0;
}
-
- if( steam_ready ){
- steam_register_callback( k_iPersonaStateChange,
- callback_persona_statechange );
- }
}
VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
{
- if( global_skateshop.registry_count > 0 ){
- u32 reg_id = global_skateshop.selected_registry_id;
- struct registry_board *reg = &global_skateshop.registry[ reg_id ];
+ if( addon_count(k_workshop_file_type_board) ){
+ addon_reg *reg = get_addon_from_index(k_workshop_file_type_board,
+ global_skateshop.selected_board_id);
SDL_AtomicLock( &global_skateshop.sl_cache_access );
- if( reg->cache_ptr &&
- (reg->cache_ptr->state == k_cache_board_state_loaded ) )
- {
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
- return reg->cache_ptr;
+ if( reg->userdata ){
+ struct cache_board *cache_ptr = reg->userdata;
+ if( cache_ptr->state == k_cache_board_state_loaded ){
+ SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ return cache_ptr;
+ }
}
SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
}
VG_STATIC void skateshop_preview_loader_thread( void *_data )
{
- struct registry_world *reg = _data;
+ addon_reg *reg = _data;
- if( reg->type == k_world_load_type_local ){
+ if( reg->workshop_id ){
+ vg_error( "Workshop files unsupported\n" );
+ vg_async_call( pointcloud_clear_async, NULL, 0 );
+ }
+ else{
char path_buf[4096];
vg_str path;
vg_strnull( &path, path_buf, 4096 );
vg_async_call( pointcloud_clear_async, NULL, 0 );
}
}
- else{
- vg_async_call( pointcloud_clear_async, NULL, 0 );
- }
}
-VG_STATIC void skateshop_load_world_preview( struct registry_world *reg )
+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 );
*/
if( button_down( k_srbind_mleft ) ){
- if( global_skateshop.selected_registry_id > 0 ){
- global_skateshop.selected_registry_id --;
+ if( global_skateshop.selected_board_id > 0 ){
+ global_skateshop.selected_board_id --;
}
}
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_registry_id+1 <
- global_skateshop.registry_count )
+ if( global_skateshop.selected_board_id+1 <
+ addon_count(k_workshop_file_type_board) )
{
- global_skateshop.selected_registry_id ++;
+ global_skateshop.selected_board_id ++;
}
}
if( selected_cache && button_down( k_srbind_maccept ) ){
vg_info( "chose board from skateshop (%u)\n",
- global_skateshop.selected_registry_id );
+ global_skateshop.selected_board_id );
if( localplayer.board_view_slot ){
unwatch_cache_board( localplayer.board_view_slot );
localplayer.board_view_slot = selected_cache;
watch_cache_board( localplayer.board_view_slot );
-
global_skateshop_exit();
return;
}
int browseable = 0,
loadable = 0;
- if( global_skateshop.world_registry_count &&
+ if( addon_count(k_workshop_file_type_world) &&
((skaterift.async_op == k_async_op_none)||
(skaterift.async_op == k_async_op_world_load_preview))){
gui_helper_action( axis_display_string(k_sraxis_mbrowse_h), "browse" );
browseable = 1;
}
- if( skaterift.async_op == k_async_op_none ){
- gui_helper_action( button_display_string(k_srbind_maccept), "load" );
+ if( (skaterift.async_op == k_async_op_none) &&
+ global_skateshop.selected_world_id > 0 ){
+ gui_helper_action( button_display_string(k_srbind_maccept),
+ "open rift" );
loadable = 1;
}
if( button_down( k_srbind_mright ) ){
if( global_skateshop.selected_world_id+1 <
- global_skateshop.world_registry_count )
+ addon_count(k_workshop_file_type_world) )
{
global_skateshop.selected_world_id ++;
change = 1;
}
if( skaterift.async_op == k_async_op_none ){
- struct registry_world *rw = &global_skateshop.world_registry[
- global_skateshop.selected_world_id ];
+ addon_reg *reg = get_addon_from_index( k_workshop_file_type_world,
+ global_skateshop.selected_world_id );
/* automatically load in clouds */
if( loadable && button_down( k_srbind_maccept ) ){
- vg_info( "Select world (%u)\n",
+ vg_info( "Select rift (%u)\n",
global_skateshop.selected_world_id );
- skaterift_change_world( rw->foldername );
+ skaterift_change_world( reg->foldername );
return;
}
else{
{
global_skateshop.pointcloud_world_id =
global_skateshop.selected_world_id;
- skateshop_load_world_preview( rw );
+ skateshop_load_world_preview( reg );
}
else{
pointcloud_animate( k_pointcloud_anim_opening );
xform.co[0] = -((float)i - ((float)slot_count)*0.5f)*0.45f;
mdl_transform_mul( &mark_rack->transform, &xform, &xform );
- if( slot->cache_ptr->registry_id ==
- global_skateshop.selected_registry_id ){
+ if( slot->cache_ptr->reg_index == global_skateshop.selected_board_id ){
selected = 1.0f;
}
mlocal[3][2] = -0.7f;
m4x3_mul( mrack, mlocal, mmdl );
- if( global_skateshop.registry_count == 0 ){
- font3d_simple_draw( &gui.font, 0,
- "Nothing installed", &main_camera, mmdl );
- }
- else{
+ if( addon_count(k_workshop_file_type_board) ){
char buf[16];
int i=0;
- i+=highscore_intl( buf+i, global_skateshop.selected_registry_id+1, 3 );
+ i+=highscore_intl( buf+i, global_skateshop.selected_board_id+1, 3 );
buf[i++] = '/';
- i+=highscore_intl( buf+i, global_skateshop.registry_count, 3 );
+ i+=highscore_intl( buf+i, addon_count(k_workshop_file_type_board), 3 );
buf[i++] = '\0';
font3d_simple_draw( &gui.font, 0, buf, &main_camera, mmdl );
}
+ else{
+ font3d_simple_draw( &gui.font, 0,
+ "Nothing installed", &main_camera, mmdl );
+ }
struct cache_board *cache_ptr = skateshop_selected_cache_if_loaded();
- if( !cache_ptr ) return;
- struct registry_board *reg =
- &global_skateshop.registry[cache_ptr->registry_id];
- struct workshop_file_info *info = ®->workshop;
+ if( !cache_ptr ){
+ global_skateshop.render.item_title = "";
+ global_skateshop.render.item_desc = "";
+ return;
+ }
+
+ if( global_skateshop.render.reg_id != global_skateshop.selected_board_id ){
+ addon_reg *reg = cache_ptr->reg_ptr;
+ vg_msg root;
+ vg_msg_init( &root, reg->metadata, reg->metadata_len );
+
+ vg_msg workshop = root;
+ if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
+ const char *title = vg_msg_seekkvstr( &workshop, "title", 0 );
+ if( title ) global_skateshop.render.item_title = title;
+ }
+
+ global_skateshop.render.reg_id = global_skateshop.selected_board_id;
+ }
+
+ addon_reg *reg = cache_ptr->reg_ptr;
/* Skin title
* ----------------------------------------------------------------- */
m3x3_zero( mlocal );
m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0, info->title );
+ mlocal[3][0] = -font3d_string_width( &gui.font, 0,
+ global_skateshop.render.item_title );
mlocal[3][0] *= scale*0.5f;
mlocal[3][1] = 0.1f;
mlocal[3][2] = 0.0f;
m4x3_mul( mtext, mlocal, mmdl );
- font3d_simple_draw( &gui.font, 0, info->title, &main_camera, mmdl );
+ font3d_simple_draw( &gui.font, 0, global_skateshop.render.item_title,
+ &main_camera, mmdl );
/* Author name
* ----------------------------------------------------------------- */
scale *= 0.4f;
m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0, info->author_name );
+ mlocal[3][0] = -font3d_string_width( &gui.font, 0, "JA" );
mlocal[3][0] *= scale*0.5f;
mlocal[3][1] = 0.0f;
mlocal[3][2] = 0.0f;
m4x3_mul( mtext, mlocal, mmdl );
- font3d_simple_draw( &gui.font, 0, info->author_name, &main_camera, mmdl );
+ font3d_simple_draw( &gui.font, 0, global_skateshop.render.item_desc,
+ &main_camera, mmdl );
}
VG_STATIC void skateshop_render_charshop(void)
*mark_info = mdl_arritm( &world->ent_marker,
mdl_entity_id_id(shop->boards.id_info));
+ if( global_skateshop.render.world_reg != global_skateshop.selected_world_id){
+ 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 workshop = root;
+ if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
+ global_skateshop.render.world_title = vg_msg_seekkvstr( &workshop,
+ "title", 0 );
+ }
+ global_skateshop.render.world_loc = vg_msg_seekkvstr(&root,"location",0);
+ global_skateshop.render.world_reg = global_skateshop.selected_world_id;
+ }
+
/* Text */
char buftext[128], bufsubtext[128];
vg_str info, subtext;
vg_strnull( &info, buftext, 128 );
vg_strnull( &subtext, bufsubtext, 128 );
- if( global_skateshop.world_registry_count ){
- struct registry_world *rw = &global_skateshop.world_registry[
- global_skateshop.selected_world_id ];
+ if( addon_count(k_workshop_file_type_world) ){
+ addon_reg *reg = get_addon_from_index( k_workshop_file_type_world,
+ global_skateshop.selected_world_id );
info.i+=highscore_intl( info.buffer+info.i,
global_skateshop.selected_world_id+1, 3 );
info.buffer[info.i++] = '/';
info.i+=highscore_intl( info.buffer+info.i,
- global_skateshop.world_registry_count, 3 );
+ addon_count(k_workshop_file_type_world), 3 );
info.buffer[info.i++] = ' ';
info.buffer[info.i] = '\0';
- vg_strcat( &info, rw->foldername );
+ vg_strcat( &info, global_skateshop.render.world_title );
if( skaterift.async_op == k_async_op_world_loading ||
skaterift.async_op == k_async_op_world_preloading ){
vg_strcat( &subtext, "Loading..." );
}
else{
- vg_strcat( &subtext, "No information" );
+ vg_strcat( &subtext, global_skateshop.render.world_loc );
}
}
else{
if( shop->type == k_skateshop_type_boardshop ){
skateshop_update_viewpage();
- workshop_op_item_scan();
+ skateshop_op_board_scan();
}
else if( shop->type == k_skateshop_type_worldshop ){
pointcloud_animate( k_pointcloud_anim_opening );