X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gui.h;h=8013cb014da3e099f0e8d674a9ea5a2505cba09c;hb=53597f45307d8a2120e3a0bbe71797b216e8750b;hp=e4d0068889de65ee8abc83aa2cc2a1bd7f93c185;hpb=74174e4357c402824302174845f89b975dba5981;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/gui.h b/gui.h
index e4d0068..8013cb0 100644
--- a/gui.h
+++ b/gui.h
@@ -2,6 +2,8 @@
 #define GUI_H
 
 #include "font.h"
+#include "input.h"
+#include "player.h"
 
 struct{
    struct gui_helper{
@@ -15,12 +17,58 @@ struct{
 
    f32 factive;
    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;
 }
 static gui;
 
+VG_STATIC 
+void gui_helper_action( const char *bindstr, const char *text ){
+   if( gui.helper_count >= vg_list_size(gui.helpers) ){
+      vg_error( "Too many helpers\n" );
+      return;
+   }
+
+   struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ];
+   helper->bindstr = bindstr;
+   helper->text = text;
+}
+
 VG_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");
+   }
+
    camera ortho;
 
    float fl = 0.0f,
@@ -42,7 +90,7 @@ void gui_draw(void)
    camera_finalize( &ortho );
 
    gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
-                           vg.time_delta*2.0f );
+                           vg.time_frame_delta*2.0f );
 
    if( gui.factive > 0.01f ){
       /* draw bottom bar */
@@ -56,7 +104,7 @@ void gui_draw(void)
       render_fsquad1();
    }
 
-   f64 loc_t = (vg.time - gui.location_time) / 5.0;
+   f64 loc_t = (vg.time_real - gui.location_time) / 5.0;
    if( (loc_t < 1.0) && (gui.location_time != 0.0) ){
       /* yep this code is a mess, i dont care anymore */
       glEnable(GL_BLEND);
@@ -87,7 +135,8 @@ void gui_draw(void)
 
       font3d_bind( &gui.font, &ortho );
       shader_model_font_uColour( (v4f){1.2f,1.2f,1.2f,o} );
-      font3d_simple_draw( &gui.font, 2, gui.location, &ortho, mmdl );
+      font3d_simple_draw( &gui.font, 2, k_font_shader_default,
+                           gui.location, &ortho, mmdl );
    }
 
    font3d_bind( &gui.font, &ortho );
@@ -109,10 +158,12 @@ void gui_draw(void)
 
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
-      struct font3d_render render;
-      font3d_begin( &gui.font, 2, &ortho, mmdl, &render );
-
-      render.u8pch = (u8*)helper->bindstr;
+      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 );
 
       const char *make_smaller = "\x02\xaf\x03 ";
@@ -129,17 +180,6 @@ void gui_draw(void)
    gui.helper_count = 0;
 }
 
-VG_STATIC 
-void gui_helper_action( const char *bindstr, const char *text )
-{
-   if( gui.helper_count >= vg_list_size(gui.helpers) )
-      vg_fatal_error( "Too many helpers\n" );
-
-   struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ];
-   helper->bindstr = bindstr;
-   helper->text = text;
-}
-
 VG_STATIC
 int gui_location_print_ccmd( int argc, const char *argv[] ){
    if( argc > 0 ){
@@ -152,15 +192,32 @@ int gui_location_print_ccmd( int argc, const char *argv[] ){
       }
       if( !strcmp(gui.location,new_loc) ) return 0;
       vg_strncpy( new_loc, gui.location, 64, k_strncpy_always_add_null );
-      gui.location_time = vg.time;
+      gui.location_time = vg.time_real;
    }
    return 0;
 }
 
+VG_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;
+      else return 1;
+      gui.trick_type = type;
+      v3_copy( localplayer.rb.co, gui.trick_co );
+      return 0;
+   }
+   return 1;
+}
+
 VG_STATIC void gui_init(void)
 {
    font3d_load( &gui.font, "models/rs_font.mdl", vg_mem.rtmemory );
    vg_console_reg_cmd( "gui_location", gui_location_print_ccmd, NULL );
+   vg_console_reg_cmd( "showtrick", gui_showtrick_ccmd, NULL );
 }
 
 #endif /* GUI_H */