X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=font.h;h=9b5a13b8b354aa18f8a4972f86749e86784a9192;hb=b4a83d4fcab39bee5a8cd6e8e6eec06314864e5b;hp=75f2573c29f4bd9d292531d605b5529849ec6bab;hpb=610907ae753bdda202236d52a6fcf77d14d63193;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/font.h b/font.h
index 75f2573..9b5a13b 100644
--- a/font.h
+++ b/font.h
@@ -31,29 +31,20 @@ VG_STATIC void font3d_load( font3d *font, const char *mdl_path, void *alloc )
    mdl_load_array( &font->mdl, &font->glyphs, "ent_glyph", alloc );
 
    vg_linear_clear( vg_mem.scratch );
-   mdl_load_mesh_block( &font->mdl, vg_mem.scratch );
-   mdl_load_pack_block( &font->mdl, vg_mem.scratch );
-   mdl_close( &font->mdl );
 
-   vg_acquire_thread_sync();
-   {
-      /* upload mesh */
-      mesh_upload( &font->mesh, 
-                     font->mdl.verts.data, font->mdl.verts.count,
-                     font->mdl.indices.data, font->mdl.indices.count );
-
-      /* upload first texture */
-      font->texture = vg_tex2d_new();
-      mdl_texture *tex0 = mdl_arritm( &font->mdl.textures, 0 );
-
-      vg_tex2d_set_error();
-      vg_tex2d_qoi( mdl_arritm( &font->mdl.pack, tex0->file.pack_offset ),
-                    tex0->file.pack_size,
-                    mdl_pstr( &font->mdl, tex0->file.pstr_path ));
-      vg_tex2d_nearest();
-      vg_tex2d_repeat();
-   }
-   vg_release_thread_sync();
+   if( !mdl_arrcount( &font->mdl.textures ) )
+      vg_fatal_error( "No texture in font file" );
+
+   mdl_texture *tex0 = mdl_arritm( &font->mdl.textures, 0 );
+   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 );
+   vg_tex2d_load_qoi_async( data, tex0->file.pack_size, 
+                            VG_TEX2D_NEAREST|VG_TEX2D_REPEAT|VG_TEX2D_NOMIP,
+                            &font->texture );
+
+   mdl_close( &font->mdl );
 }
 
 VG_STATIC void font3d_init(void)