enum gui_icon {
k_gui_icon_tick = 0,
+ k_gui_icon_tick_2d,
k_gui_icon_exclaim,
+ k_gui_icon_exclaim_2d,
k_gui_icon_board,
k_gui_icon_world,
k_gui_icon_rift,
+ k_gui_icon_rift_run,
+ k_gui_icon_rift_run_2d,
+ k_gui_icon_friend,
+ k_gui_icon_player,
+ k_gui_icon_rift_run_gold,
+ k_gui_icon_rift_run_silver,
k_gui_icon_count,
};
+#define GUI_HELPER_TEXT_LENGTH 32
+
struct{
struct gui_helper{
- const char *bindstr, *text;
+ vg_input_op *binding;
+ char text[GUI_HELPER_TEXT_LENGTH];
+ int greyed;
}
helpers[4];
u32 helper_count;
+ int active_positional_helper;
+
struct icon_call {
enum gui_icon icon;
v4f location;
+ v4f colour;
+ int colour_changed;
}
icon_draw_buffer[32];
u32 icon_draw_count;
+ v4f cur_icon_colour;
+ int colour_changed;
char location[64];
f64 location_time;
font3d font;
v3f trick_co;
- enum guitrick_type{
- k_guitrick_type_none,
- k_guitrick_type_ollie,
- k_guitrick_type_trick,
- k_guitrick_type_backflip,
- k_guitrick_type_pump,
- k_guitrick_type_isc
- }
- trick_type;
mdl_context model_icons;
GLuint icons_texture;
mdl_submesh *icons[ k_gui_icon_count ];
}
-static gui;
+static gui = {.cur_icon_colour = {1.0f,1.0f,1.0f,1.0f},.colour_changed=1};
+
+static void gui_helper_clear(void){
+ gui.helper_count = 0;
+ gui.active_positional_helper = 0;
+}
-static
-void gui_helper_action( const char *bindstr, const char *text ){
+static struct gui_helper *gui_new_helper( vg_input_op *bind, vg_str *out_text ){
if( gui.helper_count >= vg_list_size(gui.helpers) ){
vg_error( "Too many helpers\n" );
- return;
+ return NULL;
}
struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ];
- helper->bindstr = bindstr;
- helper->text = text;
+ helper->greyed = 0;
+ helper->binding = bind;
+ vg_strnull( out_text, helper->text, sizeof(helper->text) );
+ return helper;
}
-static
-void gui_draw(void)
-{
- if( v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f ){
- gui.trick_type = k_guitrick_type_none;
- }
-
- if( gui.trick_type == k_guitrick_type_pump ){
- gui_helper_action(axis_display_string(k_sraxis_grab),"Crouch");
- }
- else if( gui.trick_type == k_guitrick_type_backflip ){
- gui_helper_action(joystick_display_string(k_srjoystick_steer,1),"Flip");
- }
- else if( gui.trick_type == k_guitrick_type_ollie ){
- gui_helper_action(button_display_string(k_srbind_jump),"Ollie");
- }
- else if( gui.trick_type == k_guitrick_type_trick ){
- gui_helper_action(button_display_string(k_srbind_trick0),"Shuvit");
- gui_helper_action(button_display_string(k_srbind_trick1),"Kickflip");
- gui_helper_action(button_display_string(k_srbind_trick2),"Tre-Flip");
- }
- else if( gui.trick_type == k_guitrick_type_isc ){
- gui_helper_action(button_display_string(k_srbind_camera),"Camera");
- gui_helper_action(button_display_string(k_srbind_use), "Skate/Walk");
- }
+static void gui_draw(void){
+ if( gui.active_positional_helper &&
+ (v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f) )
+ gui_helper_clear();
camera ortho;
camera_finalize( &ortho );
-
-
-
/* icons */
- font3d_bind( &gui.font, &ortho );
+ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho );
+ mesh_bind( &gui.icons_mesh );
+
m4x3f mmdl;
m4x3_identity( mmdl );
shader_model_font_uMdl( mmdl );
- mesh_bind( &gui.icons_mesh );
- shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
glActiveTexture( GL_TEXTURE0 );
glBindTexture( GL_TEXTURE_2D, gui.icons_texture );
shader_model_font_uTexMain( 0 );
for( u32 i=0; i<gui.icon_draw_count; i++ ){
struct icon_call *call = &gui.icon_draw_buffer[i];
+
+ if( call->colour_changed )
+ shader_model_font_uColour( call->colour );
+
shader_model_font_uOffset( call->location );
mdl_submesh *sm = gui.icons[ call->icon ];
-
-
gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
vg.time_frame_delta*2.0f );
v3_zero( mmdl[3] );
f32 pad = dy*0x1p-4f*0.125f;
- f32 w = font3d_string_width( &gui.font,2,gui.location );
+ f32 w = font3d_string_width( 2, gui.location );
mmdl[3][0] = fr*0.5f - w*scale*0.5f;
mmdl[3][1] = 0.3f*ft+pad*2.0f;
- font3d_bind( &gui.font, &ortho );
+ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho );
shader_model_font_uColour( (v4f){1.2f,1.2f,1.2f,o} );
- font3d_simple_draw( &gui.font, 2, k_font_shader_default,
- gui.location, &ortho, mmdl );
+ font3d_simple_draw( 2, gui.location, &ortho, mmdl );
}
-
- font3d_bind( &gui.font, &ortho );
+ else
+ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho );
float dy = ft/0.79f,
scale = dy*0x1p-4f*0.75f;
v3_zero( mmdl[3] );
float pad = dy*0x1p-4f*0.125f;
- mmdl[3][0] = pad*2.0f;
mmdl[3][1] = pad;
for( u32 i=0; i<gui.helper_count; i++ ){
struct gui_helper *helper = &gui.helpers[i];
- shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+ char buf[32];
+ vg_str str;
+ vg_strnull( &str, buf, sizeof(buf) );
+ vg_input_string( &str, helper->binding, 1 );
- struct font3d_render render = {
- .font = &gui.font,
- .variant_id = 2,
- .shader = k_font_shader_default
- };
- font3d_begin( helper->bindstr, &ortho, mmdl, &render );
- font3d_draw( &render );
+ f32 bs = (f32)vg.window_x / (f32)(gui.helper_count+1),
+ x = ((f32)i + 1.0f) * bs;
+ mmdl[3][0] = x - font3d_string_width( 2, buf )*0.5f*scale;
- const char *make_smaller = "\x02\xaf\x03 ";
- render.u8pch = (const u8*)make_smaller;
- font3d_draw( &render );
+ font3d_setcolour( (v4f){1.0f,1.0f,1.0f, helper->greyed? 0.5f: 1.0f} );
+ font3d_simple_draw( 2, buf, &ortho, mmdl );
- render.u8pch = (u8*)helper->text;
- font3d_draw( &render );
+ const char *make_smaller = "\x02\xaf\x03 ";
+ font3d_draw( make_smaller );
+ font3d_draw( helper->text );
- float w = render.offset[0]+1.0f;
- mmdl[3][0] += w*scale;
+ float w = gui_font3d.offset[0]+1.0f;
}
-
- gui.helper_count = 0;
}
-static
-int gui_location_print_ccmd( int argc, const char *argv[] ){
+static int gui_location_print_ccmd( int argc, const char *argv[] ){
if( argc > 0 ){
char new_loc[64];
vg_str str;
static int gui_showtrick_ccmd( int argc, const char *argv[] ){
if( argc == 1 ){
- enum guitrick_type type = k_guitrick_type_none;
- if( !strcmp( argv[0], "pump" ) ) type = k_guitrick_type_pump;
- else if( !strcmp( argv[0], "flip" ) ) type = k_guitrick_type_backflip;
- else if( !strcmp( argv[0], "ollie" ) ) type = k_guitrick_type_ollie;
- else if( !strcmp( argv[0], "trick" ) ) type = k_guitrick_type_trick;
- else if( !strcmp( argv[0], "misc" ) ) type = k_guitrick_type_isc;
+ gui_helper_clear();
+ vg_str text;
+
+ if( !strcmp( argv[0], "pump" ) ){
+ if( gui_new_helper( input_axis_list[k_sraxis_grab], &text ) )
+ vg_strcat( &text, "Pump" );
+ }
+ else if( !strcmp( argv[0], "flip" ) ){
+ if( gui_new_helper( input_joy_list[k_srjoystick_steer], &text ) )
+ vg_strcat( &text, "Flip" );
+ }
+ else if( !strcmp( argv[0], "ollie" ) ){
+ if( gui_new_helper( input_button_list[k_srbind_jump], &text ) )
+ vg_strcat( &text, "Ollie" );
+ }
+ else if( !strcmp( argv[0], "trick" ) ){
+ if( gui_new_helper( input_button_list[k_srbind_trick0], &text ) )
+ vg_strcat( &text, "Shuvit" );
+ if( gui_new_helper( input_button_list[k_srbind_trick1], &text ) )
+ vg_strcat( &text, "Kickflip" );
+ if( gui_new_helper( input_button_list[k_srbind_trick2], &text ) )
+ vg_strcat( &text, "Tre-Flip" );
+ }
+ else if( !strcmp( argv[0], "misc" ) ){
+ if( gui_new_helper( input_button_list[k_srbind_camera], &text ) )
+ vg_strcat( &text, "Camera" );
+ if( gui_new_helper( input_button_list[k_srbind_use], &text ) )
+ vg_strcat( &text, "Skate/Walk" );
+ }
else return 1;
- gui.trick_type = type;
+
v3_copy( localplayer.rb.co, gui.trick_co );
+ gui.active_positional_helper = 1;
return 0;
}
return 1;
call->location[1] = co[1] * (f32)vg.window_y;
call->location[2] = 0.0f;
call->location[3] = size * (f32)vg.window_x;
+
+ v4_copy( gui.cur_icon_colour, call->colour );
+ call->colour_changed = gui.colour_changed;
+ gui.colour_changed = 0;
+}
+
+static void gui_icon_setcolour( v4f colour ){
+ gui.colour_changed = 1;
+ v4_copy( colour, gui.cur_icon_colour );
}
static mdl_submesh *gui_find_icon( const char *name ){
mdl_load_metadata_block( &gui.model_icons, alloc );
gui.icons[ k_gui_icon_tick ] = gui_find_icon( "icon_tick" );
+ gui.icons[ k_gui_icon_tick_2d ] = gui_find_icon( "icon_tick2d" );
gui.icons[ k_gui_icon_exclaim ] = gui_find_icon( "icon_exclaim" );
+ gui.icons[ k_gui_icon_exclaim_2d ] = gui_find_icon( "icon_exclaim2d" );
gui.icons[ k_gui_icon_board ] = gui_find_icon( "icon_board" );
gui.icons[ k_gui_icon_world ] = gui_find_icon( "icon_world" );
gui.icons[ k_gui_icon_rift ] = gui_find_icon( "icon_rift" );
+ gui.icons[ k_gui_icon_rift_run ] = gui_find_icon( "icon_rift_run" );
+ gui.icons[ k_gui_icon_rift_run_2d ] = gui_find_icon( "icon_rift_run2d" );
+ gui.icons[ k_gui_icon_friend ] = gui_find_icon( "icon_friend" );
+ gui.icons[ k_gui_icon_player ] = gui_find_icon( "icon_player" );
+ gui.icons[ k_gui_icon_rift_run_gold ] =
+ gui_find_icon("icon_rift_run_medal_gold");
+ gui.icons[ k_gui_icon_rift_run_silver]=
+ gui_find_icon("icon_rift_run_medal_silver");
vg_linear_clear( vg_mem.scratch );
if( !mdl_arrcount( &gui.model_icons.textures ) )
VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
&gui.icons_texture );
- mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh );
+ mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh, NULL );
mdl_close( &gui.model_icons );
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff