X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=font.h;h=0647b771a1457ce793466b66370c7a1b4911b77b;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=3bda50039a964220b4ff67194568d9f3ce8c39e2;hpb=1b889e55df5f9c0a8a26daba03ffa21754d78230;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/font.h b/font.h
index 3bda500..0647b77 100644
--- a/font.h
+++ b/font.h
@@ -82,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;
-   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));
 
-   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 );
 
@@ -97,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 );
 
-   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 );