}
}
+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
* -----------------------------------------------------------------------------
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; type<k_addon_type_max; type++ ){
struct addon_cache *cache = &addon_system.cache[type];
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;
+ 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 );
}
/*
* -----------------------------------------------------------------------------
*/
+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 );
+}
+
/*
* VG event init
*/
static void skateshop_init(void){
+ vg_async_call( skateshop_init_async, NULL, 0 );
+ vg_tex2d_replace_with_error( &global_skateshop.tex_preview_err );
+ vg_async_stall();
+
+ skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] =
+ global_skateshop.tex_preview_err;
}
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;
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 ||
}
}
+ 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",
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 ) ){
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( 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 );
- }
- 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 );
}
}
-#endif
}
else{
vg_fatal_error( "Unknown store (%u)\n", shop->type );
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 );
+ global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
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.render.world_title = vg_msg_getkvstr( &msg, "title");
vg_msg_skip_frame( &msg );
}
+ else {
+ vg_warn( "No workshop body\n" );
+ }
}
/* Text */
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) " );
}
}
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 );
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff