X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=47d8de29333b9a6b4971f4ad3574ef2f5e45f8a3;hb=92ba950580dd4877935e90682cd4f66fead8fed2;hp=708e6483e40e9bad3edc4f365dff61b913473220;hpb=ac6288a8951db15eab6c681b8add8f350eb60746;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 708e648..47d8de2 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -1,10 +1,19 @@ #ifndef ENT_SKATESHOP_C #define ENT_SKATESHOP_C +#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 "gui.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 @@ -21,15 +30,15 @@ static inline int const_str_eq( u32 hash, const char *str, const char *cmp ) * 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; } } @@ -52,24 +61,20 @@ VG_STATIC struct cache_board *skateshop_cache_fetch( u32 registry_index ) 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; @@ -84,7 +89,7 @@ VG_STATIC struct cache_board *skateshop_cache_fetch( u32 registry_index ) 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; icache_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 ); } } -/* generic reciever */ -VG_STATIC void workshop_async_any_complete( void *data, u32 size ) -{ - workshop_end_op(); -} - /* * op/subroutine: k_workshop_op_item_load * ----------------------------------------------------------------------------- @@ -118,27 +117,27 @@ VG_STATIC void skateshop_async_board_loaded( void *payload, u32 size ) 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; istate == 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 ); @@ -148,176 +147,103 @@ VG_STATIC void workshop_visibile_load_loop_thread( void *_args ) /* 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; -} - -/* - * 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; istate = k_registry_board_state_indexed_absent; - } + /* load content files + * --------------------------------- */ - /* - * Local disk scan - */ - vg_info( "Scanning models/boards/*.mdl\n" ); - tinydir_dir dir; - tinydir_open( &dir, "models/boards" ); + vg_str content_path = folder; - while( dir.has_next ){ - tinydir_file file; - tinydir_readfile( &dir, &file ); - - if( file.is_reg ){ - u32 hash = vg_strdjb2( file.name ); + vg_msg root; + vg_msg_init( &root, cache_ptr->reg_ptr->metadata, + cache_ptr->reg_ptr->metadata_len ); - for( u32 i=0; ifilename ) ){ - reg->state = k_registry_board_state_indexed; - goto next_file; - } + 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; + else{ + vg_error( "No content paths in metadata\n" ); + goto file_is_broken; } - 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 ); - reg->filename_hash = hash; - reg->workshop_id = 0; - reg->state = k_registry_board_state_indexed; - } - -next_file: tinydir_next( &dir ); - } - - tinydir_close(&dir); - - /* - * 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(); - - for( u32 j=0; jworkshop_id == id ){ - reg->state = k_registry_board_state_indexed; - goto next_file_workshop; + 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; - if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){ - vg_error( "You have too many boards installed!\n" ); - break; +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 ); } + else + SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); + } +} - vg_info( "new listing from the steam workshop!: "PRINTF_U64"\n", id ); - struct registry_board *reg = &global_skateshop.registry[ - global_skateshop.t1_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(); +} - 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; +/* + * 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 ); +} -next_file_workshop:; - } - - 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); + workshop_visibile_load_loop(); + skaterift_end_op(); } -/* - * Asynchronous scan of local disk for items and add them to the registry - */ -VG_STATIC void workshop_op_item_scan(void) -{ - workshop_begin_op( k_workshop_op_item_scan ); - vg_loader_start( workshop_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 ); } /* @@ -327,8 +253,7 @@ VG_STATIC void workshop_op_item_scan(void) /* 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" ); } @@ -339,8 +264,7 @@ VG_STATIC void watch_cache_board( struct cache_board *ptr ) /* 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" ); } @@ -348,24 +272,20 @@ VG_STATIC void unwatch_cache_board( struct cache_board *ptr ) ptr->ref_count --; } + /* * VG event init */ -VG_STATIC void skateshop_init(void) -{ - u32 reg_size = sizeof(struct registry_board)*SKATESHOP_REGISTRY_MAX, - cache_size = sizeof(struct cache_board)*SKATESHOP_BOARD_CACHE_MAX; - - global_skateshop.registry = vg_linear_alloc( vg_mem.rtmemory, reg_size ); - global_skateshop.registry_count = 0; +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; istate = 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; } @@ -373,16 +293,17 @@ VG_STATIC void skateshop_init(void) 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 ); } @@ -390,9 +311,74 @@ VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void) return NULL; } +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 ) +{ + addon_reg *reg = _data; + + 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_strcat( &path, "maps/" ); + vg_strcat( &path, reg->foldername ); + vg_strcat( &path, "/preview.bin" ); + + vg_linear_clear(vg_mem.scratch); + u32 size; + + void *data = vg_file_read( vg_mem.scratch, path_buf, &size ); + if( data ){ + if( size < sizeof(pointcloud_buffer) ){ + vg_async_call( pointcloud_clear_async, NULL, 0 ); + return; + } + + vg_async_item *call = vg_async_alloc(size); + pointcloud_buffer *pcbuf = call->payload; + memcpy( pcbuf, data, size ); + + u32 point_count = (size-sizeof(pointcloud_buffer)) / + sizeof(struct pointcloud_vert); + pcbuf->max = point_count; + pcbuf->count = point_count; + pcbuf->op = k_pointcloud_op_clear; + + vg_async_dispatch( call, async_pointcloud_sub ); + vg_async_call( pointcloud_async_end, NULL, 0 ); + } + else{ + vg_async_call( pointcloud_clear_async, NULL, 0 ); + } + } +} + +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 event preupdate */ +void temp_update_playermodel(void); VG_STATIC void global_skateshop_preupdate(void) { float rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f ); @@ -401,21 +387,34 @@ VG_STATIC void global_skateshop_preupdate(void) if( !global_skateshop.active ) return; - world_instance *world = get_active_world(); - + world_instance *world = world_current_instance(); ent_skateshop *shop = global_skateshop.ptr_ent; + + /* camera positioning */ ent_camera *ref = mdl_arritm( &world->ent_camera, mdl_entity_id_id(shop->id_camera) ); - ent_marker *display = mdl_arritm( &world->ent_marker, - mdl_entity_id_id(shop->id_display) ); - + v3f dir = {0.0f,-1.0f,0.0f}; mdl_transform_vector( &ref->transform, dir, dir ); + m3x3_mulv( localplayer.invbasis, dir, dir ); player_vector_angles( localplayer.cam_override_angles, dir, 1.0f, 0.0f ); - + v3f lookat; - v3_sub( display->transform.co, localplayer.rb.co, lookat ); - + if( shop->type == k_skateshop_type_boardshop || + shop->type == k_skateshop_type_worldshop ){ + ent_marker *display = mdl_arritm( &world->ent_marker, + mdl_entity_id_id(shop->boards.id_display) ); + + v3_sub( display->transform.co, localplayer.rb.co, lookat ); + + } + else if( shop->type == k_skateshop_type_charshop ){ + v3_sub( ref->transform.co, localplayer.rb.co, lookat ); + } + else{ + vg_fatal_error( "Unknown store (%u)\n", shop->type ); + } + q_axis_angle( localplayer.rb.q, (v3f){0.0f,1.0f,0.0f}, atan2f(lookat[0],lookat[2]) ); @@ -423,62 +422,159 @@ VG_STATIC void global_skateshop_preupdate(void) localplayer.cam_override_fov = ref->fov; localplayer.cam_override_strength = global_skateshop.factive; - gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); - gui_helper_action( button_display_string( k_srbind_mback ), "exit" ); + /* input */ + if( shop->type == k_skateshop_type_boardshop ){ + gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); + gui_helper_action( button_display_string( k_srbind_mback ), "exit" ); - int moved = 0; - struct cache_board *selected_cache = skateshop_selected_cache_if_loaded(); + struct cache_board *selected_cache = skateshop_selected_cache_if_loaded(); - if( selected_cache ){ - gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); - } + if( selected_cache ){ + gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); + } - /* - * Controls - * ---------------------- - */ + /* + * Controls + * ---------------------- + */ - if( global_skateshop.interaction_cooldown > 0.0f ){ - global_skateshop.interaction_cooldown -= vg.time_delta; - return; - } + if( button_down( k_srbind_mleft ) ){ + if( global_skateshop.selected_board_id > 0 ){ + global_skateshop.selected_board_id --; + } + } - if( button_down( k_srbind_mleft ) ){ - if( global_skateshop.selected_registry_id > 0 ){ - global_skateshop.selected_registry_id --; - moved = 1; + if( button_down( k_srbind_mright ) ){ + if( global_skateshop.selected_board_id+1 < + addon_count(k_workshop_file_type_board) ) + { + global_skateshop.selected_board_id ++; + } } - } - if( button_down( k_srbind_mright ) ){ - if( global_skateshop.selected_registry_id+1 < - global_skateshop.registry_count ) - { - global_skateshop.selected_registry_id ++; - moved = 1; + if( selected_cache && button_down( k_srbind_maccept ) ){ + vg_info( "chose board from skateshop (%u)\n", + 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; } } + else if( shop->type == k_skateshop_type_charshop ){ + gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); + gui_helper_action( button_display_string( k_srbind_mback ), "exit" ); + gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); - if( moved ){ - vg_info( "Select registry: %u\n", - global_skateshop.selected_registry_id ); - global_skateshop.interaction_cooldown = 0.125f; - return; + if( button_down( k_srbind_mleft ) ){ + if( cl_playermdl_id > 0 ){ + cl_playermdl_id --; + } + else{ + cl_playermdl_id = 2; /* HACK */ + } + temp_update_playermodel(); /* HACK */ + } + + if( button_down( k_srbind_mright ) ){ + if( cl_playermdl_id+1 < 3 ){ + cl_playermdl_id ++; + } + else{ + cl_playermdl_id = 0; /* HACK */ + } + temp_update_playermodel(); /* HACK */ + /*lol*/ + } + + if( button_down( k_srbind_maccept ) ){ + global_skateshop_exit(); + } } + else if( shop->type == k_skateshop_type_worldshop ){ + int browseable = 0, + loadable = 0; + + 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( selected_cache && button_down( k_srbind_maccept ) ){ - vg_info( "chose board from skateshop (%u)\n", - global_skateshop.selected_registry_id ); + 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; + } + + int change = 0; + + if( browseable ){ + if( button_down( k_srbind_mleft ) ){ + if( global_skateshop.selected_world_id > 0 ) + { + global_skateshop.selected_world_id --; + change = 1; + } + } - if( localplayer.board_view_slot ){ - unwatch_cache_board( localplayer.board_view_slot ); + if( button_down( k_srbind_mright ) ){ + if( global_skateshop.selected_world_id+1 < + addon_count(k_workshop_file_type_world) ) + { + global_skateshop.selected_world_id ++; + change = 1; + } + } + } + + if( change && pointcloud_idle() ){ + pointcloud_animate( k_pointcloud_anim_hiding ); } - localplayer.board_view_slot = selected_cache; - watch_cache_board( localplayer.board_view_slot ); + if( skaterift.async_op == k_async_op_none ){ + addon_reg *reg = get_addon_from_index( k_workshop_file_type_world, + global_skateshop.selected_world_id ); - global_skateshop_exit(); - return; + /* automatically load in clouds */ + if( loadable && button_down( k_srbind_maccept ) ){ + vg_info( "Select rift (%u)\n", + global_skateshop.selected_world_id ); + skaterift_change_world( reg->foldername ); + return; + } + else{ + if( pointcloud.anim == k_pointcloud_anim_idle_closed ){ + if( global_skateshop.pointcloud_world_id != + global_skateshop.selected_world_id ) + { + global_skateshop.pointcloud_world_id = + global_skateshop.selected_world_id; + skateshop_load_world_preview( reg ); + } + else{ + pointcloud_animate( k_pointcloud_anim_opening ); + } + } + else if( pointcloud.anim == k_pointcloud_anim_idle_open ){ + if( global_skateshop.pointcloud_world_id != + global_skateshop.selected_world_id ) + { + pointcloud_animate( k_pointcloud_anim_hiding ); + } + } + } + } + } + else{ + vg_fatal_error( "Unknown store (%u)\n", shop->type ); } if( button_down( k_srbind_mback ) ){ @@ -487,22 +583,17 @@ VG_STATIC void global_skateshop_preupdate(void) } } -/* - * World: render event - */ -VG_STATIC void skateshop_render(void) +VG_STATIC void skateshop_render_boardshop(void) { - if( !global_skateshop.active ) return; - + world_instance *world = world_current_instance(); ent_skateshop *shop = global_skateshop.ptr_ent; - world_instance *world = get_active_world(); u32 slot_count = vg_list_size(global_skateshop.shop_view_slots); ent_marker *mark_rack = mdl_arritm( &world->ent_marker, - mdl_entity_id_id(shop->id_rack)), + mdl_entity_id_id(shop->boards.id_rack)), *mark_display = mdl_arritm( &world->ent_marker, - mdl_entity_id_id(shop->id_display)); + mdl_entity_id_id(shop->boards.id_display)); int visibility[ SKATESHOP_VIEW_SLOT_MAX ]; SDL_AtomicLock( &global_skateshop.sl_cache_access ); @@ -530,8 +621,7 @@ VG_STATIC void skateshop_render(void) 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; } @@ -551,13 +641,15 @@ fade_out:; } ent_marker *mark_info = mdl_arritm( &world->ent_marker, - mdl_entity_id_id(shop->id_info)); + mdl_entity_id_id(shop->boards.id_info)); m4x3f mtext, mrack; mdl_transform_m4x3( &mark_info->transform, mtext ); mdl_transform_m4x3( &mark_rack->transform, mrack ); +#if 0 const char *text_title = "Fish - Title"; const char *text_author = "by Shaniqua"; +#endif m4x3f mlocal, mmdl; m4x3_identity( mlocal ); @@ -565,7 +657,7 @@ fade_out:; float scale = 0.2f, thickness = 0.03f; - font3d_bind( &world_global.font, &main_camera ); + font3d_bind( &gui.font, &main_camera ); shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} ); /* Selection counter @@ -578,42 +670,188 @@ fade_out:; mlocal[3][2] = -0.7f; m4x3_mul( mrack, mlocal, mmdl ); - if( global_skateshop.registry_count == 0 ){ - font3d_simple_draw( &world_global.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( &world_global.font, 0, buf, &main_camera, mmdl ); + 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; + + 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(&world_global.font,0,text_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( &world_global.font, 0, text_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(&world_global.font,0,text_author); + 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( &world_global.font, 0, text_author, &main_camera, mmdl ); + font3d_simple_draw( &gui.font, 0, global_skateshop.render.item_desc, + &main_camera, mmdl ); +} + +VG_STATIC void skateshop_render_charshop(void) +{ +} + +VG_STATIC void skateshop_render_worldshop(void) +{ + world_instance *world = world_current_instance(); + + ent_skateshop *shop = global_skateshop.ptr_ent; + ent_marker *mark_display = mdl_arritm( &world->ent_marker, + mdl_entity_id_id(shop->worlds.id_display)), + *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( 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, + addon_count(k_workshop_file_type_world), 3 ); + info.buffer[info.i++] = ' '; + info.buffer[info.i] = '\0'; + + 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, global_skateshop.render.world_loc ); + } + } + else{ + vg_strcat( &info, "No worlds installed" ); + } + + + m4x3f mtext,mlocal,mtextmdl; + mdl_transform_m4x3( &mark_info->transform, mtext ); + + font3d_bind( &gui.font, &main_camera ); + shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} ); + + float scale = 0.2f, thickness = 0.015f, scale1 = 0.08f; + m3x3_zero( mlocal ); + m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } ); + mlocal[3][0] = -font3d_string_width( &gui.font, 0, buftext ); + mlocal[3][0] *= scale*0.5f; + mlocal[3][1] = 0.1f; + mlocal[3][2] = 0.0f; + m4x3_mul( mtext, mlocal, mtextmdl ); + font3d_simple_draw( &gui.font, 0, buftext, &main_camera, mtextmdl ); + + m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } ); + mlocal[3][0] = -font3d_string_width( &gui.font, 0, bufsubtext ); + mlocal[3][0] *= scale1*0.5f; + mlocal[3][1] = -scale1*0.3f; + m4x3_mul( mtext, mlocal, mtextmdl ); + font3d_simple_draw( &gui.font, 0, bufsubtext, &main_camera, mtextmdl ); + + /* pointcloud */ + m4x3f mmdl; + mdl_transform_m4x3( &mark_display->transform, mmdl ); + m4x3_rotate_y( mmdl, vg.time * 0.2 ); + + glEnable(GL_BLEND); + glBlendFunc(GL_ONE, GL_ONE); + glDisable(GL_DEPTH_TEST); + pointcloud_render( world, &main_camera, mmdl ); + glDisable(GL_BLEND); + glEnable(GL_DEPTH_TEST); +} + +/* + * World: render event + */ +VG_STATIC void skateshop_render(void) +{ + if( !global_skateshop.active ) return; + + ent_skateshop *shop = global_skateshop.ptr_ent; + + if( shop->type == k_skateshop_type_boardshop ){ + skateshop_render_boardshop(); + } + else if( shop->type == k_skateshop_type_charshop ){ + skateshop_render_charshop(); + } + else if( shop->type == k_skateshop_type_worldshop ){ + skateshop_render_worldshop(); + } + else{ + vg_fatal_error( "Unknown store (%u)\n", shop->type ); + } } /* @@ -625,6 +863,9 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call ) ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index ); vg_info( "skateshop_call\n" ); + if( menu.active ) return; + if( skaterift.async_op != k_async_op_none ) return; + if( call->function == k_ent_function_trigger ){ if( localplayer.subsystem != k_player_subsystem_walk ){ return; @@ -633,6 +874,7 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call ) vg_info( "Entering skateshop\n" ); localplayer.immobile = 1; + menu.disable_open = 1; global_skateshop.active = 1; v3_zero( localplayer.rb.v ); @@ -640,8 +882,14 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call ) localplayer._walk.move_speed = 0.0f; global_skateshop.ptr_ent = shop; - skateshop_update_viewpage(); - workshop_op_item_scan(); + if( shop->type == k_skateshop_type_boardshop ){ + skateshop_update_viewpage(); + skateshop_op_board_scan(); + } + else if( shop->type == k_skateshop_type_worldshop ){ + pointcloud_animate( k_pointcloud_anim_opening ); + skateshop_op_world_scan(); + } } } @@ -653,6 +901,7 @@ VG_STATIC void global_skateshop_exit(void) vg_info( "exit skateshop\n" ); localplayer.immobile = 0; global_skateshop.active = 0; + menu.disable_open = 0; srinput.ignore_input_frames = 2; }