X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=font.h;h=4361e934795fc881bc71e886d86139bb013a66a7;hb=99376ce8eaf30125fb08dd5dc8b534800580fe47;hp=b1185f9e6800b1855dfb9474a2163deed635864b;hpb=223e75026f958029f9664380ed20a5daa3ee2ae7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/font.h b/font.h
index b1185f9..4361e93 100644
--- a/font.h
+++ b/font.h
@@ -5,7 +5,7 @@
 #include "entity.h"
 #include "camera.h"
 #include "shaders/model_font.h"
-
+#include "shaders/scene_font.h"
 
 enum efont_SRglyph{
    k_SRglyph_end           = 0x00, /* control characters */
@@ -102,6 +102,7 @@ VG_STATIC void font3d_load( font3d *font, const char *mdl_path, void *alloc )
 VG_STATIC void font3d_init(void)
 {
    shader_model_font_register();
+   shader_scene_font_register();
 }
 
 VG_STATIC u32 font3d_find_variant( font3d *font, const char *name )
@@ -145,23 +146,41 @@ struct font3d_render{
    font3d *font;
    const u8 *u8pch;
    u32 variant_id;
+
+   enum font_shader {
+      k_font_shader_default,
+      k_font_shader_world
+   }
+   shader;
 };
 
 VG_STATIC 
-void font3d_begin( font3d *font, u32 variant_id, 
-                    camera *cam, m4x3f transform, struct font3d_render *render )
+void font3d_begin( const char *text,
+                   camera *cam, m4x3f transform, struct font3d_render *render )
 {
-   q_identity( render->offset );
+   v4_copy( (v4f){0.0f,0.0f,0.0f,1.0f}, render->offset );
 
    m4x4f prev_mtx;
    m4x3_expand( transform, prev_mtx );
    m4x4_mul( cam->mtx_prev.pv, prev_mtx, prev_mtx );
 
-   shader_model_font_uPvmPrev( prev_mtx );
-   shader_model_font_uMdl( transform );
+   if( render->shader == k_font_shader_default ){
+      shader_model_font_uPvmPrev( prev_mtx );
+      shader_model_font_uMdl( transform );
+   }
+   else if( render->shader == k_font_shader_world ){
+      shader_scene_font_uPvmPrev( prev_mtx );
+      shader_scene_font_uMdl( transform );
+   }
 
-   render->font = font;
-   render->variant_id = variant_id;
+   render->u8pch = (u8*)text;
+}
+
+VG_STATIC void font3d_setoffset( struct font3d_render *render, v4f offset ){
+   if( render->shader == k_font_shader_default )
+      shader_model_font_uOffset( offset );
+   else if( render->shader == k_font_shader_world )
+      shader_scene_font_uOffset( offset );
 }
 
 VG_STATIC void font3d_draw( struct font3d_render *render )
@@ -176,7 +195,7 @@ VG_STATIC void font3d_draw( struct font3d_render *render )
       if( !c0 ) break;
 
       ent_glyph *glyph0 = font3d_glyph( render->font, render->variant_id, c0 ),
-                *glyph1;
+                *glyph1 = NULL;
 
       /* multibyte characters */
       if( c0 >= 1 && c0 < k_SRglyph_ascii_min ){
@@ -223,12 +242,12 @@ VG_STATIC void font3d_draw( struct font3d_render *render )
          v0[2] = render->offset[2];
          v0[3] = render->offset[3];
 
-         shader_model_font_uOffset( v0 );
+         font3d_setoffset( render, v0 );
          mesh_drawn( glyph0->indice_start, glyph0->indice_count );
          continue;
       }
       else{
-         shader_model_font_uOffset( render->offset );
+         font3d_setoffset( render, render->offset );
          mesh_drawn( glyph0->indice_start, glyph0->indice_count );
       }
 
@@ -239,12 +258,19 @@ VG_STATIC void font3d_draw( struct font3d_render *render )
 }
 
 VG_STATIC 
-float font3d_simple_draw( font3d *font, u32 variant_id, const char *text, 
-                         camera *cam, m4x3f transform )
+float font3d_simple_draw( font3d *font, u32 variant_id, enum font_shader shader,
+                          const char *text, 
+                          camera *cam, m4x3f transform )
 {
-   struct font3d_render render;
-   font3d_begin( font, variant_id, cam, transform, &render );
-   render.u8pch = (u8*)text;
+   if( !text ) return 0.0f;
+
+   struct font3d_render render = {
+      .font = font,
+      .variant_id = variant_id,
+      .shader = shader,
+   };
+
+   font3d_begin( text, cam, transform, &render );
    font3d_draw( &render );
    return render.offset[0];
 }
@@ -252,6 +278,7 @@ float font3d_simple_draw( font3d *font, u32 variant_id, const char *text,
 VG_STATIC 
 float font3d_string_width( font3d *font, u32 variant_id, const char *text )
 {
+   if( !text ) return 0.0f;
    float width = 0.0f;
    for( int i=0;; i++ ){
       u32 c = text[i];