X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=50b456941c9bde1ee8fc77d1ea4a0c70d130f33b;hb=0c2bc783691adbd29cbb8cbcaed9c09e3c3d96e4;hp=ec3269435fa0f76c437624ac38c030e89d2caf57;hpb=a93f0ac1b2d04a4b5f3733048ad8e8b6b6e875cb;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index ec32694..50b4569 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -64,8 +64,7 @@ static void skateshop_async_preview_imageload( void *data, u32 len ){ global_skateshop.tex_preview; } else { - skaterift.rt_textures[k_skaterift_rt_workshop_preview] = - global_skateshop.tex_preview_err; + skaterift.rt_textures[k_skaterift_rt_workshop_preview] = vg.tex_missing; } SDL_AtomicLock( &addon_system.sl_cache_using_resources ); @@ -193,11 +192,8 @@ static void skateshop_init_async(void *_data,u32 size){ 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; + 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(); } @@ -205,7 +201,6 @@ static void skateshop_init_async(void *_data,u32 size){ * 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 ); } @@ -372,7 +367,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( valid_count && vg_loader_availible() ) browseable = 1; - if( vg_loader_availible() ) + if( valid_count && vg_loader_availible() ) loadable = 1; global_skateshop.helper_browse->greyed = !browseable; @@ -726,6 +721,40 @@ static void skateshop_render( ent_skateshop *shop ){ 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;