st

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 2ec0a5070afb4640cdf97d3fbef2e8178a9c896e..c057ce6ebd71f415b84ddd025a68457b9a511577 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -10,7 +10,8 @@ struct{
    helpers[4];
    u32 helper_count;
 
-   float factive;
+   f32 factive;
+   font3d font;
 }
 static gui;
 
@@ -34,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,
@@ -51,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 +74,7 @@ void gui_draw(void)
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
       struct font3d_render render;
-      font3d_begin( font, 2, &ortho, mmdl, &render );
+      font3d_begin( &gui.font, 2, &ortho, mmdl, &render );
 
       render.u8pch = (u8*)helper->bindstr;
       font3d_draw( &render );
@@ -103,4 +104,9 @@ void gui_helper_action( const char *bindstr, const char *text )
    helper->text = text;
 }
 
+VG_STATIC void gui_init(void)
+{
+   font3d_load( &gui.font, "models/rs_font.mdl", vg_mem.rtmemory );
+}
+
 #endif /* GUI_H */