X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=05999f9322c5793df9cccb00c7e547f14c03b460;hb=bececcbb7b2e886e72425e7c070e1fdc3aa126dc;hp=92e7660255ef06f813b800bb0f4e6dd79e4f8c96;hpb=9d0ff08fef8507613586856de7ce25d43704db92;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 92e7660..05999f9 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -1,14 +1,22 @@ -#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 "vg/vg_tex.h" +#include "vg/vg_image.h" +#include "vg/vg_loader.h" #include "ent_skateshop.h" #include "world.h" #include "player.h" #include "gui.h" #include "menu.h" +#include "steam.h" +#include "addon.h" +#include "save.h" +#include "network.h" + +struct global_skateshop global_skateshop = +{ + .render={.reg_id=0xffffffff,.world_reg=0xffffffff} +}; /* * Checks string equality but does a hash check first @@ -21,90 +29,118 @@ static inline int const_str_eq( u32 hash, const char *str, const char *cmp ) return 0; } -/* - * 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 ) -{ - struct registry_board *reg = NULL; +static void skateshop_update_viewpage(void){ + u32 page = global_skateshop.selected_board_id/SKATESHOP_VIEW_SLOT_MAX; - if( registry_index < global_skateshop.registry_count ){ - reg = &global_skateshop.registry[ registry_index ]; - - if( reg->cache_ptr ){ - return reg->cache_ptr; - } + for( u32 i=0; icache_id ); } + + for( u32 i=0; icache_id = addon_cache_create_viewer( k_addon_type_board, + request_id ); + } +} - /* lru eviction. should be a linked list maybe... */ - double min_time = 1e300; - struct cache_board *min_board = NULL; +struct async_preview_load_thread_data{ + void *data; + addon_reg *reg; +}; - SDL_AtomicLock( &global_skateshop.sl_cache_access ); - for( u32 i=0; istate == k_cache_board_state_load_request ) continue; - if( cache_ptr->ref_count ) continue; + if( inf->data ){ + glBindTexture( GL_TEXTURE_2D, global_skateshop.tex_preview ); + glTexSubImage2D( GL_TEXTURE_2D, 0,0,0, + WORKSHOP_PREVIEW_WIDTH, WORKSHOP_PREVIEW_HEIGHT, + GL_RGB, GL_UNSIGNED_BYTE, inf->data ); + glGenerateMipmap( GL_TEXTURE_2D ); + stbi_image_free( inf->data ); - if( cache_ptr->last_use_time < min_time ){ - min_time = cache_ptr->last_use_time; - min_board = cache_ptr; - } + skaterift.rt_textures[k_skaterift_rt_workshop_preview] = + global_skateshop.tex_preview; + } + else { + skaterift.rt_textures[k_skaterift_rt_workshop_preview] = vg.tex_missing; } - if( min_board ){ - if( min_board->state == k_cache_board_state_loaded ){ - struct registry_board *other = - &global_skateshop.registry[ min_board->registry_id ]; + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + global_skateshop.reg_loaded_preview = inf->reg; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); +} - vg_info( "Deallocating board: '%s'\n", min_board, other->filename ); +static void skateshop_update_preview_image_thread(void *_args) +{ + char path_buf[4096]; + vg_str folder; + vg_strnull( &folder, path_buf, sizeof(path_buf) ); + + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + addon_reg *reg_preview = global_skateshop.reg_preview; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + + if( !addon_get_content_folder( reg_preview, &folder, 1 ) ) + { + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + global_skateshop.reg_loaded_preview = reg_preview; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + return; + } - player_board_unload( &min_board->board ); - other->cache_ptr = NULL; - } + vg_strcat( &folder, "/preview.jpg" ); + vg_async_item *call = + vg_async_alloc( sizeof(struct async_preview_load_thread_data) ); + struct async_preview_load_thread_data *inf = call->payload; - if( reg ){ - vg_info( "Allocating board (reg:%u) '%s'\n", - registry_index, reg->filename ); - } - else{ - vg_info( "Pre-allocating board (reg:%u) 'null'\n", registry_index ); - } + inf->reg = reg_preview; - min_board->registry_id = registry_index; - min_board->last_use_time = vg.time; - min_board->ref_count = 0; - min_board->state = k_cache_board_state_load_request; - } - else{ - vg_error( "No free boards to load registry!\n" ); - } + if( vg_strgood( &folder ) ) + { + stbi_set_flip_vertically_on_load(1); + int x, y, nc; + inf->data = stbi_load( folder.buffer, &x, &y, &nc, 3 ); - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); - return min_board; -} + if( inf->data ) + { + if( (x != WORKSHOP_PREVIEW_WIDTH) || (y != WORKSHOP_PREVIEW_HEIGHT) ) + { + vg_error( "Resolution does not match framebuffer, so we can't" + " show it\n" ); + stbi_image_free( inf->data ); + inf->data = NULL; + } + } -VG_STATIC void skateshop_update_viewpage(void) -{ - u32 page = global_skateshop.selected_registry_id/SKATESHOP_VIEW_SLOT_MAX; - - for( u32 i=0; icache_ptr ) unwatch_cache_board( slot->cache_ptr ); + vg_async_dispatch( call, skateshop_async_preview_imageload ); + } + else + { + vg_error( "Path too long to workshop preview image.\n" ); - slot->cache_ptr = skateshop_cache_fetch( request_id ); - if( slot->cache_ptr ) watch_cache_board( slot->cache_ptr ); + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + global_skateshop.reg_loaded_preview = reg_preview; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); } } -/* generic reciever */ -VG_STATIC void workshop_async_any_complete( void *data, u32 size ) +void skateshop_world_preview_preupdate(void) { - workshop_end_op(); + /* try to load preview image if we availible to do. */ + if( vg_loader_availible() ) + { + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + if( global_skateshop.reg_preview != global_skateshop.reg_loaded_preview ) + { + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + vg_loader_start( skateshop_update_preview_image_thread, NULL ); + } + else SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + } } /* @@ -113,472 +149,327 @@ VG_STATIC void workshop_async_any_complete( void *data, u32 size ) */ /* - * Reciever for board completion; only promotes the status in the main thread + * Regular stuff + * ----------------------------------------------------------------------------- */ -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; - struct registry_board *reg = - &global_skateshop.registry[ cache_ptr->registry_id ]; - reg->cache_ptr = cache_ptr; - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); - - vg_success( "Async board loaded (%s)\n", reg->filename ); +static void skateshop_init_async(void *_data,u32 size){ + glGenTextures( 1, &global_skateshop.tex_preview ); + glBindTexture( GL_TEXTURE_2D, global_skateshop.tex_preview ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, + WORKSHOP_PREVIEW_WIDTH, WORKSHOP_PREVIEW_HEIGHT, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL ); + + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, + GL_LINEAR_MIPMAP_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + + skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] = vg.tex_missing; + skaterift.rt_textures[ k_skaterift_rt_server_status ] = vg.tex_missing; + render_server_status_gui(); } /* - * Thread(or subroutine of thread), for checking view slots that weve installed. - * Load the model if a view slot wants it + * VG event init */ -VG_STATIC void workshop_visibile_load_loop_thread( void *_args ) +void skateshop_init(void) { - char path[1024]; - for( u32 i=0; istate == k_cache_board_state_load_request ){ - if( cache_ptr->registry_id >= global_skateshop.registry_count ){ - /* 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; - } - - /* continue with the request */ - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); - - struct registry_board *reg = - &global_skateshop.registry[ cache_ptr->registry_id ]; - - if( reg->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; - vg_async_dispatch( call, async_workshop_get_filepath ); - vg_async_stall(); /* too bad! */ + vg_async_call( skateshop_init_async, NULL, 0 ); +} - 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 ); +static u16 skateshop_selected_cache_id(void){ + if( addon_count(k_addon_type_board, ADDON_REG_HIDDEN) ){ + addon_reg *reg = get_addon_from_index( + k_addon_type_board, global_skateshop.selected_board_id, + ADDON_REG_HIDDEN ); + return reg->cache_id; + } + else return 0; +} - vg_error( "Failed SteamAPI_GetItemInstallInfo(" PRINTF_U64 ")\n", - reg->workshop_id ); - continue; - } - else{ - strcat( path, "/board.mdl" ); - } - } - else{ - snprintf( path, 256, "models/boards/%s", reg->filename ); - } +static void skateshop_server_helper_update(void){ + vg_str text; + vg_strnull( &text, global_skateshop.helper_toggle->text, + sizeof(global_skateshop.helper_toggle->text) ); - player_board_load( &cache_ptr->board, path ); - vg_async_call( skateshop_async_board_loaded, cache_ptr, 0 ); - } + if( skaterift.demo_mode ){ + vg_strcat( &text, "Not availible in demo" ); + } + else { + if( network_client.user_intent == k_server_intent_online ) + vg_strcat( &text, "Disconnect" ); else - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); + vg_strcat( &text, "Go Online" ); } - 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 event preupdate */ -VG_STATIC void workshop_async_reg_update( void *data, u32 size ) +void temp_update_playermodel(void); +void ent_skateshop_preupdate( ent_focus_context *ctx ) { - 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(); - - for( u32 j=0; jworkshop_id == id ){ - reg->state = k_registry_board_state_indexed; - goto next_file_workshop; - } - } - - 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) ); + if( !ctx->active ) + return; - 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! */ + world_instance *world = ctx->world; + ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, ctx->index ); - strcat( path, meta_file ); - workshop_load_metadata( path, ®->workshop ); + /* camera positioning */ + ent_camera *ref = mdl_arritm( &world->ent_camera, + mdl_entity_id_id(shop->id_camera) ); + + v3f dir = {0.0f,-1.0f,0.0f}; + mdl_transform_vector( &ref->transform, dir, dir ); + v3_angles( dir, world_static.focus_cam.angles ); -next_file_workshop:; + v3f 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 if( shop->type == k_skateshop_type_server ){ + ent_prop *prop = mdl_arritm( &world->ent_prop, + mdl_entity_id_id(shop->server.id_lever) ); + v3_sub( prop->transform.co, localplayer.rb.co, lookat ); + } + else + vg_fatal_error( "Unknown store (%u)\n", shop->type ); -/* - * 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 ); + q_axis_angle( localplayer.rb.q, (v3f){0.0f,1.0f,0.0f}, + atan2f(lookat[0],lookat[2]) ); - for( u32 i=0; istate = k_registry_board_state_indexed_absent; - } + v3_copy( ref->transform.co, world_static.focus_cam.pos ); + world_static.focus_cam.fov = ref->fov; - /* - * Local disk scan - */ - vg_info( "Scanning models/boards/*.mdl\n" ); - tinydir_dir dir; - tinydir_open( &dir, "models/boards" ); + /* input */ + if( shop->type == k_skateshop_type_boardshop ){ + if( !vg_loader_availible() ) return; - while( dir.has_next ){ - tinydir_file file; - tinydir_readfile( &dir, &file ); - - if( file.is_reg ){ - u32 hash = vg_strdjb2( file.name ); + u16 cache_id = skateshop_selected_cache_id(); + global_skateshop.helper_pick->greyed = !cache_id; - for( u32 i=0; ifilename ) ){ - reg->state = k_registry_board_state_indexed; - goto next_file; - } + if( button_down( k_srbind_mleft ) ){ + if( global_skateshop.selected_board_id > 0 ){ + global_skateshop.selected_board_id --; } + } - if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){ - vg_error( "You have too many boards installed!\n" ); - break; + u32 valid_count = addon_count( k_addon_type_board, 0 ); + if( button_down( k_srbind_mright ) ){ + if( global_skateshop.selected_board_id+1 < valid_count ){ + global_skateshop.selected_board_id ++; } - - 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" ); } -next_file: tinydir_next( &dir ); - } - - 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) -{ - workshop_begin_op( k_workshop_op_item_scan ); - vg_loader_start( workshop_scan_thread, NULL ); -} - -/* - * Regular stuff - * ----------------------------------------------------------------------------- - */ + u32 npage = global_skateshop.selected_board_id/SKATESHOP_VIEW_SLOT_MAX; -/* 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 ) -{ - 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 */ -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" ); + if( opage != npage ){ + skateshop_update_viewpage(); + } + else if( cache_id && button_down( k_srbind_maccept )){ + vg_info( "chose board from skateshop (%u)\n", + global_skateshop.selected_board_id ); + + addon_cache_unwatch( k_addon_type_board, localplayer.board_view_slot ); + addon_cache_watch( k_addon_type_board, cache_id ); + localplayer.board_view_slot = cache_id; + network_send_item( k_netmsg_playeritem_board ); + + world_entity_exit_modal(); + world_entity_clear_focus(); + gui_helper_clear(); + skaterift_autosave(1); + return; + } } + else if( shop->type == k_skateshop_type_charshop ){ + if( !vg_loader_availible() ) return; - ptr->ref_count --; -} + int changed = 0; + u32 valid_count = addon_count( k_addon_type_player, ADDON_REG_HIDDEN ); -/* - * 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; iworkshop.author == info->m_ulSteamID ){ - const char *name = SteamAPI_ISteamFriends_GetFriendPersonaName( - hSteamFriends, info->m_ulSteamID ); - str_utf8_collapse( name, reg->workshop.author_name, 32 ); + if( button_down( k_srbind_mleft ) ){ + if( global_skateshop.selected_player_id > 0 ){ + global_skateshop.selected_player_id --; + } + else{ + global_skateshop.selected_player_id = valid_count-1; } + + changed = 1; } - } -} -/* - * 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; - global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size ); + if( button_down( k_srbind_mright ) ){ + if( global_skateshop.selected_player_id+1 < valid_count ){ + global_skateshop.selected_player_id ++; + } + else{ + global_skateshop.selected_player_id = 0; + } - memset( global_skateshop.cache, 0, cache_size ); + changed = 1; + } - for( u32 i=0; istate = k_cache_board_state_none; - board->registry_id = 0xffffffff; - board->last_use_time = -99999.9; - board->ref_count = 0; - } + if( changed ){ + addon_reg *addon = get_addon_from_index( + k_addon_type_player, global_skateshop.selected_player_id, + ADDON_REG_HIDDEN ); - if( steam_ready ){ - steam_register_callback( k_iPersonaStateChange, - callback_persona_statechange ); - } -} + u32 real_id = get_index_from_addon( + k_addon_type_player, addon ); -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 ]; + player__use_model( real_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( button_down( k_srbind_maccept ) ){ + network_send_item( k_netmsg_playeritem_player ); + world_entity_exit_modal(); + world_entity_clear_focus(); + gui_helper_clear(); } - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); } + else if( shop->type == k_skateshop_type_worldshop ){ + int browseable = 0, + loadable = 0; - return NULL; -} - -/* - * VG event preupdate - */ -VG_STATIC void global_skateshop_preupdate(void) -{ - float rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f ); - global_skateshop.factive = vg_lerpf( global_skateshop.factive, - global_skateshop.active, rate ); - - if( !global_skateshop.active ) return; + u32 valid_count = addon_count( k_addon_type_world, ADDON_REG_HIDDEN ); - world_instance *world = get_active_world(); + if( valid_count && vg_loader_availible() ) + browseable = 1; - ent_skateshop *shop = global_skateshop.ptr_ent; - 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 ); - player_vector_angles( localplayer.cam_override_angles, dir, 1.0f, 0.0f ); - - v3f lookat; - v3_sub( display->transform.co, localplayer.rb.co, lookat ); - - q_axis_angle( localplayer.rb.q, (v3f){0.0f,1.0f,0.0f}, - atan2f(lookat[0],lookat[2]) ); - - v3_copy( ref->transform.co, localplayer.cam_override_pos ); - localplayer.cam_override_fov = ref->fov; - localplayer.cam_override_strength = global_skateshop.factive; + if( valid_count && vg_loader_availible() ) + loadable = 1; - 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(); + global_skateshop.helper_browse->greyed = !browseable; + global_skateshop.helper_pick->greyed = !loadable; + + addon_reg *selected_world = NULL; + + 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( selected_cache ){ - gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); - } + if( button_down( k_srbind_mright ) ){ + if( global_skateshop.selected_world_id+1 < valid_count ){ + global_skateshop.selected_world_id ++; + change = 1; + } + } - /* - * Controls - * ---------------------- - */ + selected_world = get_addon_from_index( k_addon_type_world, + global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); - if( global_skateshop.interaction_cooldown > 0.0f ){ - global_skateshop.interaction_cooldown -= vg.time_delta; - return; - } + if( change || (global_skateshop.reg_preview == NULL) ){ + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + global_skateshop.reg_preview = selected_world; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + } + } - if( button_down( k_srbind_mleft ) ){ - if( global_skateshop.selected_registry_id > 0 ){ - global_skateshop.selected_registry_id --; - moved = 1; + if( loadable ){ + if( button_down( k_srbind_maccept ) ){ + skaterift_change_world_start( selected_world ); + } } } - - if( button_down( k_srbind_mright ) ){ - if( global_skateshop.selected_registry_id+1 < - global_skateshop.registry_count ) - { - global_skateshop.selected_registry_id ++; - moved = 1; + else if( shop->type == k_skateshop_type_server ){ + f64 delta = vg.time_real - network_client.last_intent_change; + + if( (delta > 5.0) && (!skaterift.demo_mode) ){ + global_skateshop.helper_pick->greyed = 0; + if( button_down( k_srbind_maccept ) ){ + network_client.user_intent = !network_client.user_intent; + network_client.last_intent_change = vg.time_real; + skateshop_server_helper_update(); + render_server_status_gui(); + } + } + else { + global_skateshop.helper_pick->greyed = 1; } } + else{ + vg_fatal_error( "Unknown store (%u)\n", shop->type ); + } + + if( button_down( k_srbind_mback ) ) + { + if( shop->type == k_skateshop_type_charshop ) + network_send_item( k_netmsg_playeritem_player ); - if( moved ){ - global_skateshop.interaction_cooldown = 0.125f; + world_entity_exit_modal(); + world_entity_clear_focus(); + gui_helper_clear(); return; } +} - if( selected_cache && button_down( k_srbind_maccept ) ){ - vg_info( "chose board from skateshop (%u)\n", - global_skateshop.selected_registry_id ); +void skateshop_world_preupdate( world_instance *world ) +{ + for( u32 i=0; ient_skateshop); i++ ){ + ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, i ); - if( localplayer.board_view_slot ){ - unwatch_cache_board( localplayer.board_view_slot ); - } + if( shop->type == k_skateshop_type_server ){ + f32 a = network_client.user_intent; - localplayer.board_view_slot = selected_cache; - watch_cache_board( localplayer.board_view_slot ); + vg_slewf( &network_client.fintent, a, vg.time_frame_delta ); + a = (vg_smoothstepf( network_client.fintent ) - 0.5f) * (VG_PIf/2.0f); - global_skateshop_exit(); - return; - } + ent_prop *lever = mdl_arritm( &world->ent_prop, + mdl_entity_id_id(shop->server.id_lever) ); - if( button_down( k_srbind_mback ) ){ - global_skateshop_exit(); - return; + /* we need parent transforms now? */ + q_axis_angle( lever->transform.q, (v3f){0,0,1}, a ); + } } } -/* - * World: render event - */ -VG_STATIC void skateshop_render(void) -{ - if( !global_skateshop.active ) return; - - ent_skateshop *shop = global_skateshop.ptr_ent; - world_instance *world = get_active_world(); - +static void skateshop_render_boardshop( ent_skateshop *shop ){ + world_instance *world = world_current_instance(); 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)); - - int visibility[ SKATESHOP_VIEW_SLOT_MAX ]; - SDL_AtomicLock( &global_skateshop.sl_cache_access ); - for( u32 i=0; iboards.id_display)); - if( slot->cache_ptr == NULL ) visibility[i] = 0; - else if( slot->cache_ptr->state != k_cache_board_state_loaded ) - visibility[i] = 0; - } - SDL_AtomicUnlock( &global_skateshop.sl_cache_access ); + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + struct addon_cache *cache = &addon_system.cache[k_addon_type_board]; /* Render loaded boards in the view slots */ for( u32 i=0; icache_id ) + goto fade_out; + + addon_cache_entry *entry = vg_pool_item( &cache->pool, slot->cache_id ); + + if( entry->state != k_addon_cache_state_loaded ) + goto fade_out; + + struct player_board *board = + addon_cache_item( k_addon_type_board, slot->cache_id ); mdl_transform xform; transform_identity( &xform ); @@ -586,8 +477,8 @@ 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( entry->reg_index == global_skateshop.selected_board_id ){ selected = 1.0f; } @@ -596,10 +487,11 @@ VG_STATIC void skateshop_render(void) q_nlerp( xform.q, mark_display->transform.q, t, xform.q ); v3_lerp( xform.s, mark_display->transform.s, t, xform.s ); + struct player_board_pose pose = {0}; m4x3f mmdl; mdl_transform_m4x3( &xform, mmdl ); - render_board( &main_camera, world, &slot->cache_ptr->board, mmdl, - k_board_shader_entity ); + render_board( &skaterift.cam, world, board, mmdl, + &pose, k_board_shader_entity ); fade_out:; float rate = 5.0f*vg.time_delta; @@ -607,23 +499,18 @@ 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 ); float scale = 0.2f, thickness = 0.03f; - font3d_bind( &world_global.font, &main_camera ); + font3d_bind( &gui.font, k_font_shader_default, 0, world, &skaterift.cam ); shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} ); /* Selection counter @@ -636,93 +523,328 @@ 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 ); + u32 valid_count = addon_count(k_addon_type_board,0); + if( valid_count ){ + char buf[16]; + vg_str str; + vg_strnull( &str, buf, sizeof(buf) ); + vg_strcati32( &str, global_skateshop.selected_board_id+1 ); + vg_strcatch( &str, '/' ); + vg_strcati32( &str, valid_count ); + font3d_simple_draw( 0, buf, &skaterift.cam, mmdl ); } else{ - char buf[16]; - int i=0; - i+=highscore_intl( buf+i, global_skateshop.selected_registry_id+1, 3 ); - buf[i++] = '/'; - i+=highscore_intl( buf+i, global_skateshop.registry_count, 3 ); - buf[i++] = '\0'; + font3d_simple_draw( 0, "Nothing installed", &skaterift.cam, mmdl ); + } + + u16 cache_id = skateshop_selected_cache_id(); + struct addon_cache_entry *entry = vg_pool_item( &cache->pool, cache_id ); + addon_reg *reg = NULL; + + if( entry ) reg = entry->reg_ptr; - font3d_simple_draw( &world_global.font, 0, buf, &main_camera, mmdl ); + if( !reg ){ + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); + global_skateshop.render.item_title = ""; + global_skateshop.render.item_desc = ""; + return; } - struct cache_board *cache_ptr = skateshop_selected_cache_if_loaded(); - if( !cache_ptr ) return; + if( global_skateshop.render.reg_id != global_skateshop.selected_board_id ){ + global_skateshop.render.item_title = ""; + global_skateshop.render.item_desc = ""; + vg_msg msg; + vg_msg_init( &msg, reg->metadata, reg->metadata_len ); + + if( vg_msg_seekframe( &msg, "workshop" ) ){ + const char *title = vg_msg_getkvstr( &msg, "title" ); + if( title ) global_skateshop.render.item_title = title; - struct registry_board *reg = - &global_skateshop.registry[cache_ptr->registry_id]; - struct workshop_file_info *info = ®->workshop; + const char *dsc = vg_msg_getkvstr( &msg, "author" ); + if( dsc ) global_skateshop.render.item_desc = dsc; + vg_msg_skip_frame( &msg ); + } + + global_skateshop.render.reg_id = global_skateshop.selected_board_id; + } /* Skin title * ----------------------------------------------------------------- */ m3x3_zero( mlocal ); m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } ); - mlocal[3][0] = -font3d_string_width( &world_global.font, 0, info->title ); + mlocal[3][0] = -font3d_string_width( 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, info->title, &main_camera, mmdl ); + font3d_simple_draw( 0, global_skateshop.render.item_title, + &skaterift.cam, mmdl ); /* Author name * ----------------------------------------------------------------- */ scale *= 0.4f; m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } ); - mlocal[3][0] = -font3d_string_width( &world_global.font, 0, - info->author_name ); + mlocal[3][0] = -font3d_string_width( 0, global_skateshop.render.item_desc ); 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, - info->author_name, &main_camera, mmdl ); + font3d_simple_draw( 0, global_skateshop.render.item_desc, + &skaterift.cam, mmdl ); + + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); +} + +static void skateshop_render_charshop( ent_skateshop *shop ){ +} + +static void skateshop_render_worldshop( ent_skateshop *shop ){ + world_instance *world = world_current_instance(); + + 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){ + global_skateshop.render.world_title = "missing: workshop.title"; + + addon_reg *reg = get_addon_from_index( k_addon_type_world, + global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); + + if( !reg ) + goto none; + + if( reg->alias.workshop_id ) + { + vg_msg msg; + vg_msg_init( &msg, reg->metadata, reg->metadata_len ); + + global_skateshop.render.world_loc = vg_msg_getkvstr(&msg,"location"); + global_skateshop.render.world_reg = global_skateshop.selected_world_id; + + if( vg_msg_seekframe( &msg, "workshop" ) ) + { + global_skateshop.render.world_title = vg_msg_getkvstr(&msg,"title"); + vg_msg_skip_frame( &msg ); + } + else { + vg_warn( "No workshop body\n" ); + } + } + else { + global_skateshop.render.world_title = reg->alias.foldername; + } + } + +none:; + + /* Text */ + char buftext[128], bufsubtext[128]; + vg_str info, subtext; + vg_strnull( &info, buftext, 128 ); + vg_strnull( &subtext, bufsubtext, 128 ); + + u32 valid_count = addon_count(k_addon_type_world,ADDON_REG_HIDDEN); + if( valid_count ) + { + vg_strcati32( &info, global_skateshop.selected_world_id+1 ); + vg_strcatch( &info, '/' ); + vg_strcati32( &info, valid_count ); + vg_strcatch( &info, ' ' ); + vg_strcat( &info, global_skateshop.render.world_title ); + + if( !vg_loader_availible() ) + { + vg_strcat( &subtext, "Loading..." ); + } + else + { + addon_reg *reg = get_addon_from_index( k_addon_type_world, + global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); + + if( reg->alias.workshop_id ) + vg_strcat( &subtext, "(Workshop) " ); + + vg_strcat( &subtext, global_skateshop.render.world_loc ); + } + } + else + { + vg_strcat( &info, "No workshop worlds installed" ); + } + + m4x3f mtext,mlocal,mtextmdl; + mdl_transform_m4x3( &mark_info->transform, mtext ); + + font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &skaterift.cam ); + 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( 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( 0, buftext, &skaterift.cam, mtextmdl ); + + m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } ); + mlocal[3][0] = -font3d_string_width( 0, bufsubtext ); + mlocal[3][0] *= scale1*0.5f; + mlocal[3][1] = -scale1*0.3f; + m4x3_mul( mtext, mlocal, mtextmdl ); + font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl ); } /* - * Entity logic: entrance event + * World: render event */ -VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call ) +void skateshop_render( ent_skateshop *shop ) { - u32 index = mdl_entity_id_id( call->id ); - ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index ); - vg_info( "skateshop_call\n" ); + if( shop->type == k_skateshop_type_boardshop ) + skateshop_render_boardshop( shop ); + else if( shop->type == k_skateshop_type_charshop ) + skateshop_render_charshop( shop ); + else if( shop->type == k_skateshop_type_worldshop ) + skateshop_render_worldshop( shop ); + else if( shop->type == k_skateshop_type_server ){ + } + else + vg_fatal_error( "Unknown store (%u)\n", shop->type ); +} - if( menu.active ) return; +void skateshop_render_nonfocused( world_instance *world, vg_camera *cam ) +{ + for( u32 j=0; jent_skateshop ); j ++ ) + { + ent_skateshop *shop = mdl_arritm(&world->ent_skateshop, j ); - if( call->function == k_ent_function_trigger ){ - if( localplayer.subsystem != k_player_subsystem_walk ){ - return; + if( shop->type != k_skateshop_type_boardshop ) continue; + + f32 dist2 = v3_dist2( cam->pos, shop->transform.co ), + maxdist = 50.0f; + + if( dist2 > maxdist*maxdist ) continue; + ent_marker *mark_rack = mdl_arritm( &world->ent_marker, + mdl_entity_id_id(shop->boards.id_rack)); + + if( !mark_rack ) + continue; + + u32 slot_count = vg_list_size(global_skateshop.shop_view_slots); + for( u32 i=0; itransform, &xform, &xform ); + + struct player_board_pose pose = {0}; + m4x3f mmdl; + mdl_transform_m4x3( &xform, mmdl ); + render_board( cam, world, board, mmdl, &pose, k_board_shader_entity ); } - - vg_info( "Entering skateshop\n" ); + } +} + +static void ent_skateshop_helpers_pickable( const char *acceptance ) +{ + vg_str text; - localplayer.immobile = 1; - menu.disable_open = 1; - global_skateshop.active = 1; + if( gui_new_helper( input_button_list[k_srbind_mback], &text )) + vg_strcat( &text, "exit" ); - v3_zero( localplayer.rb.v ); - v3_zero( localplayer.rb.w ); - localplayer._walk.move_speed = 0.0f; - global_skateshop.ptr_ent = shop; - - skateshop_update_viewpage(); - workshop_op_item_scan(); + if( (global_skateshop.helper_pick = gui_new_helper( + input_button_list[k_srbind_maccept], &text))){ + vg_strcat( &text, acceptance ); } + + if( (global_skateshop.helper_browse = gui_new_helper( + input_axis_list[k_sraxis_mbrowse_h], &text ))){ + vg_strcat( &text, "browse" ); + } +} + +static void board_scan_thread( void *_args ) +{ + addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); + vg_async_stall(); + + /* 04.03.24 + * REVIEW: This is removed as it *should* be done on the preupdate of the + * addon system. + * + * Verify that it works the same. + */ +#if 0 + board_processview_thread(NULL); +#endif +} + +static void world_scan_thread( void *_args ) +{ + addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); } /* - * Entity logic: exit event + * Entity logic: entrance event */ -VG_STATIC void global_skateshop_exit(void) +entity_call_result ent_skateshop_call( world_instance *world, ent_call *call ) { - vg_info( "exit skateshop\n" ); - localplayer.immobile = 0; - global_skateshop.active = 0; - menu.disable_open = 0; - srinput.ignore_input_frames = 2; -} + u32 index = mdl_entity_id_id( call->id ); + ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index ); + vg_info( "skateshop_call\n" ); -#endif /* ENT_SKATESHOP_C */ + if( (skaterift.activity != k_skaterift_default) || + !vg_loader_availible() ) + return k_entity_call_result_invalid; + + if( call->function == k_ent_function_trigger ) + { + if( localplayer.subsystem != k_player_subsystem_walk ) + return k_entity_call_result_OK; + + vg_info( "Entering skateshop\n" ); + + world_entity_set_focus( call->id ); + world_entity_focus_modal(); + gui_helper_clear(); + + if( shop->type == k_skateshop_type_boardshop ) + { + skateshop_update_viewpage(); + vg_loader_start( board_scan_thread, NULL ); + ent_skateshop_helpers_pickable( "pick" ); + } + else if( shop->type == k_skateshop_type_charshop ) + { + ent_skateshop_helpers_pickable( "pick" ); + } + else if( shop->type == k_skateshop_type_worldshop ) + { + ent_skateshop_helpers_pickable( "open rift" ); + vg_loader_start( world_scan_thread, NULL ); + } + else if( shop->type == k_skateshop_type_server ) + { + vg_str text; + global_skateshop.helper_pick = gui_new_helper( + input_button_list[k_srbind_maccept], &text); + if( gui_new_helper( input_button_list[k_srbind_mback], &text )) + vg_strcat( &text, "exit" ); + skateshop_server_helper_update(); + } + return k_entity_call_result_OK; + } + else + return k_entity_call_result_unhandled; +}