X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=12e89233ab670d36a1537eb62f73b3de413421d3;hb=fbc68c65e01838feb77f47b30994b45fcc39ebaf;hp=0084e19dd3829b4bdc44bff97cb8521a2689900f;hpb=dd7d6eb0702cd9a0c97ab6da9ec577af0b797b88;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 0084e19..12e8923 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -192,18 +192,21 @@ static void skateshop_init_async(void *_data,u32 size){
    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_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;
+   vg_async_call( skateshop_init_async, NULL, 0 );
 }
 
 static u16 skateshop_selected_cache_id(void){
@@ -369,7 +372,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;
@@ -410,7 +413,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
       }
    }
    else if( shop->type == k_skateshop_type_server ){
-      f64 delta = vg.time - network_client.last_intent_change;
+      f64 delta = vg.time_real - network_client.last_intent_change;
 
       if( delta > 5.0 ){
          global_skateshop.helper_pick->greyed = 0;
@@ -418,6 +421,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
             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 {
@@ -625,21 +629,32 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){
 
       addon_reg *reg = get_addon_from_index( k_addon_type_world,
             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;
+      if( !reg ) 
+         goto none;
 
-      if( vg_msg_seekframe( &msg, "workshop" ) ){
-         global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title");
-         vg_msg_skip_frame( &msg );
+      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 {
-         vg_warn( "No workshop body\n" );
+         global_skateshop.render.world_title = reg->alias.foldername;
       }
    }
 
+none:;
+
    /* Text */
    char buftext[128], bufsubtext[128];
    vg_str info, subtext;
@@ -711,6 +726,37 @@ 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; 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));
+
+      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;