projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix null reference
[carveJwlIkooP6JGAAIwe30JlM.git]
/
font.h
diff --git
a/font.h
b/font.h
index c00aece3c9f2f46a59ae2e3f76062284bd93e113..0647b771a1457ce793466b66370c7a1b4911b77b 100644
(file)
--- a/
font.h
+++ b/
font.h
@@
-57,7
+57,12
@@
enum efont_SRglyph{
k_SRglyph_kbm_space = 0xa1,
k_SRglyph_kbm_return = 0xa2,
k_SRglyph_kbm_escape = 0xa3,
k_SRglyph_kbm_space = 0xa1,
k_SRglyph_kbm_return = 0xa2,
k_SRglyph_kbm_escape = 0xa3,
- k_SRglyph_kbm_mousemove = 0xa4
+ k_SRglyph_kbm_mousemove = 0xa4,
+ 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
};
typedef struct font3d font3d;
};
typedef struct font3d font3d;
@@
-77,11
+82,11
@@
static void font3d_load( font3d *font, const char *mdl_path, void *alloc ){
vg_linear_clear( vg_mem.scratch );
mdl_array_ptr fonts;
vg_linear_clear( vg_mem.scratch );
mdl_array_ptr fonts;
-
mdl_load_array( &font->mdl, &fonts, "ent_font"
, vg_mem.scratch );
+
MDL_LOAD_ARRAY( &font->mdl, &fonts, ent_font
, vg_mem.scratch );
font->info = *((ent_font *)mdl_arritm(&fonts,0));
font->info = *((ent_font *)mdl_arritm(&fonts,0));
-
mdl_load_array( &font->mdl, &font->font_variants, "ent_font_variant"
, alloc);
-
mdl_load_array( &font->mdl, &font->glyphs, "ent_glyph"
, alloc );
+
MDL_LOAD_ARRAY( &font->mdl, &font->font_variants, ent_font_variant
, alloc);
+
MDL_LOAD_ARRAY( &font->mdl, &font->glyphs, ent_glyph
, alloc );
vg_linear_clear( vg_mem.scratch );
vg_linear_clear( vg_mem.scratch );
@@
-92,7
+97,7
@@
static void font3d_load( font3d *font, const char *mdl_path, void *alloc ){
void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
mdl_fread_pack_file( &font->mdl, &tex0->file, data );
void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
mdl_fread_pack_file( &font->mdl, &tex0->file, data );
- mdl_async_load_glmesh( &font->mdl, &font->mesh );
+ mdl_async_load_glmesh( &font->mdl, &font->mesh
, NULL
);
vg_tex2d_load_qoi_async( data, tex0->file.pack_size,
VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
&font->texture );
vg_tex2d_load_qoi_async( data, tex0->file.pack_size,
VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
&font->texture );