fix long standing grind bug

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 8cb94f1200fc0615b07f02ae72163aeff6644b09..c057ce6ebd71f415b84ddd025a68457b9a511577 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -5,13 +5,13 @@
 
 struct{
    struct gui_helper{
-      struct input_binding *bind;
-      const char *text;
+      const char *bindstr, *text;
    }
    helpers[4];
    u32 helper_count;
 
-   float factive;
+   f32 factive;
+   font3d font;
 }
 static gui;
 
@@ -35,6 +35,7 @@ void gui_draw(void)
    ortho.mtx.p[3][3] = 1.0f;
    m4x3_identity( ortho.transform );
    camera_update_view( &ortho );
+   m4x4_mul( ortho.mtx.p, ortho.mtx.v, ortho.mtx.pv );   /* HACK */
    camera_finalize( &ortho );
 
    gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
@@ -52,8 +53,7 @@ void gui_draw(void)
       render_fsquad1();
    }
 
-   font3d *font = &world_global.font;
-   font3d_bind( font, &ortho );
+   font3d_bind( &gui.font, &ortho );
 
    float dy    = ft/0.79f,
          scale = dy*0x1p-4f*0.75f;
@@ -73,7 +73,20 @@ void gui_draw(void)
 
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
-      float w = font3d_simple_draw( font, 2, helper->text, &ortho, mmdl )+1.0f;
+      struct font3d_render render;
+      font3d_begin( &gui.font, 2, &ortho, mmdl, &render );
+
+      render.u8pch = (u8*)helper->bindstr;
+      font3d_draw( &render );
+
+      const char *make_smaller = "\x02\xaf\x03 ";
+      render.u8pch = (const u8*)make_smaller;
+      font3d_draw( &render );
+
+      render.u8pch = (u8*)helper->text;
+      font3d_draw( &render );
+      
+      float w = render.offset[0]+1.0f;
       mmdl[3][0] += w*scale;
    }
 
@@ -81,14 +94,19 @@ void gui_draw(void)
 }
 
 VG_STATIC 
-void gui_helper_action( void *bind, const char *text )
+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->bind = bind;
+   helper->bindstr = bindstr;
    helper->text = text;
 }
 
+VG_STATIC void gui_init(void)
+{
+   font3d_load( &gui.font, "models/rs_font.mdl", vg_mem.rtmemory );
+}
+
 #endif /* GUI_H */