-#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 "highscores.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
*/
}
}
-/*
- * op/subroutine: k_workshop_op_item_load
- * -----------------------------------------------------------------------------
- */
-
-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 );
-}
+struct async_preview_load_thread_data{
+ void *data;
+ addon_reg *reg;
+};
-/*
- * Asynchronous scan of local disk for worlds
- */
-static void skateshop_op_world_scan(void){
- vg_loader_start( world_scan_thread, NULL );
-}
+static void skateshop_async_preview_imageload( void *data, u32 len ){
+ struct async_preview_load_thread_data *inf = data;
-static void board_processview_thread( void *_args ){
- addon_cache_load_loop();
-}
+ 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 );
-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();
- board_processview_thread(NULL);
-}
+ skaterift.rt_textures[k_skaterift_rt_workshop_preview] =
+ global_skateshop.tex_preview;
+ }
+ else {
+ skaterift.rt_textures[k_skaterift_rt_workshop_preview] = vg.tex_missing;
+ }
-/* TODO: migrate to addon.c */
-static void skateshop_op_board_scan(void){
- vg_loader_start( board_scan_thread, NULL );
+ SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+ global_skateshop.reg_loaded_preview = inf->reg;
+ SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
}
-/* TODO: migrate to addon.c */
-static void skateshop_autostart_loading(void){
- if( !vg_loader_availible() ) return;
+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 );
- for( u32 type=0; type<k_addon_type_max; type++ ){
- struct addon_cache *cache = &addon_system.cache[type];
+ addon_reg *reg_preview = global_skateshop.reg_preview;
+ SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
- for( u32 id=1; id<=cache->pool.count; id++ ){
- addon_cache_entry *entry = vg_pool_item( &cache->pool, id );
- if( entry->state == k_addon_cache_state_load_request ){
- SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
- goto launch;
+ 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;
+ }
+
+ 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;
+
+ inf->reg = reg_preview;
+
+ 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 );
+
+ 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_async_dispatch( call, skateshop_async_preview_imageload );
+ }
+ else
+ {
+ vg_error( "Path too long to workshop preview image.\n" );
+
+ SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+ global_skateshop.reg_loaded_preview = reg_preview;
+ SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
+ }
+}
+
+void skateshop_world_preview_preupdate(void)
+{
+ /* 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 );
}
- SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
- return;
-launch:
- vg_loader_start( board_processview_thread, NULL );
}
+/*
+ * op/subroutine: k_workshop_op_item_load
+ * -----------------------------------------------------------------------------
+ */
+
/*
* Regular stuff
* -----------------------------------------------------------------------------
*/
+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();
+}
+
/*
* VG event init
*/
-static void skateshop_init(void){
+void skateshop_init(void)
+{
+ vg_async_call( skateshop_init_async, NULL, 0 );
}
static u16 skateshop_selected_cache_id(void){
- if( addon_count(k_addon_type_board) ){
- addon_reg *reg = get_addon_from_index(k_addon_type_board,
- global_skateshop.selected_board_id);
+ 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;
}
+static void skateshop_server_helper_update(void){
+ vg_str text;
+ vg_strnull( &text, global_skateshop.helper_toggle->text,
+ sizeof(global_skateshop.helper_toggle->text) );
+
+ 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
+ vg_strcat( &text, "Go Online" );
+ }
+}
+
/*
* VG event preupdate
*/
void temp_update_playermodel(void);
-static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
+void ent_skateshop_preupdate( ent_skateshop *shop, int active )
+{
if( !active ) return;
/* input filter */
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 )
+ 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 );
}
}
+ u32 valid_count = addon_count( k_addon_type_board, 0 );
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_board_id+1 <
- addon_count(k_addon_type_board) )
- {
+ if( global_skateshop.selected_board_id+1 < valid_count ){
global_skateshop.selected_board_id ++;
}
}
if( opage != npage ){
skateshop_update_viewpage();
- //skateshop_op_processview();
}
else if( cache_id && button_down( k_srbind_maccept )){
vg_info( "chose board from skateshop (%u)\n",
localplayer.board_view_slot = cache_id;
network_send_item( k_netmsg_playeritem_board );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
skaterift_autosave(1);
return;
if( !vg_loader_availible() ) return;
int changed = 0;
+ u32 valid_count = addon_count( k_addon_type_player, ADDON_REG_HIDDEN );
if( button_down( k_srbind_mleft ) ){
if( global_skateshop.selected_player_id > 0 ){
global_skateshop.selected_player_id --;
}
else{
- global_skateshop.selected_player_id =
- addon_count(k_addon_type_player) -1;
+ global_skateshop.selected_player_id = valid_count-1;
}
changed = 1;
}
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_player_id+1 <
- addon_count(k_addon_type_player) ){
+ if( global_skateshop.selected_player_id+1 < valid_count ){
global_skateshop.selected_player_id ++;
}
else{
}
if( changed ){
- player__use_model( global_skateshop.selected_player_id );
- //skateshop_op_processview();
+ addon_reg *addon = get_addon_from_index(
+ k_addon_type_player, global_skateshop.selected_player_id,
+ ADDON_REG_HIDDEN );
+
+ u32 real_id = get_index_from_addon(
+ k_addon_type_player, addon );
+
+ player__use_model( real_id );
}
if( button_down( k_srbind_maccept ) ){
network_send_item( k_netmsg_playeritem_player );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
}
}
int browseable = 0,
loadable = 0;
- if( addon_count(k_addon_type_world) && vg_loader_availible() )
+ u32 valid_count = addon_count( k_addon_type_world, ADDON_REG_HIDDEN );
+
+ if( valid_count && vg_loader_availible() )
browseable = 1;
- if( vg_loader_availible() && global_skateshop.selected_world_id > 0 )
+ if( valid_count && vg_loader_availible() )
loadable = 1;
global_skateshop.helper_browse->greyed = !browseable;
global_skateshop.helper_pick->greyed = !loadable;
- int change = 0;
+ addon_reg *selected_world = NULL;
+ int change = 0;
if( browseable ){
if( button_down( k_srbind_mleft ) ){
if( global_skateshop.selected_world_id > 0 ){
}
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_world_id+1 <
- addon_count(k_addon_type_world) )
- {
+ if( global_skateshop.selected_world_id+1 < valid_count ){
global_skateshop.selected_world_id ++;
change = 1;
}
}
- }
-
-#if 0
- if( change && pointcloud_idle() ){
- pointcloud_animate( k_pointcloud_anim_hiding );
+
+ selected_world = get_addon_from_index( k_addon_type_world,
+ global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
+
+ 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( vg_loader_availible() ){
- addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_id );
-
- /* 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_start( reg );
- return;
+ if( loadable ){
+ if( button_down( k_srbind_maccept ) ){
+ skaterift_change_world_start( selected_world );
}
- 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 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();
}
}
-#endif
+ else {
+ global_skateshop.helper_pick->greyed = 1;
+ }
}
else{
vg_fatal_error( "Unknown store (%u)\n", shop->type );
}
- if( button_down( k_srbind_mback ) ){
+ if( button_down( k_srbind_mback ) )
+ {
if( shop->type == k_skateshop_type_charshop )
network_send_item( k_netmsg_playeritem_player );
- world_entity_unfocus();
+ world_entity_exit_modal();
+ world_entity_clear_focus();
gui_helper_clear();
return;
}
}
+void skateshop_world_preupdate( world_instance *world )
+{
+ for( u32 i=0; i<mdl_arrcount(&world->ent_skateshop); i++ ){
+ ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, i );
+
+ if( shop->type == k_skateshop_type_server ){
+ f32 a = network_client.user_intent;
+
+ vg_slewf( &network_client.fintent, a, vg.time_frame_delta );
+ a = (vg_smoothstepf( network_client.fintent ) - 0.5f) * (VG_PIf/2.0f);
+
+ ent_prop *lever = mdl_arritm( &world->ent_prop,
+ mdl_entity_id_id(shop->server.id_lever) );
+
+ /* we need parent transforms now? */
+ q_axis_angle( lever->transform.q, (v3f){0,0,1}, a );
+ }
+ }
+}
+
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);
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 );
mlocal[3][2] = -0.7f;
m4x3_mul( mrack, mlocal, mmdl );
- if( addon_count(k_addon_type_board) ){
+ u32 valid_count = addon_count(k_addon_type_board,0);
+ if( valid_count ){
char buf[16];
- int i=0;
- i+=highscore_intl( buf+i, global_skateshop.selected_board_id+1, 3 );
- buf[i++] = '/';
- i+=highscore_intl( buf+i, addon_count(k_addon_type_board), 3 );
- buf[i++] = '\0';
-
+ 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{
mdl_entity_id_id(shop->boards.id_info));
if( global_skateshop.render.world_reg != global_skateshop.selected_world_id){
- global_skateshop.render.world_title = "";
+ global_skateshop.render.world_title = "missing: workshop.title";
addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_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;
+ global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
- if( vg_msg_seekframe( &msg, "workshop" ) ){
- global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title");
- vg_msg_skip_frame( &msg );
+ 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 );
- if( addon_count(k_addon_type_world) ){
- addon_reg *reg = get_addon_from_index( k_addon_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_addon_type_world), 3 );
- info.buffer[info.i++] = ' ';
- info.buffer[info.i] = '\0';
-
+ 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() ){
+
+ if( !vg_loader_availible() )
+ {
vg_strcat( &subtext, "Loading..." );
}
- else{
+ else
+ {
addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_id );
+ 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 worlds installed" );
+ else
+ {
+ vg_strcat( &info, "No workshop worlds installed" );
}
-
m4x3f mtext,mlocal,mtextmdl;
mdl_transform_m4x3( &mark_info->transform, mtext );
mlocal[3][1] = -scale1*0.3f;
m4x3_mul( mtext, mlocal, mtextmdl );
font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl );
-
-#if 0
- /* 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, &skaterift.cam, mmdl );
- glDisable(GL_BLEND);
- glEnable(GL_DEPTH_TEST);
-#endif
}
/*
* World: render event
*/
-static void skateshop_render( ent_skateshop *shop ){
+void skateshop_render( ent_skateshop *shop )
+{
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 );
}
-static void ent_skateshop_helpers_pickable( const char *acceptance ){
+void skateshop_render_nonfocused( world_instance *world, vg_camera *cam )
+{
+ for( u32 j=0; j<mdl_arrcount( &world->ent_skateshop ); j ++ )
+ {
+ ent_skateshop *shop = mdl_arritm(&world->ent_skateshop, j );
+
+ 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; i<slot_count; i++ )
+ {
+ struct player_board *board = &localplayer.fallback_board;
+
+ mdl_transform xform;
+ transform_identity( &xform );
+
+ xform.co[0] = -((float)i - ((float)slot_count)*0.5f)*0.45f;
+ mdl_transform_mul( &mark_rack->transform, &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 );
+ }
+ }
+}
+
+static void ent_skateshop_helpers_pickable( const char *acceptance )
+{
vg_str text;
if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
}
}
+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: entrance event
*/
-static void ent_skateshop_call( world_instance *world, ent_call *call ){
+entity_call_result ent_skateshop_call( world_instance *world, ent_call *call )
+{
u32 index = mdl_entity_id_id( call->id );
ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index );
vg_info( "skateshop_call\n" );
- if( skaterift.activity != k_skaterift_default ) return;
- if( !vg_loader_availible() ) return;
+ 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;
+ 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_focus( call->id );
+ world_entity_set_focus( call->id );
+ world_entity_focus_modal();
gui_helper_clear();
- if( shop->type == k_skateshop_type_boardshop ){
+ if( shop->type == k_skateshop_type_boardshop )
+ {
skateshop_update_viewpage();
- skateshop_op_board_scan();
+ vg_loader_start( board_scan_thread, NULL );
ent_skateshop_helpers_pickable( "pick" );
}
- else if( shop->type == k_skateshop_type_charshop ){
+ else if( shop->type == k_skateshop_type_charshop )
+ {
ent_skateshop_helpers_pickable( "pick" );
}
- else if( shop->type == k_skateshop_type_worldshop ){
+ else if( shop->type == k_skateshop_type_worldshop )
+ {
ent_skateshop_helpers_pickable( "open rift" );
- skateshop_op_world_scan();
+ 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;
}
-
-#endif /* ENT_SKATESHOP_C */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff