X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=a667599bc31afaa5a07b95005d615db1f93f0a02;hb=5d5d5f394cbe2212769bc58a70fa622b4ed46205;hp=9438c00c6c6aa3c72e736843918a9900d827791e;hpb=a8ba9cc44e1ae9aeca62fb579a3105c625e59133;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 9438c00..a667599 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -9,6 +9,8 @@
 #include "player.h"
 #include "gui.h"
 #include "menu.h"
+#include "pointcloud.h"
+#include "highscores.h"
 
 /*
  * Checks string equality but does a hash check first
@@ -101,12 +103,6 @@ VG_STATIC void skateshop_update_viewpage(void)
    }
 }
 
-/* generic reciever */
-VG_STATIC void workshop_async_any_complete( void *data, u32 size )
-{
-   skaterift_end_op();
-}
-
 /*
  * op/subroutine: k_workshop_op_item_load
  * -----------------------------------------------------------------------------
@@ -352,6 +348,148 @@ VG_STATIC void workshop_op_item_scan(void)
    vg_loader_start( workshop_scan_thread, NULL );
 }
 
+/*
+ * op: k_async_op_world_scan
+ * -----------------------------------------------------------------------------
+ */
+
+/*
+ * Reciever for scan completion. copies the registry_count back into t0
+ */
+VG_STATIC void workshop_async_world_reg_update( void *data, u32 size )
+{
+   vg_info( "World registry update notify\n" );
+   global_skateshop.world_registry_count = 
+      global_skateshop.t1_world_registry_count;
+   skaterift_end_op();
+}
+
+/*
+ * Add a local world folder to the registry, it will verify existing ones are 
+ * still there too.
+ */
+VG_STATIC void world_scan_register_local( const char *folder_name )
+{
+   u32 hash = vg_strdjb2( folder_name );
+   for( u32 i=0; i<global_skateshop.t1_world_registry_count; i++ ){
+      struct registry_world *reg = 
+         &global_skateshop.world_registry[i];
+
+      if( const_str_eq( hash, folder_name, reg->foldername ) ){
+         reg->state = k_registry_board_state_indexed;
+         return;
+      }
+   }
+
+   if( global_skateshop.t1_world_registry_count == SKATESHOP_WORLDS_MAX ){
+      vg_error( "You have too many worlds installed!\n" );
+      return;
+   }
+
+   vg_info( "new listing!: %s\n", folder_name );
+
+   struct registry_world *reg = &global_skateshop.world_registry[
+      global_skateshop.t1_world_registry_count ++ ];
+
+   vg_strncpy( folder_name, reg->foldername, 64, k_strncpy_overflow_fatal );
+   reg->foldername_hash = hash;
+   reg->state = k_registry_board_state_indexed;
+   //reg->meta_present = 0;
+   reg->type = k_world_load_type_local;
+}
+
+/*
+ * Async thread which scans local files for boards, as well as scheduling 
+ * synchronous calls to the workshop
+ */
+VG_STATIC void world_scan_thread( void *_args )
+{
+   vg_linear_clear( vg_mem.scratch );
+
+   for( u32 i=0; i<global_skateshop.t1_world_registry_count; i++ ){
+      struct registry_world *reg = &global_skateshop.world_registry[i];
+      reg->state = k_registry_board_state_indexed_absent;
+   }
+
+   /*
+    * Local disk scan
+    */
+   vg_info( "Scanning maps/*.mdl\n" );
+
+   char path_buf[4096];
+   vg_str path;
+   vg_strnull( &path, path_buf, 4096 );
+   vg_strcat( &path, "maps/" );
+
+   DIR *dir = opendir( path.buffer );
+   if( !dir ){
+      vg_error( "opendir('maps') failed\n" );
+      vg_async_call( workshop_async_any_complete, NULL, 0 );
+      return;
+   }
+
+   struct dirent *entry;
+   while( (entry = readdir(dir)) ){
+      if( entry->d_type == DT_DIR ){
+         if( entry->d_name[0] == '.' ) continue;
+
+         vg_str folder = path;
+         char *folder_name = folder.buffer+folder.i;
+
+         if( strlen( entry->d_name ) >
+               vg_list_size(global_skateshop.world_registry[0].foldername)){
+            vg_warn( "Map folder too long: %s\n", entry->d_name );
+            continue;
+         }
+
+         vg_strcat( &folder, entry->d_name );
+         if( !vg_strgood( &folder ) ) break;
+
+         DIR *subdir = opendir( folder.buffer );
+         while( (entry = readdir(subdir)) ){
+            if( entry->d_type == DT_REG ){
+               if( entry->d_name[0] == '.' ) continue;
+
+               vg_str file = folder;
+               vg_strcat( &file, "/" );
+               vg_strcat( &file, entry->d_name );
+               if( !vg_strgood( &file ) ) continue;
+
+               char *ext = vg_strch( &file, '.' );
+               if( !ext ) continue;
+               if( strcmp(ext,".mdl") ) continue;
+               
+               vg_strcat( &folder, "" );
+               world_scan_register_local( folder_name );
+            }
+         }
+         closedir(subdir);
+      }
+   }
+   closedir(dir);
+
+   vg_async_call( workshop_async_world_reg_update, NULL, 0 );
+
+#if 0
+   tinydir_close(&dir);
+
+   if( steam_ready ) workshop_steam_scan();
+   
+   vg_async_call( workshop_async_reg_update, NULL, 0 );
+   vg_async_stall();
+   workshop_visibile_load_loop_thread(NULL);
+#endif
+}
+
+/*
+ * Asynchronous scan of local disk for worlds
+ */
+VG_STATIC void skateshop_op_world_scan(void)
+{
+   skaterift_begin_op( k_async_op_world_scan );
+   vg_loader_start( world_scan_thread, NULL );
+}
+
 /*
  * Regular stuff
  * -----------------------------------------------------------------------------
@@ -407,10 +545,12 @@ VG_STATIC void callback_persona_statechange( CallbackMsg_t *msg )
 VG_STATIC void skateshop_init(void)
 {
    u32 reg_size   = sizeof(struct registry_board)*SKATESHOP_REGISTRY_MAX,
+       wreg_size  = sizeof(struct registry_world)*SKATESHOP_WORLDS_MAX,
        cache_size = sizeof(struct cache_board)*SKATESHOP_BOARD_CACHE_MAX;
    
    global_skateshop.registry = vg_linear_alloc( vg_mem.rtmemory, reg_size );
-   global_skateshop.registry_count = 0;
+   global_skateshop.world_registry = 
+      vg_linear_alloc( vg_mem.rtmemory, wreg_size );
    global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size );
 
    memset( global_skateshop.cache, 0, cache_size );
@@ -448,6 +588,69 @@ VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
    return NULL;
 }
 
+VG_STATIC void pointcloud_async_end(void *_, u32 __)
+{
+   pointcloud_animate( k_pointcloud_anim_opening );
+   skaterift_end_op();
+}
+
+VG_STATIC void pointcloud_clear_async(void *_, u32 __)
+{
+   pointcloud.count = 0;
+   pointcloud_animate( k_pointcloud_anim_opening );
+   skaterift_end_op();
+}
+
+VG_STATIC void skateshop_preview_loader_thread( void *_data )
+{
+   struct registry_world *reg = _data;
+   
+   if( reg->type == k_world_load_type_local ){
+      char path_buf[4096];
+      vg_str path;
+      vg_strnull( &path, path_buf, 4096 );
+      vg_strcat( &path, "maps/" );
+      vg_strcat( &path, reg->foldername );
+      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 );
+      }
+   }
+   else{
+      vg_async_call( pointcloud_clear_async, NULL, 0 );
+   }
+}
+
+VG_STATIC void skateshop_load_world_preview( struct registry_world *reg )
+{
+   skaterift_begin_op( k_async_op_world_load_preview );
+   vg_loader_start( skateshop_preview_loader_thread, reg );
+}
+
 /*
  * VG event preupdate 
  */
@@ -460,8 +663,7 @@ VG_STATIC void global_skateshop_preupdate(void)
 
    if( !global_skateshop.active ) return;
 
-   world_instance *world = get_active_world();
-
+   world_instance *world = world_current_instance();
    ent_skateshop *shop = global_skateshop.ptr_ent;
 
    /* camera positioning */
@@ -474,7 +676,8 @@ VG_STATIC void global_skateshop_preupdate(void)
    player_vector_angles( localplayer.cam_override_angles, dir, 1.0f, 0.0f );
 
    v3f lookat;
-   if( shop->type == k_skateshop_type_boardshop ){
+   if( shop->type == k_skateshop_type_boardshop ||
+       shop->type == k_skateshop_type_worldshop ){
       ent_marker *display = mdl_arritm( &world->ent_marker,
                                     mdl_entity_id_id(shop->boards.id_display) );
       
@@ -570,6 +773,81 @@ VG_STATIC void global_skateshop_preupdate(void)
          global_skateshop_exit();
       }
    }
+   else if( shop->type == k_skateshop_type_worldshop ){
+      int browseable = 0,
+          loadable = 0;
+
+      if( global_skateshop.world_registry_count &&
+            ((skaterift.async_op == k_async_op_none)||
+             (skaterift.async_op == k_async_op_world_load_preview))){
+         gui_helper_action( axis_display_string(k_sraxis_mbrowse_h), "browse" );
+         browseable = 1;
+      }
+
+      if( skaterift.async_op == k_async_op_none ){
+         gui_helper_action( button_display_string(k_srbind_maccept), "load" );
+         loadable = 1;
+      }
+      
+      int change = 0;
+
+      if( browseable ){
+         if( button_down( k_srbind_mleft ) ){
+            if( global_skateshop.selected_world_id > 0 )
+            {
+               global_skateshop.selected_world_id --;
+               change = 1;
+            }
+         }
+
+         if( button_down( k_srbind_mright ) ){
+            if( global_skateshop.selected_world_id+1 < 
+                     global_skateshop.world_registry_count )
+            {
+               global_skateshop.selected_world_id ++;
+               change = 1;
+            }
+         }
+      }
+      
+      if( change && pointcloud_idle() ){
+         pointcloud_animate( k_pointcloud_anim_hiding );
+      }
+
+      if( skaterift.async_op == k_async_op_none ){
+         struct registry_world *rw = &global_skateshop.world_registry[
+            global_skateshop.selected_world_id ];
+
+         /* automatically load in clouds */
+         if( loadable && button_down( k_srbind_maccept ) ){
+            vg_info( "Select world (%u)\n", 
+                      global_skateshop.selected_world_id );
+            skaterift_change_world( rw->foldername );
+            return;
+         }
+         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( rw );
+               }
+               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 );
+               }
+            }
+         }
+      }
+   }
    else{
       vg_fatal_error( "Unknown store (%u)\n", shop->type );
    }
@@ -582,7 +860,7 @@ VG_STATIC void global_skateshop_preupdate(void)
 
 VG_STATIC void skateshop_render_boardshop(void)
 {
-   world_instance *world = get_active_world();
+   world_instance *world = world_current_instance();
    ent_skateshop *shop = global_skateshop.ptr_ent;
 
    u32 slot_count = vg_list_size(global_skateshop.shop_view_slots);
@@ -655,7 +933,7 @@ fade_out:;
    float scale = 0.2f,
          thickness = 0.03f;
 
-   font3d_bind( &world_global.font, &main_camera );
+   font3d_bind( &gui.font, &main_camera );
    shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
    /* Selection counter
@@ -669,7 +947,7 @@ fade_out:;
    m4x3_mul( mrack, mlocal, mmdl );
 
    if( global_skateshop.registry_count == 0 ){
-      font3d_simple_draw( &world_global.font, 0, 
+      font3d_simple_draw( &gui.font, 0, 
                           "Nothing installed", &main_camera, mmdl );
    }
    else{
@@ -680,7 +958,7 @@ fade_out:;
       i+=highscore_intl( buf+i, global_skateshop.registry_count, 3 );
       buf[i++] = '\0';
 
-      font3d_simple_draw( &world_global.font, 0, buf, &main_camera, mmdl );
+      font3d_simple_draw( &gui.font, 0, buf, &main_camera, mmdl );
    }
 
    struct cache_board *cache_ptr = skateshop_selected_cache_if_loaded();
@@ -694,29 +972,107 @@ fade_out:;
     * ----------------------------------------------------------------- */
    m3x3_zero( mlocal );
    m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
-   mlocal[3][0] = -font3d_string_width( &world_global.font, 0, info->title );
+   mlocal[3][0] = -font3d_string_width( &gui.font, 0, info->title );
    mlocal[3][0] *= scale*0.5f;
    mlocal[3][1] = 0.1f;
+   mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
-   font3d_simple_draw( &world_global.font, 0, info->title, &main_camera, mmdl );
+   font3d_simple_draw( &gui.font, 0, info->title, &main_camera, mmdl );
 
    /* Author name
     * ----------------------------------------------------------------- */
    scale *= 0.4f;
    m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
-   mlocal[3][0] = -font3d_string_width( &world_global.font, 0, 
-                                        info->author_name );
+   mlocal[3][0] = -font3d_string_width( &gui.font, 0, info->author_name );
    mlocal[3][0] *= scale*0.5f;
    mlocal[3][1] = 0.0f;
+   mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
-   font3d_simple_draw( &world_global.font, 0, 
-                       info->author_name, &main_camera, mmdl );
+   font3d_simple_draw( &gui.font, 0, info->author_name, &main_camera, mmdl );
 }
 
 VG_STATIC void skateshop_render_charshop(void)
 {
 }
 
+VG_STATIC void skateshop_render_worldshop(void)
+{
+   world_instance *world = world_current_instance();
+
+   ent_skateshop *shop = global_skateshop.ptr_ent;
+   ent_marker *mark_display = mdl_arritm( &world->ent_marker,
+                                  mdl_entity_id_id(shop->worlds.id_display)),
+              *mark_info = mdl_arritm( &world->ent_marker, 
+                                  mdl_entity_id_id(shop->boards.id_info));
+
+   /* Text */
+   char buftext[128], bufsubtext[128];
+   vg_str info, subtext;
+   vg_strnull( &info, buftext, 128 );
+   vg_strnull( &subtext, bufsubtext, 128 );
+   
+   if( global_skateshop.world_registry_count ){
+      struct registry_world *rw = &global_skateshop.world_registry[
+         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, 
+                              global_skateshop.world_registry_count, 3 );
+      info.buffer[info.i++] = ' ';
+      info.buffer[info.i] = '\0';
+
+      vg_strcat( &info, rw->foldername );
+      if( skaterift.async_op == k_async_op_world_loading ||
+          skaterift.async_op == k_async_op_world_preloading ){
+         vg_strcat( &subtext, "Loading..." );
+      }
+      else{
+         vg_strcat( &subtext, "No information" );
+      }
+   }
+   else{
+      vg_strcat( &info, "No worlds installed" );
+   }
+
+
+   m4x3f mtext,mlocal,mtextmdl;
+   mdl_transform_m4x3( &mark_info->transform, mtext );
+
+   font3d_bind( &gui.font, &main_camera );
+   shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+
+   float scale = 0.2f, thickness = 0.015f, scale1 = 0.08f;
+   m3x3_zero( mlocal );
+   m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
+   mlocal[3][0] = -font3d_string_width( &gui.font, 0, buftext );
+   mlocal[3][0] *= scale*0.5f;
+   mlocal[3][1] = 0.1f;
+   mlocal[3][2] = 0.0f;
+   m4x3_mul( mtext, mlocal, mtextmdl );
+   font3d_simple_draw( &gui.font, 0, buftext, &main_camera, mtextmdl );
+
+   m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } );
+   mlocal[3][0] = -font3d_string_width( &gui.font, 0, bufsubtext );
+   mlocal[3][0] *= scale1*0.5f;
+   mlocal[3][1] = -scale1*0.3f;
+   m4x3_mul( mtext, mlocal, mtextmdl );
+   font3d_simple_draw( &gui.font, 0, bufsubtext, &main_camera, 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, &main_camera, mmdl );
+   glDisable(GL_BLEND);
+   glEnable(GL_DEPTH_TEST);
+}
+
 /*
  * World: render event
  */
@@ -732,6 +1088,9 @@ VG_STATIC void skateshop_render(void)
    else if( shop->type == k_skateshop_type_charshop ){
       skateshop_render_charshop();
    }
+   else if( shop->type == k_skateshop_type_worldshop ){
+      skateshop_render_worldshop();
+   }
    else{
       vg_fatal_error( "Unknown store (%u)\n", shop->type );
    }
@@ -769,6 +1128,10 @@ VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
          skateshop_update_viewpage();
          workshop_op_item_scan();
       }
+      else if( shop->type == k_skateshop_type_worldshop ){
+         pointcloud_animate( k_pointcloud_anim_opening );
+         skateshop_op_world_scan();
+      }
    }
 }