update helpers

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 7c2dbb6e5f34e5ee0c795338a18650744881c9a8..30664d8a00bb7b8905e92dc0fd10a04bf0af33cf 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -17,13 +17,19 @@ enum gui_icon {
    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;
@@ -42,15 +48,6 @@ struct{
    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;
@@ -60,41 +57,28 @@ struct{
 }
 static gui = {.cur_icon_colour = {1.0f,1.0f,1.0f,1.0f},.colour_changed=1};
 
-static 
-void gui_helper_action( const char *bindstr, const char *text ){
+static void gui_helper_clear(void){
+   gui.helper_count = 0;
+   gui.active_positional_helper = 0;
+}
+
+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");
-   }
+   if( gui.active_positional_helper && 
+         (v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f) )
+      gui_helper_clear();
 
    camera ortho;
 
@@ -210,8 +194,13 @@ static void gui_draw(void){
    for( u32 i=0; i<gui.helper_count; i++ ){
       struct gui_helper *helper = &gui.helpers[i];
 
-      font3d_setcolour( (v4f){1.0f,1.0f,1.0f,1.0f} );
-      font3d_simple_draw( 2, helper->bindstr, &ortho, mmdl );
+      char buf[32];
+      vg_str str;
+      vg_strnull( &str, buf, sizeof(buf) );
+      vg_input_string( &str, helper->binding, 1 );
+
+      font3d_setcolour( (v4f){1.0f,1.0f,1.0f, helper->greyed? 0.5f: 1.0f} );
+      font3d_simple_draw( 2, buf, &ortho, mmdl );
 
       const char *make_smaller = "\x02\xaf\x03 ";
       font3d_draw( make_smaller );
@@ -220,8 +209,6 @@ static void gui_draw(void){
       float w = gui_font3d.offset[0]+1.0f;
       mmdl[3][0] += w*scale;
    }
-
-   gui.helper_count = 0;
 }
 
 static int gui_location_print_ccmd( int argc, const char *argv[] ){
@@ -242,15 +229,39 @@ static int gui_location_print_ccmd( int argc, const char *argv[] ){
 
 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;