mission is possible 2
[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.c
index e985582c4c4438a3bd04de4cc8bf5743b586999d..a667599bc31afaa5a07b95005d615db1f93f0a02 100644 (file)
@@ -1,11 +1,20 @@
 #ifndef ENT_SKATESHOP_C
 #define ENT_SKATESHOP_C
 
+#define VG_GAME
+#include "vg/vg.h"
+#include "vg/vg_steam_ugc.h"
 #include "ent_skateshop.h"
 #include "world.h"
 #include "player.h"
 #include "gui.h"
+#include "menu.h"
+#include "pointcloud.h"
+#include "highscores.h"
 
+/*
+ * Checks string equality but does a hash check first
+ */
 static inline int const_str_eq( u32 hash, const char *str, const char *cmp )
 {
    if( hash == vg_strdjb2(cmp) )
@@ -14,222 +23,270 @@ static inline int const_str_eq( u32 hash, const char *str, const char *cmp )
    return 0;
 }
 
-static int skateshop_workshop_name_blacklisted( u32 hash, const char *name )
+/*
+ * Get an existing cache instance, allocate a new one to be loaded, or NULL if
+ * there is no space
+ */
+VG_STATIC struct cache_board *skateshop_cache_fetch( u32 registry_index )
 {
-   if( const_str_eq( hash, name, "skaterift_fish.mdl" ) ) return 1;
-   return 0;
-}
-
-VG_STATIC void skateshop_loader_start( void (*pfn)(void *data) )
-{
-   if( global_skateshop.loading )
-      vg_fatal_error( "skateshop thread sync failure\n" );
+   struct registry_board *reg = NULL;
 
-   global_skateshop.loading = 1;
-   vg_loader_start( pfn, NULL );
-}
+   if( registry_index < global_skateshop.registry_count ){
+      reg = &global_skateshop.registry[ registry_index ];
 
-VG_STATIC void skateshop_async_post( void *payload, u32 size )
-{
-   global_skateshop.loading = 0;
-}
+      if( reg->cache_ptr ){
+         return reg->cache_ptr;
+      }
+   }
 
-VG_STATIC 
-struct dynamic_board *skateshop_lru_alloc( u32 id )
-{
+   /* lru eviction. should be a linked list maybe... */
    double min_time = 1e300;
-   struct dynamic_board *min_board = NULL;
-
-   for( u32 i=0; i<MAX_DYNAMIC_BOARDS; i++ ){
-      struct dynamic_board *db = &global_skateshop.dynamic_boards[i];
+   struct cache_board *min_board = NULL;
 
-      if( db->state == k_dynamic_board_state_loading )
-         continue;
+   SDL_AtomicLock( &global_skateshop.sl_cache_access );
+   for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
+      struct cache_board *cache_ptr = &global_skateshop.cache[i];
 
-      if( db->ref_count )
-         continue;
+      if( cache_ptr->state == k_cache_board_state_load_request ) continue;
+      if( cache_ptr->ref_count ) continue;
 
-      if( db->last_use_time < min_time ){
-         min_time = db->last_use_time;
-         min_board = db;
+      if( cache_ptr->last_use_time < min_time ){
+         min_time = cache_ptr->last_use_time;
+         min_board = cache_ptr;
       }
    }
 
    if( min_board ){
-      if( min_board->state == k_dynamic_board_state_loaded ){
-         struct board_registry *other = 
-            &global_skateshop.registry[min_board->registry_id];
+      if( min_board->state == k_cache_board_state_loaded ){
+         struct registry_board *other = 
+            &global_skateshop.registry[ min_board->registry_id ];
 
          vg_info( "Deallocating board: '%s'\n", min_board, other->filename );
 
          player_board_unload( &min_board->board );
-         other->dynamic = NULL;
+         other->cache_ptr = NULL;
       }
 
-      struct board_registry *reg = &global_skateshop.registry[id];
-
-      vg_info( "Allocating board '%s' @%p\n", reg->filename, min_board );
+      if( reg ){
+         vg_info( "Allocating board (reg:%u) '%s'\n", 
+                  registry_index, reg->filename );
+      }
+      else{
+         vg_info( "Pre-allocating board (reg:%u) 'null'\n", registry_index );
+      }
 
-      min_board->state = k_dynamic_board_state_loading;
-      min_board->registry_id = id;
+      min_board->registry_id = registry_index;
       min_board->last_use_time = vg.time;
       min_board->ref_count = 0;
+      min_board->state = k_cache_board_state_load_request;
    }
    else{
       vg_error( "No free boards to load registry!\n" );
    }
 
+   SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
    return min_board;
 }
 
-VG_STATIC 
-void skateshop_board_registry_path( struct board_registry *reg, char path[256] )
+VG_STATIC void skateshop_update_viewpage(void)
 {
-   if( reg->workshop ){
-      snprintf( path, 256, "models/boards/workshop/%s/something.mdl", 
-                reg->filename );
-   }
-   else{
-      snprintf( path, 256, "models/boards/%s", reg->filename );
-   }
-}
+   u32 page = global_skateshop.selected_registry_id/SKATESHOP_VIEW_SLOT_MAX;
+   
+   for( u32 i=0; i<SKATESHOP_VIEW_SLOT_MAX; i++ ){
+      struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
+      u32 request_id = page*SKATESHOP_VIEW_SLOT_MAX + i;
+      
+      if( slot->cache_ptr ) unwatch_cache_board( slot->cache_ptr );
 
-/* we can only keep using a viewslot pointer for multiple frames if we watch it
- * using this function */
-VG_STATIC void watch_dynamic_board( struct dynamic_board *db )
-{
-   if( db->ref_count >= 32 ){
-      vg_fatal_error( "dynamic board watch missmatch (limit is 32)\n" );
+      slot->cache_ptr = skateshop_cache_fetch( request_id );
+      if( slot->cache_ptr ) watch_cache_board( slot->cache_ptr );
    }
-
-   db->last_use_time = vg.time;
-   db->ref_count ++;
 }
 
-/* after this is called, the calling code only has access to the pointer for the
- * duration of a frame */
-VG_STATIC void unwatch_dynamic_board( struct dynamic_board *db )
+/*
+ * op/subroutine: k_workshop_op_item_load
+ * -----------------------------------------------------------------------------
+ */
+
+/*
+ * Reciever for board completion; only promotes the status in the main thread
+ */
+VG_STATIC void skateshop_async_board_loaded( void *payload, u32 size )
 {
-   if( db->ref_count == 0 ){
-      vg_fatal_error( "dynamic board unwatch missmatch (no watchers)\n" );
-   }
+   SDL_AtomicLock( &global_skateshop.sl_cache_access );
+   struct cache_board *cache_ptr = payload;
+   cache_ptr->last_use_time = vg.time;
+   cache_ptr->state = k_cache_board_state_loaded;
+
+   struct registry_board *reg = 
+      &global_skateshop.registry[ cache_ptr->registry_id ];
+   reg->cache_ptr = cache_ptr;
+   SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
 
-   db->ref_count --;
+   vg_success( "Async board loaded (%s)\n", reg->filename );
 }
 
-VG_STATIC void skateshop_async_board_complete( void *payload, u32 size )
+/*
+ * Thread(or subroutine of thread), for checking view slots that weve installed.
+ * Load the model if a view slot wants it
+ */
+VG_STATIC void workshop_visibile_load_loop_thread( void *_args )
 {
-   struct dynamic_board *db = payload;
+   char path[1024];
+   for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
+      struct cache_board *cache_ptr = &global_skateshop.cache[i];
+
+      SDL_AtomicLock( &global_skateshop.sl_cache_access );
+      if( cache_ptr->state == k_cache_board_state_load_request ){
+         if( cache_ptr->registry_id >= global_skateshop.registry_count ){
+            /* should maybe have a different value for this case */
+            cache_ptr->state = k_cache_board_state_none;
+            SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+            continue;
+         }
 
-   /* all possible view slots are 'listening' for this event, 
-    * which must be checked here */
-   for( u32 i=0; i<vg_list_size(global_skateshop.shop_view_slots); i++ ){
-      if( global_skateshop.shop_view_slots[i].db == db ){
-         watch_dynamic_board( db );
-      }
-   }
+         /* continue with the request */
+         SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
 
-   if( localplayer.board_view_slot == db ){
-      watch_dynamic_board( db );
-   }
+         struct registry_board *reg = 
+            &global_skateshop.registry[ cache_ptr->registry_id ];
 
-   db->last_use_time = vg.time;
-   db->state = k_dynamic_board_state_loaded;
+         if( reg->workshop_id ){
+            vg_async_item *call = 
+               vg_async_alloc( sizeof(struct async_workshop_filepath_info) );
 
-   struct board_registry *reg = &global_skateshop.registry[ db->registry_id ];
-   reg->dynamic = db;
+            struct async_workshop_filepath_info *info = call->payload;
+            info->buf = path;
+            info->id = reg->workshop_id;
+            info->len = vg_list_size(path) - strlen("/board.mdl")-1;
+            vg_async_dispatch( call, async_workshop_get_filepath );
+            vg_async_stall(); /* too bad! */
 
-   vg_success( "Async board loaded (%s)\n", reg->filename );
-}
+            if( path[0] == '\0' ){
+               SDL_AtomicLock( &global_skateshop.sl_cache_access );
+               cache_ptr->state = k_cache_board_state_none;
+               SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
 
-VG_STATIC void skateshop_load_requested_boards(void)
-{
-   char path[256];
-   for( u32 i=0; i<MAX_DYNAMIC_BOARDS; i++ ){
-      struct dynamic_board *db = &global_skateshop.dynamic_boards[i];
-   
-      if( db->state == k_dynamic_board_state_loading ){
-         struct board_registry *reg = 
-            &global_skateshop.registry[ db->registry_id ];
+               vg_error( "Failed SteamAPI_GetItemInstallInfo(" PRINTF_U64 ")\n",
+                           reg->workshop_id );
+               continue;
+            }
+            else{
+               strcat( path, "/board.mdl" );
+            }
+         }
+         else{
+            snprintf( path, 256, "models/boards/%s", reg->filename );
+         }
 
-         skateshop_board_registry_path( reg, path );
-         player_board_load( &db->board, path );
-         vg_async_call( skateshop_async_board_complete, db, 0 );
+         player_board_load( &cache_ptr->board, path );
+         vg_async_call( skateshop_async_board_loaded, cache_ptr, 0 );
       }
+      else
+         SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
    }
+   vg_async_call( workshop_async_any_complete, NULL, 0 );
 }
 
-VG_STATIC void skateshop_thread1_refresh( void *data )
+/*
+ * op: k_workshop_op_item_scan
+ * -----------------------------------------------------------------------------
+ */
+
+/*
+ * Reciever for scan completion. copies the registry_count back into t0
+ */
+VG_STATIC void workshop_async_reg_update( void *data, u32 size )
 {
-   skateshop_load_requested_boards();
-   vg_async_call( skateshop_async_post, NULL, 0 );
+   vg_info( "Registry update notify\n" );
+   global_skateshop.registry_count = global_skateshop.t1_registry_count;
 }
 
-VG_STATIC int skateshop_use_board( int argc, const char *argv[] )
+VG_STATIC void workshop_steam_scan(void)
 {
-   if( global_skateshop.loading ){
-      vg_error( "Cannot use skateshop currently (loader thread missing)\n" );
-      return 0;
-   }
+   /*
+    * Steam workshop scan
+    */
+   vg_info( "Scanning steam workshop for boards\n" );
+   PublishedFileId_t workshop_ids[ SKATESHOP_REGISTRY_MAX ];
+   u32 workshop_count = SKATESHOP_REGISTRY_MAX;
+
+   vg_async_item *call = vg_async_alloc(
+                           sizeof(struct async_workshop_installed_files_info));
+   struct async_workshop_installed_files_info *info = call->payload;
+   info->buffer = workshop_ids;
+   info->len = &workshop_count;
+   vg_async_dispatch( call, async_workshop_get_installed_files );
+   vg_async_stall();
+
+   for( u32 j=0; j<workshop_count; j++ ){
+      PublishedFileId_t id = workshop_ids[j];
+
+      for( u32 i=0; i<global_skateshop.t1_registry_count; i++ ){
+         struct registry_board *reg = &global_skateshop.registry[i];
+
+         if( reg->workshop_id == id ){
+            reg->state = k_registry_board_state_indexed;
+            goto next_file_workshop;
+         }
+      }
 
-   if( argc == 1 ){
-      u32 hash = vg_strdjb2( argv[0] );
+      if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){
+         vg_error( "You have too many boards installed!\n" );
+         break;
+      }
 
-      for( u32 i=0; i<global_skateshop.registry_count; i++ ){
-         struct board_registry *reg = &global_skateshop.registry[i];
+      vg_info( "new listing from the steam workshop!: "PRINTF_U64"\n", id );
 
-         if( const_str_eq( hash, argv[0], reg->filename ) ){
-            if( reg->dynamic ){
-               struct dynamic_board *db = reg->dynamic;
+      struct registry_board *reg = &global_skateshop.registry[
+                                       global_skateshop.t1_registry_count ++ ];
 
-               if( db->state == k_dynamic_board_state_loaded ){
-                  localplayer.board_view_slot = db;
-                  watch_dynamic_board( db );
-               }
-               else{
-                  vg_fatal_error( "Invalid state while loading board\n" );
-               }
-            }
-            else{
-               if( localplayer.board_view_slot ){
-                  unwatch_dynamic_board( localplayer.board_view_slot );
-                  localplayer.board_view_slot = NULL;
-               }
+      reg->cache_ptr = NULL;
+      snprintf( reg->filename, 64, PRINTF_U64, id );
+      reg->filename_hash = vg_strdjb2( reg->filename );
+      reg->workshop_id = id;
+      reg->state = k_registry_board_state_indexed;
 
-               struct dynamic_board *db = skateshop_lru_alloc( i );
-               localplayer.board_view_slot = db;
-               db->state = k_dynamic_board_state_loading;
-               skateshop_loader_start( skateshop_thread1_refresh );
-            }
-            return 1;
-         }
-      }
-   }
-   return 0;
-}
+      workshop_file_info_clear( &reg->workshop );
+      strcpy( reg->workshop.title, "Workshop file" );
 
-VG_STATIC void skateshop_use_board_suggest( int argc, const char *argv[] )
-{
-   if( argc == 1 ){
-      for( u32 i=0; i<global_skateshop.registry_count; i++ ){
-         struct board_registry *reg = &global_skateshop.registry[i];
+      /* load the metadata off the disk */
+      vg_async_item *call = 
+         vg_async_alloc( sizeof(struct async_workshop_filepath_info) );
 
-         if( reg->ghost ) continue; /* we probably can't load these */
+      const char *meta_file = "/board.mdl.inf";
+      char path[ 1024 ];
+      struct async_workshop_filepath_info *info = call->payload;
+      info->buf = path;
+      info->id = reg->workshop_id;
+      info->len = vg_list_size(path) - strlen(meta_file)-1;
+      vg_async_dispatch( call, async_workshop_get_filepath );
+      vg_async_stall(); /* too bad! */
 
-         console_suggest_score_text( reg->filename, argv[0], 0 );
-      }
+      strcat( path, meta_file );
+      workshop_load_metadata( path, &reg->workshop );
+
+next_file_workshop:;
    }
 }
 
-VG_STATIC void skateshop_scan_for_items( void *data )
+/*
+ * 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.registry_count; i++ ){
-      struct board_registry *reg = &global_skateshop.registry[i];
-      reg->ghost = 1;
+   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" );
 
@@ -240,31 +297,34 @@ VG_STATIC void skateshop_scan_for_items( void *data )
       if( file.is_reg ){
          u32 hash = vg_strdjb2( file.name );
 
-         for( u32 i=0; i<global_skateshop.registry_count; i++ ){
-            struct board_registry *reg = &global_skateshop.registry[i];
+         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->ghost = 0;
+               reg->state = k_registry_board_state_indexed;
                goto next_file;
             }
          }
 
-         if( global_skateshop.registry_count == MAX_LOCAL_BOARDS ){
+         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 board_registry *reg = &global_skateshop.registry[
-                                          global_skateshop.registry_count ++ ];
+         struct registry_board *reg = 
+            &global_skateshop.registry[global_skateshop.t1_registry_count ++];
 
-         reg->dynamic = NULL;
+         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->uid = 0;
-         reg->workshop = 0;
-         reg->ghost = 0;
+         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 );
@@ -272,92 +332,329 @@ next_file: tinydir_next( &dir );
 
    tinydir_close(&dir);
 
-   skateshop_load_requested_boards();
-   vg_async_call( skateshop_async_post, NULL, 0 );
+   if( steam_ready ) workshop_steam_scan();
+   
+   vg_async_call( workshop_async_reg_update, NULL, 0 );
+   vg_async_stall();
+   workshop_visibile_load_loop_thread(NULL);
+}
+
+/*
+ * Asynchronous scan of local disk for items and add them to the registry
+ */
+VG_STATIC void workshop_op_item_scan(void)
+{
+   skaterift_begin_op( k_workshop_op_item_scan );
+   vg_loader_start( workshop_scan_thread, NULL );
 }
 
-VG_STATIC void global_skateshop_exit(void)
+/*
+ * 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( "exit skateshop\n" );
-   localplayer.immobile = 0;
-   global_skateshop.active = 0;
-   srinput.ignore_input_frames = 2;
+   vg_info( "World registry update notify\n" );
+   global_skateshop.world_registry_count = 
+      global_skateshop.t1_world_registry_count;
+   skaterift_end_op();
 }
 
-VG_STATIC void skateshop_request_viewpage( u32 page )
+/*
+ * 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 slot_count = vg_list_size(global_skateshop.shop_view_slots);
-   u32 start = page * slot_count;
+   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];
 
-   for( u32 i=0; i<slot_count; i++ ){
-      struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
-      
-      if( slot->db ){
-         slot->db->ref_count --;
-         slot->db = NULL;
+      if( const_str_eq( hash, folder_name, reg->foldername ) ){
+         reg->state = k_registry_board_state_indexed;
+         return;
       }
+   }
 
-      u32 reg_index = start+i;
-      if( reg_index < global_skateshop.registry_count ){
-         struct board_registry *reg = &global_skateshop.registry[ reg_index ];
+   if( global_skateshop.t1_world_registry_count == SKATESHOP_WORLDS_MAX ){
+      vg_error( "You have too many worlds installed!\n" );
+      return;
+   }
 
-         if( reg->dynamic ){
-            struct dynamic_board *db = reg->dynamic;
+   vg_info( "new listing!: %s\n", folder_name );
 
-            if( db->state == k_dynamic_board_state_loaded ){
-               db->last_use_time = vg.time;
-               db->ref_count ++;
-               slot->db = db;
-            }
-            else{
-               vg_fatal_error( "Invalid state while loading page\n" );
-            }
+   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;
          }
-         else{
-            struct dynamic_board *db = skateshop_lru_alloc( reg_index );
 
-            if( db ){
-               db->ref_count ++;
-               slot->db = db;
+         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
 }
 
-VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
+/*
+ * Asynchronous scan of local disk for worlds
+ */
+VG_STATIC void skateshop_op_world_scan(void)
 {
-   u32 index = mdl_entity_id_id( call->id );
-   ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index );
-   vg_info( "skateshop_call\n" );
+   skaterift_begin_op( k_async_op_world_scan );
+   vg_loader_start( world_scan_thread, NULL );
+}
 
-   if( global_skateshop.loading ){
-      vg_error( "Cannot enter skateshop currently (loader thread missing)\n" );
-      return;
+/*
+ * Regular stuff
+ * -----------------------------------------------------------------------------
+ */
+
+/* we can only keep using a viewslot pointer for multiple frames if we watch it
+ * using this function */
+VG_STATIC void watch_cache_board( struct cache_board *ptr )
+{
+   if( ptr->ref_count >= 32 ){
+      vg_fatal_error( "dynamic board watch missmatch (limit is 32)\n" );
    }
 
-   if( call->function == k_ent_function_trigger ){
-      if( localplayer.subsystem != k_player_subsystem_walk ){
-         return;
+   ptr->last_use_time = vg.time;
+   ptr->ref_count ++;
+}
+
+/* after this is called, the calling code only has access to the pointer for the
+ * duration of the rest of the frame */
+VG_STATIC void unwatch_cache_board( struct cache_board *ptr )
+{
+   if( ptr->ref_count == 0 ){
+      vg_fatal_error( "dynamic board unwatch missmatch (no watchers)\n" );
+   }
+
+   ptr->ref_count --;
+}
+
+/*
+ * Callback handler for persona state changes,
+ * it sets the author names on the registries
+ */
+VG_STATIC void callback_persona_statechange( CallbackMsg_t *msg )
+{
+   PersonaStateChange_t *info = (PersonaStateChange_t *)msg->m_pubParam;
+   ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
+
+   if( info->m_nChangeFlags & k_EPersonaChangeName ){
+      for( u32 i=0; i<global_skateshop.registry_count; i++ ){
+         struct registry_board *reg = &global_skateshop.registry[i];
+         if( reg->workshop.author == info->m_ulSteamID ){
+            const char *name = SteamAPI_ISteamFriends_GetFriendPersonaName( 
+                                    hSteamFriends, info->m_ulSteamID );
+            str_utf8_collapse( name, reg->workshop.author_name, 32 );
+         }
       }
-      
-      vg_info( "Entering skateshop\n" );
+   }
+}
 
-      localplayer.immobile = 1;
-      global_skateshop.active = 1;
-      global_skateshop.interface_loc = k_skateshop_loc_page__viewing;
+/*
+ * VG event init
+ */
+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.world_registry = 
+      vg_linear_alloc( vg_mem.rtmemory, wreg_size );
+   global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size );
 
-      v3_zero( localplayer.rb.v );
-      v3_zero( localplayer.rb.w );
-      localplayer._walk.move_speed = 0.0f;
+   memset( global_skateshop.cache, 0, cache_size );
 
-      global_skateshop.ptr_ent = shop;
+   for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
+      struct cache_board *board = &global_skateshop.cache[i];
+      board->state = k_cache_board_state_none;
+      board->registry_id = 0xffffffff;
+      board->last_use_time = -99999.9;
+      board->ref_count = 0;
+   }
+
+   if( steam_ready ){
+      steam_register_callback( k_iPersonaStateChange, 
+                               callback_persona_statechange );
+   }
+}
+
+VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
+{
+   if( global_skateshop.registry_count > 0 ){
+      u32 reg_id = global_skateshop.selected_registry_id;
+      struct registry_board *reg = &global_skateshop.registry[ reg_id ];
+
+      SDL_AtomicLock( &global_skateshop.sl_cache_access );
+      if( reg->cache_ptr && 
+         (reg->cache_ptr->state == k_cache_board_state_loaded ) )
+      {
+         SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+         return reg->cache_ptr;
+      }
+      SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+   }
+
+   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();
+}
 
-      skateshop_request_viewpage(0);
-      skateshop_loader_start( skateshop_scan_for_items );
+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 
+ */
+void temp_update_playermodel(void);
 VG_STATIC void global_skateshop_preupdate(void)
 {
    float rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f );
@@ -366,157 +663,241 @@ 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 */
    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 );
+   m3x3_mulv( localplayer.invbasis, 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 ||
+       shop->type == k_skateshop_type_worldshop ){
+      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]) );
 
    v3_copy( ref->transform.co, localplayer.cam_override_pos );
    localplayer.cam_override_fov = ref->fov;
-
    localplayer.cam_override_strength = global_skateshop.factive;
 
-   if( global_skateshop.interaction_cooldown > 0.0f ){
-      global_skateshop.interaction_cooldown -= vg.time_delta;
-      return;
-   }
-
-   if( global_skateshop.interface_loc <= k_skateshop_loc_page__viewing ){
-
+   /* 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" );
 
-      u32 reg_id = global_skateshop.selected_registry_id;
-      struct board_registry *picker = &global_skateshop.registry[ reg_id ];
+      struct cache_board *selected_cache = skateshop_selected_cache_if_loaded();
 
-      int pick_availible = 0;
-      if( picker->dynamic && 
-            (picker->dynamic->state == k_dynamic_board_state_loaded ) )
-      {
-         pick_availible = 1;
+      if( selected_cache ){
          gui_helper_action( button_display_string( k_srbind_maccept ), "pick" );
       }
-      
-      int moved = 0;
+
+      /*
+       * 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_mright ) ){
-         if( global_skateshop.selected_registry_id < 
-                  global_skateshop.registry_count-1 )
+         if( global_skateshop.selected_registry_id+1 < 
+                  global_skateshop.registry_count )
          {
             global_skateshop.selected_registry_id ++;
-            moved = 1;
          }
       }
 
-      if( moved ){
-         vg_info( "Select registry: %u\n", 
-                  global_skateshop.selected_registry_id );
-         global_skateshop.interaction_cooldown = 0.125f;
-         return;
-      }
-
-      if( pick_availible && button_down( k_srbind_maccept ) ){
-         vg_info( "chose board from skateshop (%u)\n", reg_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_dynamic_board( localplayer.board_view_slot );
-            localplayer.board_view_slot = NULL;
+            unwatch_cache_board( localplayer.board_view_slot );
          }
 
-         localplayer.board_view_slot = picker->dynamic;
-         watch_dynamic_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" );
+
+      if( button_down( k_srbind_mleft ) ){
+         if( cl_playermdl_id > 0 ){
+            cl_playermdl_id --;
+         }
+         else{
+            cl_playermdl_id = 2; /* HACK */
+         }
+         temp_update_playermodel(); /* HACK */
+      }
 
-      if( button_down( k_srbind_mback ) ){
+      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();
-         return;
       }
    }
-}
+   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;
+      }
 
-VG_STATIC void skateshop_init(void)
-{
-   global_skateshop.registry =
-      vg_linear_alloc( vg_mem.rtmemory, 
-                       sizeof(struct board_registry)*MAX_LOCAL_BOARDS );
-   global_skateshop.registry_count = 0;
-   global_skateshop.dynamic_boards =
-      vg_linear_alloc( vg_mem.rtmemory, 
-                       sizeof(struct dynamic_board)*MAX_DYNAMIC_BOARDS );
-
-   memset( global_skateshop.dynamic_boards, 0,
-            sizeof(struct dynamic_board)*MAX_DYNAMIC_BOARDS );
-
-   for( u32 i=0; i<MAX_DYNAMIC_BOARDS; i++ ){
-      struct dynamic_board *board = &global_skateshop.dynamic_boards[i];
-      board->state = k_dynamic_board_state_none;
-      board->registry_id = 0xffffffff;
-      board->last_use_time = -99999.9;
-      board->ref_count = 0;
-   }
+      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;
+            }
+         }
 
-   vg_console_reg_cmd( "use_board", 
-                       skateshop_use_board, skateshop_use_board_suggest );
+         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 );
+   }
 
-   //skateshop_scan_for_items(NULL);
+   if( button_down( k_srbind_mback ) ){
+      global_skateshop_exit();
+      return;
+   }
 }
 
-VG_STATIC void skateshop_render(void)
+VG_STATIC void skateshop_render_boardshop(void)
 {
-   if( !global_skateshop.active ) return;
-      
+   world_instance *world = world_current_instance();
    ent_skateshop *shop = global_skateshop.ptr_ent;
-   world_instance *world = get_active_world();
 
    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 );
+   for( u32 i=0; i<SKATESHOP_VIEW_SLOT_MAX; i++ ){
+      struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
+
+      visibility[i] = 1;
+
+      if( slot->cache_ptr == NULL ) visibility[i] = 0;
+      else if( slot->cache_ptr->state != k_cache_board_state_loaded )
+         visibility[i] = 0;
+   }
+   SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
    
+   /* Render loaded boards in the view slots */
    for( u32 i=0; i<slot_count; i++ ){
       struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
-
       float selected = 0.0f;
-      
-      if( !slot->db ) 
-         goto set_fade_amt;
 
-      if( slot->db->state != k_dynamic_board_state_loaded ) 
-         goto set_fade_amt;
+      if( !visibility[i] ) goto fade_out;
 
       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 );
 
-      if( slot->db->registry_id == global_skateshop.selected_registry_id ){
+      if( slot->cache_ptr->registry_id == 
+          global_skateshop.selected_registry_id ){
          selected = 1.0f;
       }
 
@@ -527,71 +908,243 @@ VG_STATIC void skateshop_render(void)
 
       m4x3f mmdl;
       mdl_transform_m4x3( &xform, mmdl );
-      render_board( &main_camera, world, &slot->db->board, mmdl,
+      render_board( &main_camera, world, &slot->cache_ptr->board, mmdl,
                     k_board_shader_entity );
 
-set_fade_amt:;
+fade_out:;
       float rate = 5.0f*vg.time_delta;
       slot->view_blend = vg_lerpf( slot->view_blend, selected, rate );
    }
 
    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 );
 
+#if 0
    const char *text_title = "Fish - Title";
    const char *text_author = "by Shaniqua";
+#endif
 
    m4x3f mlocal, mmdl;
    m4x3_identity( mlocal );
 
-   /* Skin title
-    * ----------------------------------------------------------------- */
    float scale = 0.2f,
          thickness = 0.03f;
 
+   font3d_bind( &gui.font, &main_camera );
+   shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+
+   /* Selection counter
+    * ------------------------------------------------------------------ */
+   m3x3_zero( mlocal );
+   v3_zero( mlocal[3] );
+   mlocal[0][0] = -scale*2.0f;
+   mlocal[1][2] = -scale*2.0f;
+   mlocal[2][1] = -thickness;
+   mlocal[3][2] = -0.7f;
+   m4x3_mul( mrack, mlocal, mmdl );
+
+   if( global_skateshop.registry_count == 0 ){
+      font3d_simple_draw( &gui.font, 0, 
+                          "Nothing installed", &main_camera, mmdl );
+   }
+   else{
+      char buf[16];
+      int i=0;
+      i+=highscore_intl( buf+i, global_skateshop.selected_registry_id+1, 3 );
+      buf[i++] = '/';
+      i+=highscore_intl( buf+i, global_skateshop.registry_count, 3 );
+      buf[i++] = '\0';
+
+      font3d_simple_draw( &gui.font, 0, buf, &main_camera, mmdl );
+   }
+
+   struct cache_board *cache_ptr = skateshop_selected_cache_if_loaded();
+   if( !cache_ptr ) return;
+
+   struct registry_board *reg = 
+      &global_skateshop.registry[cache_ptr->registry_id];
+   struct workshop_file_info *info = &reg->workshop;
+
+   /* Skin title
+    * ----------------------------------------------------------------- */
+   m3x3_zero( mlocal );
    m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
-   mlocal[3][0] = -font3d_string_width(&world_global.font,0,text_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_bind( &world_global.font, &main_camera );
-
-   shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
-   font3d_simple_draw( &world_global.font, 0, text_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,text_author);
+   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, text_author, &main_camera, mmdl );
+   font3d_simple_draw( &gui.font, 0, info->author_name, &main_camera, mmdl );
+}
 
-   /* Selection counter
-    * ------------------------------------------------------------------ */
-   scale = 0.4f;
+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 );
-   v3_zero( mlocal[3] );
-   mlocal[0][0] = -scale;
-   mlocal[1][2] = -scale;
-   mlocal[2][1] = -thickness;
-   mlocal[3][2] = -0.7f;
-   m4x3_mul( mrack, mlocal, mmdl );
+   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
+ */
+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 if( shop->type == k_skateshop_type_worldshop ){
+      skateshop_render_worldshop();
+   }
+   else{
+      vg_fatal_error( "Unknown store (%u)\n", shop->type );
+   }
+}
+
+/*
+ * Entity logic: entrance event
+ */
+VG_STATIC void ent_skateshop_call( world_instance *world, ent_call *call )
+{
+   u32 index = mdl_entity_id_id( call->id );
+   ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index );
+   vg_info( "skateshop_call\n" );
+
+   if( menu.active ) return;
+   if( skaterift.async_op != k_async_op_none ) return;
+
+   if( call->function == k_ent_function_trigger ){
+      if( localplayer.subsystem != k_player_subsystem_walk ){
+         return;
+      }
+      
+      vg_info( "Entering skateshop\n" );
 
-   char buf[16];
-   int i=0;
-   i+=highscore_intl( buf+i, global_skateshop.selected_registry_id+1, 3 );
-   buf[i++] = '/';
-   i+=highscore_intl( buf+i, global_skateshop.registry_count, 3 );
-   buf[i++] = '\0';
+      localplayer.immobile = 1;
+      menu.disable_open = 1;
+      global_skateshop.active = 1;
 
-   font3d_simple_draw( &world_global.font, 0, buf, &main_camera, mmdl );
+      v3_zero( localplayer.rb.v );
+      v3_zero( localplayer.rb.w );
+      localplayer._walk.move_speed = 0.0f;
+      global_skateshop.ptr_ent = shop;
+      
+      if( shop->type == k_skateshop_type_boardshop ){
+         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();
+      }
+   }
+}
+
+/*
+ * Entity logic: exit event
+ */
+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;
 }
 
 #endif /* ENT_SKATESHOP_C */