X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=b47dacf9be0780707e9ab3a874b42f263da98a79;hb=0310bab3c018e23f5516c3e3c3653b844a8106ed;hp=708e6483e40e9bad3edc4f365dff61b913473220;hpb=ac6288a8951db15eab6c681b8add8f350eb60746;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 708e648..b47dacf 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -1,10 +1,15 @@ #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" /* * Checks string equality but does a hash check first @@ -100,7 +105,7 @@ VG_STATIC void skateshop_update_viewpage(void) /* generic reciever */ VG_STATIC void workshop_async_any_complete( void *data, u32 size ) { - workshop_end_op(); + skaterift_end_op(); } /* @@ -202,6 +207,74 @@ VG_STATIC void workshop_async_reg_update( void *data, u32 size ) global_skateshop.registry_count = global_skateshop.t1_registry_count; } +VG_STATIC void workshop_steam_scan(void) +{ + /* + * 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; jworkshop_id == id ){ + reg->state = k_registry_board_state_indexed; + goto next_file_workshop; + } + } + + if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){ + vg_error( "You have too many boards installed!\n" ); + break; + } + + vg_info( "new listing from the steam workshop!: "PRINTF_U64"\n", id ); + + struct registry_board *reg = &global_skateshop.registry[ + global_skateshop.t1_registry_count ++ ]; + + 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; + + workshop_file_info_clear( ®->workshop ); + strcpy( reg->workshop.title, "Workshop file" ); + + /* load the metadata off the disk */ + vg_async_item *call = + vg_async_alloc( sizeof(struct async_workshop_filepath_info) ); + + 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! */ + + strcat( path, meta_file ); + workshop_load_metadata( path, ®->workshop ); + +next_file_workshop:; + } +} + /* * Async thread which scans local files for boards, as well as scheduling * synchronous calls to the workshop @@ -250,9 +323,13 @@ VG_STATIC void workshop_scan_thread( void *_args ) 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 ); @@ -260,51 +337,7 @@ next_file: tinydir_next( &dir ); tinydir_close(&dir); - /* - * 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; jworkshop_id == id ){ - reg->state = k_registry_board_state_indexed; - goto next_file_workshop; - } - } - - if( global_skateshop.t1_registry_count == SKATESHOP_REGISTRY_MAX ){ - vg_error( "You have too many boards installed!\n" ); - break; - } - - vg_info( "new listing from the steam workshop!: "PRINTF_U64"\n", id ); - - struct registry_board *reg = &global_skateshop.registry[ - global_skateshop.t1_registry_count ++ ]; - - 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; - -next_file_workshop:; - } + if( steam_ready ) workshop_steam_scan(); vg_async_call( workshop_async_reg_update, NULL, 0 ); vg_async_stall(); @@ -316,7 +349,7 @@ next_file_workshop:; */ VG_STATIC void workshop_op_item_scan(void) { - workshop_begin_op( k_workshop_op_item_scan ); + skaterift_begin_op( k_workshop_op_item_scan ); vg_loader_start( workshop_scan_thread, NULL ); } @@ -348,6 +381,27 @@ VG_STATIC void unwatch_cache_board( struct cache_board *ptr ) 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; iworkshop.author == info->m_ulSteamID ){ + const char *name = SteamAPI_ISteamFriends_GetFriendPersonaName( + hSteamFriends, info->m_ulSteamID ); + str_utf8_collapse( name, reg->workshop.author_name, 32 ); + } + } + } +} + /* * VG event init */ @@ -369,6 +423,11 @@ VG_STATIC void skateshop_init(void) 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) @@ -393,6 +452,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 ); @@ -404,18 +464,32 @@ 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 ); + 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]) ); @@ -423,62 +497,102 @@ 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" ); - } + if( selected_cache ){ + gui_helper_action( button_display_string( k_srbind_maccept ), "pick" ); + } - /* - * Controls - * ---------------------- - */ + /* + * Controls + * ---------------------- + */ - if( global_skateshop.interaction_cooldown > 0.0f ){ - global_skateshop.interaction_cooldown -= vg.time_delta; - return; - } + if( button_down( k_srbind_mleft ) ){ + if( global_skateshop.selected_registry_id > 0 ){ + global_skateshop.selected_registry_id --; + } + } - 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+1 < + global_skateshop.registry_count ) + { + 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( 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 ); + } + + 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( moved ){ - vg_info( "Select registry: %u\n", - global_skateshop.selected_registry_id ); - global_skateshop.interaction_cooldown = 0.125f; - return; - } + 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( selected_cache && button_down( k_srbind_maccept ) ){ - vg_info( "chose board from skateshop (%u)\n", - global_skateshop.selected_registry_id ); + 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( localplayer.board_view_slot ){ - unwatch_cache_board( localplayer.board_view_slot ); + if( button_down( k_srbind_maccept ) ){ + global_skateshop_exit(); } + } + else if( shop->type == k_skateshop_type_worldshop ){ + gui_helper_action( axis_display_string( k_sraxis_mbrowse_h ), "browse" ); - localplayer.board_view_slot = selected_cache; - watch_cache_board( localplayer.board_view_slot ); + v2f input; + joystick_state( k_srjoystick_steer, input ); + pointcloud.control[0] += input[0] * vg.time_delta; + pointcloud.control[2] += input[1] * vg.time_delta; - global_skateshop_exit(); - return; + pointcloud.control[0] = vg_clampf( pointcloud.control[0], -10.0f, 10.0f ); + pointcloud.control[2] = vg_clampf( pointcloud.control[2], -10.0f, 10.0f ); + + if( button_press( k_srbind_trick1 ) ){ + pointcloud.control[3] += vg.time_delta*0.2f; + } + if( button_press( k_srbind_trick0 ) ){ + pointcloud.control[3] -= vg.time_delta*0.2f; +} + pointcloud.control[3] = vg_clampf( pointcloud.control[3], 0.001f, 10.0f ); + } + else{ + vg_fatal_error( "Unknown store (%u)\n", shop->type ); } if( button_down( k_srbind_mback ) ){ @@ -487,22 +601,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 ); @@ -551,13 +660,15 @@ 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 ); +#if 0 const char *text_title = "Fish - Title"; const char *text_author = "by Shaniqua"; +#endif m4x3f mlocal, mmdl; m4x3_identity( mlocal ); @@ -596,24 +707,107 @@ fade_out:; 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 = ®->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( &world_global.font, 0, info->title ); mlocal[3][0] *= scale*0.5f; mlocal[3][1] = 0.1f; m4x3_mul( mtext, mlocal, mmdl ); - font3d_simple_draw( &world_global.font, 0, text_title, &main_camera, mmdl ); + font3d_simple_draw( &world_global.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( &world_global.font, 0, + info->author_name ); mlocal[3][0] *= scale*0.5f; mlocal[3][1] = 0.0f; m4x3_mul( mtext, mlocal, mmdl ); - font3d_simple_draw( &world_global.font, 0, text_author, &main_camera, mmdl ); + font3d_simple_draw( &world_global.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 = get_active_world(); + + m4x3f mmdl; + ent_skateshop *shop = global_skateshop.ptr_ent; + ent_marker *mark_display = mdl_arritm( &world->ent_marker, + mdl_entity_id_id(shop->worlds.id_display)); + mdl_transform_m4x3( &mark_display->transform, mmdl ); + + /* TODO? ... */ + v3f vol; + v3_sub( world->scene_geo.bbx[1], world->scene_geo.bbx[0], vol ); + + v2f rect = { 1.0f, 1.0f }, + map = { vol[0], vol[2] }, + result; + + f32 rp = rect[0] * map[1], + rc = rect[1] * map[0]; + + u32 axis, other; + if( rc > rp ) axis = 0; + else axis = 1; + other = axis ^ 0x1; + + result[axis] = rect[axis]; + result[other] = (rect[axis] * map[other]) / map[axis]; + + m4x3f mlocal, mx; + m4x3_identity( mlocal ); + + mlocal[0][0] = result[0]; + mlocal[2][2] = result[1]; + mlocal[1][1] = (vol[1]/vol[0]) * mlocal[0][0]; + mlocal[3][0] = (rect[0]-result[0])*0.5f - rect[0]*0.5f; /* sea level? */ + mlocal[3][2] = (rect[1]-result[1])*0.5f - rect[1]*0.5f; + m4x3_mul( mmdl, mlocal, mx ); + +#if 1 + glEnable(GL_BLEND); + glBlendFunc(GL_ONE, GL_ONE); + glDisable(GL_DEPTH_TEST); +#endif + pointcloud_render( world, &main_camera, mx ); + 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 ); + } } /* @@ -625,6 +819,9 @@ 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( skaterift.async_op != k_async_op_none ) return; + if( call->function == k_ent_function_trigger ){ if( localplayer.subsystem != k_player_subsystem_walk ){ return; @@ -633,6 +830,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 ); @@ -640,8 +838,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(); + } } } @@ -653,6 +853,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; }