a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / font.h

diff --git a/font.h b/font.h
index 608c71d38c02c4953f37efeede7be00ebb7ed211..fa144c40576a8c5079dc930b04ea12aea2ceb225 100644 (file)
--- a/font.h
+++ b/font.h
@@ -6,6 +6,8 @@
 #include "shaders/scene_font.h"
 #include "world_render.h"
 #include "depth_compare.h"
+#include "vg/vg_tex.h"
+#include <string.h>
 
 enum efont_SRglyph{
    k_SRglyph_end           = 0x00, /* control characters */
@@ -56,11 +58,14 @@ enum efont_SRglyph{
    k_SRglyph_kbm_return    = 0xa2,
    k_SRglyph_kbm_escape    = 0xa3,
    k_SRglyph_kbm_mousemove = 0xa4,
+
+#if 0
    k_SRglyph_vg_ret        = 0xa5,
    k_SRglyph_vg_link       = 0xa6,
    k_SRglyph_vg_square     = 0xa7,
    k_SRglyph_vg_triangle   = 0xa8,
    k_SRglyph_vg_circle     = 0xa9
+#endif
 };
 
 typedef struct font3d font3d;
@@ -161,13 +166,13 @@ static void font3d_bind( font3d *font, enum font_shader shader,
       shader_scene_font_uTexGarbage(0);
       shader_scene_font_uTexMain(1);
 
-      shader_scene_font_uPv( skaterift.cam.mtx.pv );
+      shader_scene_font_uPv( g_render.cam.mtx.pv );
       shader_scene_font_uTime( vg.time );
 
       WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( world, scene_font );
 
       bind_terrain_noise();
-      shader_scene_font_uCamera( skaterift.cam.transform[3] );
+      shader_scene_font_uCamera( g_render.cam.transform[3] );
    }
    mesh_bind( &font->mesh );
 }