X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=e7049b5a6309b03c7a1b1088528bb16c795ae024;hb=e5d79dc0355e04baecce8908e29b8e7569d1e857;hp=aeeaf702f76a11f6be6a175f3a07b853c44bab71;hpb=02e5027d274fc66fecca0572d0998e2c562da7a7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index aeeaf70..e7049b5 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -8,6 +8,7 @@
 #include "world.h"
 #include "player.h"
 #include "gui.h"
+#include "menu.h"
 
 /*
  * Checks string equality but does a hash check first
@@ -205,68 +206,8 @@ VG_STATIC void workshop_async_reg_update( void *data, u32 size )
    global_skateshop.registry_count = global_skateshop.t1_registry_count;
 }
 
-/*
- * Async thread which scans local files for boards, as well as scheduling 
- * synchronous calls to the workshop
- */
-VG_STATIC void workshop_scan_thread( void *_args )
+VG_STATIC void workshop_steam_scan(void)
 {
-   vg_linear_clear( vg_mem.scratch );
-
-   for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
-      struct registry_board *reg = &global_skateshop.registry[i];
-      reg->state = k_registry_board_state_indexed_absent;
-   }
-
-   /*
-    * Local disk scan
-    */
-   vg_info( "Scanning models/boards/*.mdl\n" );
-   tinydir_dir dir;
-   tinydir_open( &dir, "models/boards" );
-
-   while( dir.has_next ){
-      tinydir_file file;
-      tinydir_readfile( &dir, &file );
-      
-      if( file.is_reg ){
-         u32 hash = vg_strdjb2( file.name );
-
-         for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
-            struct registry_board *reg = &global_skateshop.registry[i];
-
-            if( const_str_eq( hash, file.name, reg->filename ) ){
-               reg->state = k_registry_board_state_indexed;
-               goto next_file;
-            }
-         }
-
-         if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){
-            vg_error( "You have too many boards installed!\n" );
-            break;
-         }
-
-         vg_info( "new listing!: %s\n", file.name );
-
-         struct registry_board *reg = 
-            &global_skateshop.registry[global_skateshop.t1_registry_count ++];
-
-         reg->cache_ptr = NULL;
-         vg_strncpy( file.name, reg->filename, 64, k_strncpy_always_add_null );
-         vg_strncpy( file.name, reg->workshop.title,
-                     64, k_strncpy_always_add_null );
-         reg->filename_hash = hash;
-         reg->workshop_id = 0;
-         reg->state = k_registry_board_state_indexed;
-         reg->workshop.author = 0;
-         strcpy( reg->workshop.author_name, "custom" );
-      }
-
-next_file: tinydir_next( &dir );
-   }
-
-   tinydir_close(&dir);
-
    /*
     * Steam workshop scan
     */
@@ -331,6 +272,71 @@ next_file: tinydir_next( &dir );
 
 next_file_workshop:;
    }
+}
+
+/*
+ * Async thread which scans local files for boards, as well as scheduling 
+ * synchronous calls to the workshop
+ */
+VG_STATIC void workshop_scan_thread( void *_args )
+{
+   vg_linear_clear( vg_mem.scratch );
+
+   for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
+      struct registry_board *reg = &global_skateshop.registry[i];
+      reg->state = k_registry_board_state_indexed_absent;
+   }
+
+   /*
+    * Local disk scan
+    */
+   vg_info( "Scanning models/boards/*.mdl\n" );
+   tinydir_dir dir;
+   tinydir_open( &dir, "models/boards" );
+
+   while( dir.has_next ){
+      tinydir_file file;
+      tinydir_readfile( &dir, &file );
+      
+      if( file.is_reg ){
+         u32 hash = vg_strdjb2( file.name );
+
+         for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
+            struct registry_board *reg = &global_skateshop.registry[i];
+
+            if( const_str_eq( hash, file.name, reg->filename ) ){
+               reg->state = k_registry_board_state_indexed;
+               goto next_file;
+            }
+         }
+
+         if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){
+            vg_error( "You have too many boards installed!\n" );
+            break;
+         }
+
+         vg_info( "new listing!: %s\n", file.name );
+
+         struct registry_board *reg = 
+            &global_skateshop.registry[global_skateshop.t1_registry_count ++];
+
+         reg->cache_ptr = NULL;
+         vg_strncpy( file.name, reg->filename, 64, k_strncpy_always_add_null );
+         vg_strncpy( file.name, reg->workshop.title,
+                     64, k_strncpy_always_add_null );
+         reg->filename_hash = hash;
+         reg->workshop_id = 0;
+         reg->state = k_registry_board_state_indexed;
+         reg->workshop.author = 0;
+         strcpy( reg->workshop.author_name, "custom" );
+      }
+
+next_file: tinydir_next( &dir );
+   }
+
+   tinydir_close(&dir);
+
+   if( steam_ready ) workshop_steam_scan();
    
    vg_async_call( workshop_async_reg_update, NULL, 0 );
    vg_async_stall();
@@ -445,6 +451,7 @@ VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
 /*
  * VG event preupdate 
  */
+void temp_update_playermodel(void);
 VG_STATIC void global_skateshop_preupdate(void)
 {
    float rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f );
@@ -456,18 +463,30 @@ VG_STATIC void global_skateshop_preupdate(void)
    world_instance *world = get_active_world();
 
    ent_skateshop *shop = global_skateshop.ptr_ent;
+
+   /* camera positioning */
    ent_camera *ref = mdl_arritm( &world->ent_camera, 
                                  mdl_entity_id_id(shop->id_camera) );
-   ent_marker *display = mdl_arritm( &world->ent_marker,
-                                 mdl_entity_id_id(shop->id_display) );
-   
+      
    v3f dir = {0.0f,-1.0f,0.0f};
    mdl_transform_vector( &ref->transform, dir, dir );
    player_vector_angles( localplayer.cam_override_angles, dir, 1.0f, 0.0f );
-   
+
    v3f lookat;
-   v3_sub( display->transform.co, localplayer.rb.co, lookat );
-   
+   if( shop->type == k_skateshop_type_boardshop ){
+      ent_marker *display = mdl_arritm( &world->ent_marker,
+                                    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 ){
+      v3_sub( ref->transform.co, localplayer.rb.co, lookat );
+   }
+   else{
+      vg_fatal_error( "Unknown store (%u)\n", shop->type );
+   }
+
    q_axis_angle( localplayer.rb.q, (v3f){0.0f,1.0f,0.0f}, 
                  atan2f(lookat[0],lookat[2]) );
 
@@ -475,60 +494,83 @@ VG_STATIC void global_skateshop_preupdate(void)
    localplayer.cam_override_fov = ref->fov;
    localplayer.cam_override_strength = global_skateshop.factive;
 
-   gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" );
-   gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
+   /* input */
+   if( shop->type == k_skateshop_type_boardshop ){
+      gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" );
+      gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
 
-   int moved = 0;
-   struct cache_board *selected_cache = skateshop_selected_cache_if_loaded();
+      struct cache_board *selected_cache = skateshop_selected_cache_if_loaded();
 
-   if( selected_cache ){
-      gui_helper_action( button_display_string( k_srbind_maccept ), "pick" );
-   }
-
-   /*
-    * Controls
-    * ----------------------
-    */
+      if( selected_cache ){
+         gui_helper_action( button_display_string( k_srbind_maccept ), "pick" );
+      }
 
-   if( global_skateshop.interaction_cooldown > 0.0f ){
-      global_skateshop.interaction_cooldown -= vg.time_delta;
-      return;
-   }
+      /*
+       * Controls
+       * ----------------------
+       */
 
-   if( button_down( k_srbind_mleft ) ){
-      if( global_skateshop.selected_registry_id > 0 ){
-         global_skateshop.selected_registry_id --;
-         moved = 1;
+      if( button_down( k_srbind_mleft ) ){
+         if( global_skateshop.selected_registry_id > 0 ){
+            global_skateshop.selected_registry_id --;
+         }
       }
-   }
 
-   if( button_down( k_srbind_mright ) ){
-      if( global_skateshop.selected_registry_id+1 < 
-               global_skateshop.registry_count )
-      {
-         global_skateshop.selected_registry_id ++;
-         moved = 1;
+      if( button_down( k_srbind_mright ) ){
+         if( global_skateshop.selected_registry_id+1 < 
+                  global_skateshop.registry_count )
+         {
+            global_skateshop.selected_registry_id ++;
+         }
       }
-   }
 
-   if( moved ){
-      global_skateshop.interaction_cooldown = 0.125f;
-      return;
-   }
+      if( selected_cache && button_down( k_srbind_maccept ) ){
+         vg_info( "chose board from skateshop (%u)\n", 
+                     global_skateshop.selected_registry_id );
 
-   if( selected_cache && button_down( k_srbind_maccept ) ){
-      vg_info( "chose board from skateshop (%u)\n", 
-                  global_skateshop.selected_registry_id );
+         if( localplayer.board_view_slot ){
+            unwatch_cache_board( localplayer.board_view_slot );
+         }
 
-      if( localplayer.board_view_slot ){
-         unwatch_cache_board( localplayer.board_view_slot );
+         localplayer.board_view_slot = selected_cache;
+         watch_cache_board( localplayer.board_view_slot );
+
+         global_skateshop_exit();
+         return;
       }
+   }
+   else if( shop->type == k_skateshop_type_charshop ){
+      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" );
 
-      localplayer.board_view_slot = selected_cache;
-      watch_cache_board( localplayer.board_view_slot );
+      if( button_down( k_srbind_mleft ) ){
+         if( cl_playermdl_id > 0 ){
+            cl_playermdl_id --;
+         }
+         else{
+            cl_playermdl_id = 2; /* HACK */
+         }
+         temp_update_playermodel(); /* HACK */
+      }
 
-      global_skateshop_exit();
-      return;
+      if( button_down( k_srbind_mright ) ){
+         if( cl_playermdl_id+1 < 3 ){
+            cl_playermdl_id ++;
+         }
+         else{
+            cl_playermdl_id = 0;  /* HACK */
+         }
+         temp_update_playermodel(); /* HACK */
+         /*lol*/
+      }
+
+      if( button_down( k_srbind_maccept ) ){
+         global_skateshop_exit();
+      }
+   }
+   else{
+      vg_fatal_error( "Unknown store (%u)\n", shop->type );
    }
 
    if( button_down( k_srbind_mback ) ){
@@ -537,22 +579,17 @@ VG_STATIC void global_skateshop_preupdate(void)
    }
 }
 
-/*
- * World: render event
- */
-VG_STATIC void skateshop_render(void)
+VG_STATIC void skateshop_render_boardshop(void)
 {
-   if( !global_skateshop.active ) return;
-      
-   ent_skateshop *shop = global_skateshop.ptr_ent;
    world_instance *world = get_active_world();
+   ent_skateshop *shop = global_skateshop.ptr_ent;
 
    u32 slot_count = vg_list_size(global_skateshop.shop_view_slots);
 
    ent_marker *mark_rack = mdl_arritm( &world->ent_marker, 
-                                  mdl_entity_id_id(shop->id_rack)),
+                                  mdl_entity_id_id(shop->boards.id_rack)),
               *mark_display = mdl_arritm( &world->ent_marker,
-                                  mdl_entity_id_id(shop->id_display));
+                                  mdl_entity_id_id(shop->boards.id_display));
 
    int visibility[ SKATESHOP_VIEW_SLOT_MAX ];
    SDL_AtomicLock( &global_skateshop.sl_cache_access );
@@ -601,7 +638,7 @@ fade_out:;
    }
 
    ent_marker *mark_info = mdl_arritm( &world->ent_marker, 
-                                        mdl_entity_id_id(shop->id_info));
+                                        mdl_entity_id_id(shop->boards.id_info));
    m4x3f mtext, mrack;
    mdl_transform_m4x3( &mark_info->transform, mtext );
    mdl_transform_m4x3( &mark_rack->transform, mrack );
@@ -675,6 +712,30 @@ fade_out:;
                        info->author_name, &main_camera, mmdl );
 }
 
+VG_STATIC void skateshop_render_charshop(void)
+{
+}
+
+/*
+ * World: render event
+ */
+VG_STATIC void skateshop_render(void)
+{
+   if( !global_skateshop.active ) return;
+      
+   ent_skateshop *shop = global_skateshop.ptr_ent;
+
+   if( shop->type == k_skateshop_type_boardshop ){
+      skateshop_render_boardshop();
+   }
+   else if( shop->type == k_skateshop_type_charshop ){
+      skateshop_render_charshop();
+   }
+   else{
+      vg_fatal_error( "Unknown store (%u)\n", shop->type );
+   }
+}
+
 /*
  * Entity logic: entrance event
  */
@@ -684,6 +745,8 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
    ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index );
    vg_info( "skateshop_call\n" );
 
+   if( menu.active ) return;
+
    if( call->function == k_ent_function_trigger ){
       if( localplayer.subsystem != k_player_subsystem_walk ){
          return;
@@ -692,6 +755,7 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
       vg_info( "Entering skateshop\n" );
 
       localplayer.immobile = 1;
+      menu.disable_open = 1;
       global_skateshop.active = 1;
 
       v3_zero( localplayer.rb.v );
@@ -699,8 +763,10 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
       localplayer._walk.move_speed = 0.0f;
       global_skateshop.ptr_ent = shop;
       
-      skateshop_update_viewpage();
-      workshop_op_item_scan();
+      if( shop->type == k_skateshop_type_boardshop ){
+         skateshop_update_viewpage();
+         workshop_op_item_scan();
+      }
    }
 }
 
@@ -712,6 +778,7 @@ VG_STATIC void global_skateshop_exit(void)
    vg_info( "exit skateshop\n" );
    localplayer.immobile = 0;
    global_skateshop.active = 0;
+   menu.disable_open = 0;
    srinput.ignore_input_frames = 2;
 }