X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=font.h;h=4361e934795fc881bc71e886d86139bb013a66a7;hb=99376ce8eaf30125fb08dd5dc8b534800580fe47;hp=1b94b9a664945c48f2627ec35120c8829d0dde8e;hpb=c2b59441df0383807ba093295af2e4400e552f39;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/font.h b/font.h index 1b94b9a..4361e93 100644 --- a/font.h +++ b/font.h @@ -158,7 +158,7 @@ VG_STATIC 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 ); @@ -174,14 +174,9 @@ void font3d_begin( const char *text, } render->u8pch = (u8*)text; - -#if 0 - render->font = font; - render->variant_id = variant_id; -#endif } -VG_STATIC void font3d_setoffset( struct font3d_render *render, v3f offset ){ +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 )