X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=f2b4a176448c1e64b589e0093bb223bf4b4a4bb8;hb=0ba0bbe2da453f17f56a88521057e6514ae30b8f;hp=85a0fa48b5fda101d32380f03790b9ca3c3532df;hpb=03a46e5a504cfb2f8bef7254a66753f04540005f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 85a0fa4..f2b4a17 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -1,10 +1,8 @@
-#ifndef ENT_SKATESHOP_C
-#define ENT_SKATESHOP_C
-
-#define VG_GAME
-#include "vg/vg.h"
 #include "vg/vg_steam_ugc.h"
 #include "vg/vg_msg.h"
+#include "vg/vg_tex.h"
+#include "vg/vg_image.h"
+#include "vg/vg_loader.h"
 #include "ent_skateshop.h"
 #include "world.h"
 #include "player.h"
@@ -15,6 +13,11 @@
 #include "save.h"
 #include "network.h"
 
+struct global_skateshop global_skateshop = 
+{
+   .render={.reg_id=0xffffffff,.world_reg=0xffffffff}
+};
+
 /*
  * Checks string equality but does a hash check first
  */
@@ -71,7 +74,8 @@ static void skateshop_async_preview_imageload( void *data, u32 len ){
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 }
 
-static void skateshop_update_preview_image_thread(void *_args){
+static void skateshop_update_preview_image_thread(void *_args)
+{
    char path_buf[4096];
    vg_str folder;
    vg_strnull( &folder, path_buf, sizeof(path_buf) );
@@ -80,7 +84,8 @@ static void skateshop_update_preview_image_thread(void *_args){
    addon_reg *reg_preview = global_skateshop.reg_preview;
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 
-   if( !addon_get_content_folder( reg_preview, &folder, 1 ) ){
+   if( !addon_get_content_folder( reg_preview, &folder, 1 ) )
+   {
       SDL_AtomicLock( &addon_system.sl_cache_using_resources );
       global_skateshop.reg_loaded_preview = reg_preview;
       SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
@@ -94,13 +99,16 @@ static void skateshop_update_preview_image_thread(void *_args){
 
    inf->reg = reg_preview;
 
-   if( vg_strgood( &folder ) ){
+   if( vg_strgood( &folder ) )
+   {
       stbi_set_flip_vertically_on_load(1);
       int x, y, nc;
       inf->data = stbi_load( folder.buffer, &x, &y, &nc, 3 );
 
-      if( inf->data ){
-         if( (x != WORKSHOP_PREVIEW_WIDTH) || (y != WORKSHOP_PREVIEW_HEIGHT) ){
+      if( inf->data )
+      {
+         if( (x != WORKSHOP_PREVIEW_WIDTH) || (y != WORKSHOP_PREVIEW_HEIGHT) )
+         {
             vg_error( "Resolution does not match framebuffer, so we can't"
                       " show it\n" );
             stbi_image_free( inf->data );
@@ -110,69 +118,36 @@ static void skateshop_update_preview_image_thread(void *_args){
 
       vg_async_dispatch( call, skateshop_async_preview_imageload );
    }
-}
-
-/*
- * op/subroutine: k_workshop_op_item_load
- * -----------------------------------------------------------------------------
- */
-
-static void world_scan_thread( void *_args ){
-   addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
-   addon_mount_workshop_items();
-   vg_async_call( async_addon_reg_update, NULL, 0 );
-}
-
-/*
- * Asynchronous scan of local disk for worlds
- */
-static void skateshop_op_world_scan(void){
-   vg_loader_start( world_scan_thread, NULL );
-}
-
-static void board_processview_thread( void *_args ){
-   addon_cache_load_loop();
-}
-
-static void board_scan_thread( void *_args ){
-   addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
-   addon_mount_workshop_items();
-   vg_async_call( async_addon_reg_update, NULL, 0 );
-   vg_async_stall();
-   board_processview_thread(NULL);
-}
-
-/* TODO: migrate to addon.c */
-static void skateshop_op_board_scan(void){
-   vg_loader_start( board_scan_thread, NULL );
-}
-
-/* TODO: migrate to addon.c */
-static void skateshop_autostart_loading(void){
-   if( !vg_loader_availible() ) return;
+   else
+   {
+      vg_error( "Path too long to workshop preview image.\n" );
 
-   SDL_AtomicLock( &addon_system.sl_cache_using_resources );
-   if( global_skateshop.reg_preview != global_skateshop.reg_loaded_preview ){
+      SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+      global_skateshop.reg_loaded_preview = reg_preview;
       SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
-      vg_loader_start( skateshop_update_preview_image_thread, NULL );
-      return;
    }
+}
 
-   for( u32 type=0; type<k_addon_type_max; type++ ){
-      struct addon_cache *cache = &addon_system.cache[type];
-
-      for( u32 id=1; id<=cache->pool.count; id++ ){
-         addon_cache_entry *entry = vg_pool_item( &cache->pool, id );
-         if( entry->state == k_addon_cache_state_load_request ){
-            SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
-            vg_loader_start( board_processview_thread, NULL );
-            return;
-         }
+void skateshop_world_preview_preupdate(void)
+{
+   /* try to load preview image if we availible to do. */
+   if( vg_loader_availible() )
+   {
+      SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+      if( global_skateshop.reg_preview != global_skateshop.reg_loaded_preview )
+      {
+         SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
+         vg_loader_start( skateshop_update_preview_image_thread, NULL );
       }
+      else SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
    }
-   SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 }
 
+/*
+ * op/subroutine: k_workshop_op_item_load
+ * -----------------------------------------------------------------------------
+ */
+
 /*
  * Regular stuff
  * -----------------------------------------------------------------------------
@@ -199,7 +174,8 @@ static void skateshop_init_async(void *_data,u32 size){
 /*
  * VG event init
  */
-static void skateshop_init(void){
+void skateshop_init(void)
+{
    vg_async_call( skateshop_init_async, NULL, 0 );
 }
 
@@ -233,11 +209,13 @@ static void skateshop_server_helper_update(void){
  * VG event preupdate 
  */
 void temp_update_playermodel(void);
-static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
-   if( !active ) return;
+void ent_skateshop_preupdate( ent_focus_context *ctx )
+{
+   if( !ctx->active ) 
+      return;
 
-   /* input filter */
-   world_instance *world = world_current_instance();
+   world_instance *world = ctx->world;
+   ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, ctx->index );
 
    /* camera positioning */
    ent_camera *ref = mdl_arritm( &world->ent_camera, 
@@ -311,7 +289,8 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
          localplayer.board_view_slot = cache_id;
          network_send_item( k_netmsg_playeritem_board );
 
-         world_entity_unfocus();
+         world_entity_exit_modal();
+         world_entity_clear_focus();
          gui_helper_clear();
          skaterift_autosave(1);
          return;
@@ -358,7 +337,8 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
 
       if( button_down( k_srbind_maccept ) ){
          network_send_item( k_netmsg_playeritem_player );
-         world_entity_unfocus();
+         world_entity_exit_modal();
+         world_entity_clear_focus();
          gui_helper_clear();
       }
    }
@@ -431,17 +411,20 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
       vg_fatal_error( "Unknown store (%u)\n", shop->type );
    }
 
-   if( button_down( k_srbind_mback ) ){
+   if( button_down( k_srbind_mback ) )
+   {
       if( shop->type == k_skateshop_type_charshop )
          network_send_item( k_netmsg_playeritem_player );
 
-      world_entity_unfocus();
+      world_entity_exit_modal();
+      world_entity_clear_focus();
       gui_helper_clear();
       return;
    }
 }
 
-static void skateshop_world_preupdate( world_instance *world ){
+void skateshop_world_preupdate( world_instance *world )
+{
    for( u32 i=0; i<mdl_arrcount(&world->ent_skateshop); i++ ){
       ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, i );
 
@@ -507,7 +490,7 @@ static void skateshop_render_boardshop( ent_skateshop *shop ){
       struct player_board_pose pose = {0};
       m4x3f mmdl;
       mdl_transform_m4x3( &xform, mmdl );
-      render_board( &skaterift.cam, world, board, mmdl, 
+      render_board( &g_render.cam, world, board, mmdl, 
                     &pose, k_board_shader_entity );
 
 fade_out:;
@@ -527,7 +510,7 @@ fade_out:;
    float scale = 0.2f,
          thickness = 0.03f;
 
-   font3d_bind( &gui.font, k_font_shader_default, 0, world, &skaterift.cam );
+   font3d_bind( &gui.font, k_font_shader_default, 0, world, &g_render.cam );
    shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
    /* Selection counter
@@ -548,10 +531,10 @@ fade_out:;
       vg_strcati32( &str, global_skateshop.selected_board_id+1 );
       vg_strcatch( &str, '/' );
       vg_strcati32( &str, valid_count );
-      font3d_simple_draw( 0, buf, &skaterift.cam, mmdl );
+      font3d_simple_draw( 0, buf, &g_render.cam, mmdl );
    }
    else{
-      font3d_simple_draw( 0, "Nothing installed", &skaterift.cam, mmdl );
+      font3d_simple_draw( 0, "Nothing installed", &g_render.cam, mmdl );
    }
 
    u16 cache_id = skateshop_selected_cache_id();
@@ -595,7 +578,7 @@ fade_out:;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
    font3d_simple_draw( 0, global_skateshop.render.item_title, 
-                       &skaterift.cam, mmdl );
+                       &g_render.cam, mmdl );
 
    /* Author name
     * ----------------------------------------------------------------- */
@@ -607,7 +590,7 @@ fade_out:;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mmdl );
    font3d_simple_draw( 0, global_skateshop.render.item_desc, 
-                       &skaterift.cam, mmdl );
+                       &g_render.cam, mmdl );
 
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 }
@@ -632,14 +615,16 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){
       if( !reg ) 
          goto none;
 
-      if( reg->alias.workshop_id ){
+      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" ) ){
+         if( vg_msg_seekframe( &msg, "workshop" ) )
+         {
             global_skateshop.render.world_title = vg_msg_getkvstr(&msg,"title");
             vg_msg_skip_frame( &msg );
          }
@@ -661,17 +646,20 @@ none:;
    vg_strnull( &subtext, bufsubtext, 128 );
    
    u32 valid_count = addon_count(k_addon_type_world,ADDON_REG_HIDDEN);
-   if( valid_count ){
+   if( valid_count )
+   {
       vg_strcati32( &info, global_skateshop.selected_world_id+1 );
       vg_strcatch( &info, '/' );
       vg_strcati32( &info, valid_count );
       vg_strcatch( &info, ' ' );
       vg_strcat( &info, global_skateshop.render.world_title );
 
-      if( !vg_loader_availible() ){
+      if( !vg_loader_availible() )
+      {
          vg_strcat( &subtext, "Loading..." );
       }
-      else{
+      else
+      {
          addon_reg *reg = get_addon_from_index( k_addon_type_world,
                      global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
 
@@ -681,14 +669,15 @@ none:;
          vg_strcat( &subtext, global_skateshop.render.world_loc );
       }
    }
-   else{
+   else
+   {
       vg_strcat( &info, "No workshop worlds installed" );
    }
 
    m4x3f mtext,mlocal,mtextmdl;
    mdl_transform_m4x3( &mark_info->transform, mtext );
 
-   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &skaterift.cam );
+   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &g_render.cam );
    shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
    float scale = 0.2f, thickness = 0.015f, scale1 = 0.08f;
@@ -699,20 +688,21 @@ none:;
    mlocal[3][1] = 0.1f;
    mlocal[3][2] = 0.0f;
    m4x3_mul( mtext, mlocal, mtextmdl );
-   font3d_simple_draw( 0, buftext, &skaterift.cam, mtextmdl );
+   font3d_simple_draw( 0, buftext, &g_render.cam, mtextmdl );
 
    m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } );
    mlocal[3][0] = -font3d_string_width( 0, bufsubtext );
    mlocal[3][0] *= scale1*0.5f;
    mlocal[3][1] = -scale1*0.3f;
    m4x3_mul( mtext, mlocal, mtextmdl );
-   font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl );
+   font3d_simple_draw( 0, bufsubtext, &g_render.cam, mtextmdl );
 }
 
 /*
  * World: render event
  */
-static void skateshop_render( ent_skateshop *shop ){
+void skateshop_render( ent_skateshop *shop )
+{
    if( shop->type == k_skateshop_type_boardshop )
       skateshop_render_boardshop( shop );
    else if( shop->type == k_skateshop_type_charshop )
@@ -725,8 +715,10 @@ 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 ++ ){
+void skateshop_render_nonfocused( world_instance *world, vg_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;
@@ -742,7 +734,8 @@ static void skateshop_render_nonfocused( world_instance *world, camera *cam ){
          continue;
 
       u32 slot_count = vg_list_size(global_skateshop.shop_view_slots);
-      for( u32 i=0; i<slot_count; i++ ){
+      for( u32 i=0; i<slot_count; i++ )
+      {
          struct player_board *board = &localplayer.fallback_board;
 
          mdl_transform xform;
@@ -759,11 +752,12 @@ static void skateshop_render_nonfocused( world_instance *world, camera *cam ){
    }
 }
 
-static void ent_skateshop_helpers_pickable( const char *acceptance ){
+static void ent_skateshop_helpers_pickable( const char *acceptance )
+{
    vg_str text;
 
    if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
-      vg_strcat( &text, "exit" );
+      vg_strcat( &text, "Exit" );
 
    if( (global_skateshop.helper_pick = gui_new_helper(
                input_button_list[k_srbind_maccept], &text))){
@@ -772,42 +766,76 @@ static void ent_skateshop_helpers_pickable( const char *acceptance ){
 
    if( (global_skateshop.helper_browse = gui_new_helper( 
                input_axis_list[k_sraxis_mbrowse_h], &text ))){
-      vg_strcat( &text, "browse" );
+      vg_strcat( &text, "Browse" );
    }
 }
 
+static void board_scan_thread( void *_args )
+{
+   addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
+   addon_mount_workshop_items();
+   vg_async_call( async_addon_reg_update, NULL, 0 );
+   vg_async_stall();
+
+   /* 04.03.24
+    * REVIEW: This is removed as it *should* be done on the preupdate of the 
+    *         addon system.
+    *
+    *         Verify that it works the same.
+    */
+#if 0
+   board_processview_thread(NULL);
+#endif
+}
+
+static void world_scan_thread( void *_args )
+{
+   addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
+   addon_mount_workshop_items();
+   vg_async_call( async_addon_reg_update, NULL, 0 );
+}
+
 /*
  * Entity logic: entrance event
  */
-static void ent_skateshop_call( world_instance *world, ent_call *call ){
+entity_call_result 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( skaterift.activity != k_skaterift_default ) return;
-   if( !vg_loader_availible() ) return;
+   if( (skaterift.activity != k_skaterift_default) || 
+       !vg_loader_availible() ) 
+      return k_entity_call_result_invalid;
 
-   if( call->function == k_ent_function_trigger ){
-      if( localplayer.subsystem != k_player_subsystem_walk ) return;
+   if( call->function == k_ent_function_trigger )
+   {
+      if( localplayer.subsystem != k_player_subsystem_walk )
+         return k_entity_call_result_OK;
       
       vg_info( "Entering skateshop\n" );
 
-      world_entity_focus( call->id );
+      world_entity_set_focus( call->id );
+      world_entity_focus_modal();
       gui_helper_clear();
       
-      if( shop->type == k_skateshop_type_boardshop ){
+      if( shop->type == k_skateshop_type_boardshop )
+      {
          skateshop_update_viewpage();
-         skateshop_op_board_scan();
-         ent_skateshop_helpers_pickable( "pick" );
+         vg_loader_start( board_scan_thread, NULL );
+         ent_skateshop_helpers_pickable( "Pick" );
       }
-      else if( shop->type == k_skateshop_type_charshop ){
-         ent_skateshop_helpers_pickable( "pick" );
+      else if( shop->type == k_skateshop_type_charshop )
+      {
+         ent_skateshop_helpers_pickable( "Pick" );
       }
-      else if( shop->type == k_skateshop_type_worldshop ){
-         ent_skateshop_helpers_pickable( "open rift" );
-         skateshop_op_world_scan();
+      else if( shop->type == k_skateshop_type_worldshop )
+      {
+         ent_skateshop_helpers_pickable( "Open rift" );
+         vg_loader_start( world_scan_thread, NULL );
       }
-      else if( shop->type == k_skateshop_type_server ){
+      else if( shop->type == k_skateshop_type_server )
+      {
          vg_str text;
          global_skateshop.helper_pick = gui_new_helper(
                      input_button_list[k_srbind_maccept], &text);
@@ -815,7 +843,8 @@ static void ent_skateshop_call( world_instance *world, ent_call *call ){
             vg_strcat( &text, "exit" );
          skateshop_server_helper_update();
       }
+      return k_entity_call_result_OK;
    }
+   else
+      return k_entity_call_result_unhandled;
 }
-
-#endif /* ENT_SKATESHOP_C */