X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=14df0dcc3606919c3003696fe3989aa81d57c705;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=bfec73f9edaf24fe6082b90af3182f7fb2875478;hpb=6b036c10d38e7d691eb0bc06c29235b450c3ff10;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index bfec73f..14df0dc 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -10,7 +10,6 @@ #include "player.h" #include "gui.h" #include "menu.h" -#include "pointcloud.h" #include "highscores.h" #include "steam.h" #include "addon.h" @@ -45,6 +44,76 @@ static void skateshop_update_viewpage(void){ } } +struct async_preview_load_thread_data{ + void *data; + addon_reg *reg; +}; + +static void skateshop_async_preview_imageload( void *data, u32 len ){ + struct async_preview_load_thread_data *inf = data; + + 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 ); + + skaterift.rt_textures[k_skaterift_rt_workshop_preview] = + global_skateshop.tex_preview; + } + else { + skaterift.rt_textures[k_skaterift_rt_workshop_preview] = + global_skateshop.tex_preview_err; + } + + SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + global_skateshop.reg_loaded_preview = inf->reg; + SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); +} + +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; + } + + 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 ); + } +} + /* * op/subroutine: k_workshop_op_item_load * ----------------------------------------------------------------------------- @@ -85,6 +154,12 @@ static void skateshop_autostart_loading(void){ if( !vg_loader_availible() ) return; 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 ); + return; + } + for( u32 type=0; typepool, id ); if( entry->state == k_addon_cache_state_load_request ){ SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); - goto launch; + vg_loader_start( board_processview_thread, NULL ); + return; } } } SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); - return; -launch: - vg_loader_start( board_processview_thread, NULL ); } /* @@ -107,76 +180,54 @@ launch: * ----------------------------------------------------------------------------- */ +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 ] = + global_skateshop.tex_preview_err; + + skaterift.rt_textures[ k_skaterift_rt_server_status ] = + global_skateshop.tex_preview_err; + render_server_status_gui(); +} + /* * VG event init */ static void skateshop_init(void){ + vg_tex2d_replace_with_error( &global_skateshop.tex_preview_err ); + 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 pointcloud_async_end(void *_, u32 __) -{ - pointcloud_animate( k_pointcloud_anim_opening ); -} - -static void pointcloud_clear_async(void *_, u32 __) -{ - pointcloud.count = 0; - pointcloud_animate( k_pointcloud_anim_opening ); -} - -static void skateshop_world_preview_loader_thread( void *_data ) -{ - addon_reg *reg = _data; - - char path_buf[4096]; - vg_str path; - vg_strnull( &path, path_buf, 4096 ); - addon_get_content_folder( reg, &path ); - 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 ); - } -} - -static void skateshop_world_preview_loader_thread_and_end( void *_data ){ - skateshop_world_preview_loader_thread( _data ); -} +static void skateshop_server_helper_update(void){ + vg_str text; + vg_strnull( &text, global_skateshop.helper_toggle->text, + sizeof(global_skateshop.helper_toggle->text) ); -static void skateshop_load_world_preview( addon_reg *reg ){ - vg_loader_start( skateshop_world_preview_loader_thread_and_end, reg ); + if( network_client.user_intent == k_server_intent_online ) + vg_strcat( &text, "Disconnect" ); + else + vg_strcat( &text, "Go Online" ); } /* @@ -195,8 +246,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ v3f dir = {0.0f,-1.0f,0.0f}; mdl_transform_vector( &ref->transform, dir, dir ); - m3x3_mulv( localplayer.invbasis, dir, dir ); - player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f ); + v3_angles( dir, world_static.focus_cam.angles ); v3f lookat; if( shop->type == k_skateshop_type_boardshop || @@ -205,8 +255,14 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ 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 ); @@ -220,13 +276,8 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( shop->type == k_skateshop_type_boardshop ){ if( !vg_loader_availible() ) return; - gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); - gui_helper_action( button_display_string( k_srbind_mback ), "exit" ); - u16 cache_id = skateshop_selected_cache_id(); - if( cache_id ){ - gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); - } + global_skateshop.helper_pick->greyed = !cache_id; /* * Controls @@ -240,10 +291,9 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } } + 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 ++; } } @@ -252,7 +302,6 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ 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", @@ -264,6 +313,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ network_send_item( k_netmsg_playeritem_board ); world_entity_unfocus(); + gui_helper_clear(); skaterift_autosave(1); return; } @@ -271,27 +321,22 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ else if( shop->type == k_skateshop_type_charshop ){ if( !vg_loader_availible() ) return; - 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" ); - 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{ @@ -302,32 +347,40 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } 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(); + gui_helper_clear(); } } else if( shop->type == k_skateshop_type_worldshop ){ int browseable = 0, loadable = 0; - if( addon_count(k_addon_type_world) && vg_loader_availible() ){ - gui_helper_action( axis_display_string(k_sraxis_mbrowse_h), "browse" ); + 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 ){ - gui_helper_action( button_display_string(k_srbind_maccept), - "open rift" ); + 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 ){ @@ -337,52 +390,43 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } 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( change && pointcloud_idle() ){ - pointcloud_animate( k_pointcloud_anim_hiding ); - } - if( vg_loader_availible() ){ - addon_reg *reg = get_addon_from_index( k_addon_type_world, - global_skateshop.selected_world_id ); + selected_world = get_addon_from_index( k_addon_type_world, + global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); - /* 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( 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 ); } - 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 ); - } - } + } + + if( loadable ){ + if( button_down( k_srbind_maccept ) ){ + skaterift_change_world_start( selected_world ); + } + } + } + else if( shop->type == k_skateshop_type_server ){ + f64 delta = vg.time_real - network_client.last_intent_change; + + if( delta > 5.0 ){ + 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 ); @@ -393,10 +437,30 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ network_send_item( k_netmsg_playeritem_player ); world_entity_unfocus(); + gui_helper_clear(); return; } } +static void skateshop_world_preupdate( world_instance *world ){ + for( u32 i=0; ient_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); @@ -458,11 +522,6 @@ fade_out:; 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 ); @@ -482,14 +541,14 @@ fade_out:; 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{ @@ -566,46 +625,56 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ 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() ){ vg_strcat( &subtext, "Loading..." ); } 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) " ); @@ -614,10 +683,9 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ } } else{ - vg_strcat( &info, "No worlds installed" ); + vg_strcat( &info, "No workshop worlds installed" ); } - m4x3f mtext,mlocal,mtextmdl; mdl_transform_m4x3( &mark_info->transform, mtext ); @@ -640,18 +708,6 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ mlocal[3][1] = -scale1*0.3f; m4x3_mul( mtext, mlocal, mtextmdl ); font3d_simple_draw( 0, bufsubtext, &skaterift.cam, 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, &skaterift.cam, mmdl ); - glDisable(GL_BLEND); - glEnable(GL_DEPTH_TEST); } /* @@ -664,10 +720,63 @@ static void skateshop_render( ent_skateshop *shop ){ 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 skateshop_render_nonfocused( world_instance *world, camera *cam ){ + for( u32 j=0; jent_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; 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 ); + } + } +} + +static void ent_skateshop_helpers_pickable( const char *acceptance ){ + vg_str text; + + if( gui_new_helper( input_button_list[k_srbind_mback], &text )) + vg_strcat( &text, "exit" ); + + 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" ); + } +} + /* * Entity logic: entrance event */ @@ -685,28 +794,26 @@ static void ent_skateshop_call( world_instance *world, ent_call *call ){ vg_info( "Entering skateshop\n" ); world_entity_focus( call->id ); -#if 0 - localplayer.immobile = 1; - menu.disable_open = 1; - skaterift.activity = k_skaterift_skateshop; - - v3_zero( localplayer.rb.v ); - v3_zero( localplayer.rb.w ); - localplayer._walk.move_speed = 0.0f; - global_skateshop.ptr_ent = shop; -#endif + gui_helper_clear(); if( shop->type == k_skateshop_type_boardshop ){ skateshop_update_viewpage(); skateshop_op_board_scan(); + 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 ){ - pointcloud_animate( k_pointcloud_anim_opening ); + ent_skateshop_helpers_pickable( "open rift" ); skateshop_op_world_scan(); } + 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); + skateshop_server_helper_update(); + } } }