float scale = 0.2f,
thickness = 0.03f;
- font3d_bind( &gui.font, &skaterift.cam );
+ font3d_bind( &gui.font, k_font_shader_default, 0, world, &skaterift.cam );
shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
/* Selection counter
i+=highscore_intl( buf+i, addon_count(k_addon_type_board), 3 );
buf[i++] = '\0';
- font3d_simple_draw( &gui.font, 0, k_font_shader_default,
- buf, &skaterift.cam, mmdl );
+ font3d_simple_draw( 0, buf, &skaterift.cam, mmdl );
}
else{
- font3d_simple_draw( &gui.font, 0, k_font_shader_default,
- "Nothing installed", &skaterift.cam, mmdl );
+ font3d_simple_draw( 0, "Nothing installed", &skaterift.cam, mmdl );
}
u16 cache_id = skateshop_selected_cache_id();
if( global_skateshop.render.reg_id != global_skateshop.selected_board_id ){
global_skateshop.render.item_title = "";
global_skateshop.render.item_desc = "";
- vg_msg root = {0};
- root.buf = reg->metadata;
- root.len = reg->metadata_len;
- root.max = sizeof(reg->metadata);
-
- vg_msg workshop = root;
- if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
- const char *title = vg_msg_seekkvstr( &workshop, "title", 0 );
+ vg_msg msg;
+ vg_msg_init( &msg, reg->metadata, reg->metadata_len );
+
+ if( vg_msg_seekframe( &msg, "workshop" ) ){
+ const char *title = vg_msg_getkvstr( &msg, "title" );
if( title ) global_skateshop.render.item_title = title;
- const char *dsc = vg_msg_seekkvstr( &workshop, "author", 0 );
+ const char *dsc = vg_msg_getkvstr( &msg, "author" );
if( dsc ) global_skateshop.render.item_desc = dsc;
+ vg_msg_skip_frame( &msg );
}
global_skateshop.render.reg_id = global_skateshop.selected_board_id;
* ----------------------------------------------------------------- */
m3x3_zero( mlocal );
m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0,
- global_skateshop.render.item_title );
+ mlocal[3][0] = -font3d_string_width( 0, global_skateshop.render.item_title );
mlocal[3][0] *= scale*0.5f;
mlocal[3][1] = 0.1f;
mlocal[3][2] = 0.0f;
m4x3_mul( mtext, mlocal, mmdl );
- font3d_simple_draw( &gui.font, 0, k_font_shader_default,
- global_skateshop.render.item_title,
+ font3d_simple_draw( 0, global_skateshop.render.item_title,
&skaterift.cam, mmdl );
/* Author name
* ----------------------------------------------------------------- */
scale *= 0.4f;
m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0,
- global_skateshop.render.item_desc );
+ mlocal[3][0] = -font3d_string_width( 0, global_skateshop.render.item_desc );
mlocal[3][0] *= scale*0.5f;
mlocal[3][1] = 0.0f;
mlocal[3][2] = 0.0f;
m4x3_mul( mtext, mlocal, mmdl );
- font3d_simple_draw( &gui.font, 0, k_font_shader_default,
- global_skateshop.render.item_desc,
+ font3d_simple_draw( 0, global_skateshop.render.item_desc,
&skaterift.cam, mmdl );
SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
addon_reg *reg = get_addon_from_index( k_addon_type_world,
global_skateshop.selected_world_id );
- vg_msg root = {0};
- root.buf = reg->metadata;
- root.len = reg->metadata_len;
- root.max = sizeof(reg->metadata);
- vg_msg workshop = root;
- if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
- global_skateshop.render.world_title = vg_msg_seekkvstr( &workshop,
- "title", 0 );
- }
- global_skateshop.render.world_loc = vg_msg_seekkvstr(&root,"location",0);
+ 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" ) ){
+ global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title");
+ vg_msg_skip_frame( &msg );
+ }
}
/* Text */
m4x3f mtext,mlocal,mtextmdl;
mdl_transform_m4x3( &mark_info->transform, mtext );
- font3d_bind( &gui.font, &skaterift.cam );
+ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &skaterift.cam );
shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
float scale = 0.2f, thickness = 0.015f, scale1 = 0.08f;
m3x3_zero( mlocal );
m3x3_setdiagonalv3( mlocal, (v3f){ scale, scale, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0, buftext );
+ mlocal[3][0] = -font3d_string_width( 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, k_font_shader_default,
- buftext, &skaterift.cam, mtextmdl );
+ font3d_simple_draw( 0, buftext, &skaterift.cam, mtextmdl );
m3x3_setdiagonalv3( mlocal, (v3f){ scale1, scale1, thickness } );
- mlocal[3][0] = -font3d_string_width( &gui.font, 0, bufsubtext );
+ 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( &gui.font, 0, k_font_shader_default,
- bufsubtext, &skaterift.cam, mtextmdl );
+ font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl );
/* pointcloud */
m4x3f mmdl;