#include "player.h"
#include "gui.h"
#include "menu.h"
-#include "pointcloud.h"
#include "highscores.h"
#include "steam.h"
#include "addon.h"
}
static u16 skateshop_selected_cache_id(void){
- if( addon_count(k_addon_type_board) ){
- addon_reg *reg = get_addon_from_index(k_addon_type_board,
- global_skateshop.selected_board_id);
+ if( addon_count(k_addon_type_board, ADDON_REG_HIDDEN) ){
+ addon_reg *reg = get_addon_from_index(
+ k_addon_type_board, global_skateshop.selected_board_id,
+ ADDON_REG_HIDDEN );
return reg->cache_id;
}
else return 0;
}
-static void pointcloud_async_end(void *_, u32 __)
-{
- pointcloud_animate( k_pointcloud_anim_opening );
-}
-
-static void pointcloud_clear_async(void *_, u32 __)
-{
- pointcloud.count = 0;
- pointcloud_animate( k_pointcloud_anim_opening );
-}
-
-static void skateshop_world_preview_loader_thread( void *_data )
-{
- addon_reg *reg = _data;
-
- char path_buf[4096];
- vg_str path;
- vg_strnull( &path, path_buf, 4096 );
- addon_get_content_folder( reg, &path );
- 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 );
- }
-}
-
-static void skateshop_world_preview_loader_thread_and_end( void *_data ){
- skateshop_world_preview_loader_thread( _data );
-}
-
-static void skateshop_load_world_preview( addon_reg *reg ){
- vg_loader_start( skateshop_world_preview_loader_thread_and_end, reg );
-}
-
/*
* VG event preupdate
*/
v3f dir = {0.0f,-1.0f,0.0f};
mdl_transform_vector( &ref->transform, dir, dir );
- m3x3_mulv( localplayer.invbasis, dir, dir );
- player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f );
+ v3_angles( dir, world_static.focus_cam.angles );
v3f lookat;
if( shop->type == k_skateshop_type_boardshop ||
}
}
+ u32 valid_count = addon_count( k_addon_type_board, 0 );
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_board_id+1 <
- addon_count(k_addon_type_board) )
- {
+ if( global_skateshop.selected_board_id+1 < valid_count ){
global_skateshop.selected_board_id ++;
}
}
if( opage != npage ){
skateshop_update_viewpage();
- //skateshop_op_processview();
}
else if( cache_id && button_down( k_srbind_maccept )){
vg_info( "chose board from skateshop (%u)\n",
if( !vg_loader_availible() ) return;
int changed = 0;
+ u32 valid_count = addon_count( k_addon_type_player, ADDON_REG_HIDDEN );
if( button_down( k_srbind_mleft ) ){
if( global_skateshop.selected_player_id > 0 ){
global_skateshop.selected_player_id --;
}
else{
- global_skateshop.selected_player_id =
- addon_count(k_addon_type_player) -1;
+ global_skateshop.selected_player_id = valid_count-1;
}
changed = 1;
}
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_player_id+1 <
- addon_count(k_addon_type_player) ){
+ if( global_skateshop.selected_player_id+1 < valid_count ){
global_skateshop.selected_player_id ++;
}
else{
}
if( changed ){
- player__use_model( global_skateshop.selected_player_id );
- //skateshop_op_processview();
+ addon_reg *addon = get_addon_from_index(
+ k_addon_type_player, global_skateshop.selected_player_id,
+ ADDON_REG_HIDDEN );
+
+ u32 real_id = get_index_from_addon(
+ k_addon_type_player, addon );
+
+ player__use_model( real_id );
}
if( button_down( k_srbind_maccept ) ){
int browseable = 0,
loadable = 0;
- if( addon_count(k_addon_type_world) && vg_loader_availible() )
+ u32 valid_count = addon_count( k_addon_type_world, ADDON_REG_HIDDEN );
+
+ if( valid_count && vg_loader_availible() )
browseable = 1;
- if( vg_loader_availible() && global_skateshop.selected_world_id > 0 )
+ if( vg_loader_availible() )
loadable = 1;
global_skateshop.helper_browse->greyed = !browseable;
}
if( button_down( k_srbind_mright ) ){
- if( global_skateshop.selected_world_id+1 <
- addon_count(k_addon_type_world) )
- {
+ if( global_skateshop.selected_world_id+1 < valid_count ){
global_skateshop.selected_world_id ++;
change = 1;
}
}
}
-
- if( change && pointcloud_idle() ){
- pointcloud_animate( k_pointcloud_anim_hiding );
- }
- if( vg_loader_availible() ){
- addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_id );
-
- /* automatically load in clouds */
- if( loadable && button_down( k_srbind_maccept ) ){
- vg_info( "Select rift (%u)\n",
- global_skateshop.selected_world_id );
- skaterift_change_world_start( reg );
- 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( reg );
- }
- 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 );
- }
- }
+ if( loadable ){
+ if( button_down( k_srbind_maccept ) ){
+ skaterift_change_world_start(
+ get_addon_from_index( k_addon_type_world,
+ global_skateshop.selected_world_id,
+ ADDON_REG_HIDDEN ));
}
}
}
mlocal[3][2] = -0.7f;
m4x3_mul( mrack, mlocal, mmdl );
- if( addon_count(k_addon_type_board) ){
+ u32 valid_count = addon_count(k_addon_type_board,0);
+ if( valid_count ){
char buf[16];
- int i=0;
- i+=highscore_intl( buf+i, global_skateshop.selected_board_id+1, 3 );
- buf[i++] = '/';
- i+=highscore_intl( buf+i, addon_count(k_addon_type_board), 3 );
- buf[i++] = '\0';
-
+ vg_str str;
+ vg_strnull( &str, buf, sizeof(buf) );
+ 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 );
}
else{
mdl_entity_id_id(shop->boards.id_info));
if( global_skateshop.render.world_reg != global_skateshop.selected_world_id){
- global_skateshop.render.world_title = "";
+ global_skateshop.render.world_title = "missing: workshop.title";
addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_id );
+ global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
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;
global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title");
vg_msg_skip_frame( &msg );
}
+ else {
+ vg_warn( "No workshop body\n" );
+ }
}
/* Text */
vg_strnull( &info, buftext, 128 );
vg_strnull( &subtext, bufsubtext, 128 );
- if( addon_count(k_addon_type_world) ){
- addon_reg *reg = get_addon_from_index( k_addon_type_world,
- 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,
- addon_count(k_addon_type_world), 3 );
- info.buffer[info.i++] = ' ';
- info.buffer[info.i] = '\0';
-
+ u32 valid_count = addon_count(k_addon_type_world,ADDON_REG_HIDDEN);
+ 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() ){
vg_strcat( &subtext, "Loading..." );
}
else{
addon_reg *reg = get_addon_from_index( k_addon_type_world,
- global_skateshop.selected_world_id );
+ global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
if( reg->alias.workshop_id )
vg_strcat( &subtext, "(Workshop) " );
}
}
else{
- vg_strcat( &info, "No worlds installed" );
+ vg_strcat( &info, "No workshop worlds installed" );
}
-
m4x3f mtext,mlocal,mtextmdl;
mdl_transform_m4x3( &mark_info->transform, mtext );
m4x3_mul( mtext, mlocal, mtextmdl );
font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl );
+#if 0
/* pointcloud */
m4x3f mmdl;
mdl_transform_m4x3( &mark_display->transform, mmdl );
pointcloud_render( world, &skaterift.cam, mmdl );
glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
+#endif
}
/*
}
else if( shop->type == k_skateshop_type_worldshop ){
ent_skateshop_helpers_pickable( "open rift" );
- pointcloud_animate( k_pointcloud_anim_opening );
skateshop_op_world_scan();
}
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff