{
fclose( mdl->file );
vg_file_print_invalid( mdl->file );
- vg_fatal_exit_loop( "Corrupt model" );
+ vg_fatal_error( "Corrupt model" );
}
/*
{
if( !info->pack_size ){
vg_warn( "path: %s\n", mdl_pstr( mdl, info->pstr_path ) );
- vg_fatal_exit_loop( "Packed file is only a header; it is not packed" );
+ vg_fatal_error( "Packed file is only a header; it is not packed" );
}
fseek( mdl->file, mdl->pack_base_offset+info->pack_offset, SEEK_SET );
mdl_load_fatal_corrupt( mdl );
}
-VG_STATIC void mdl_load_array_file( mdl_context *mdl, mdl_array_ptr *ptr,
- mdl_array *arr, void *lin_alloc )
+/* TODO: Rename these */
+VG_STATIC
+void mdl_load_array_file_buffer( mdl_context *mdl, mdl_array *arr,
+ void *buffer )
{
if( arr->item_count ){
- u32 size = arr->item_size*arr->item_count;
- ptr->data = vg_linear_alloc( lin_alloc, vg_align8(size) );
-
fseek( mdl->file, arr->file_offset, SEEK_SET );
- u64 l = fread( ptr->data, arr->item_size*arr->item_count, 1, mdl->file );
+ u64 l = fread( buffer, arr->item_size*arr->item_count, 1, mdl->file );
if( l != 1 )
mdl_load_fatal_corrupt( mdl );
}
+}
+
+VG_STATIC void mdl_load_array_file( mdl_context *mdl, mdl_array_ptr *ptr,
+ mdl_array *arr, void *lin_alloc )
+{
+ if( arr->item_count ){
+ u32 size = arr->item_size*arr->item_count;
+ ptr->data = vg_linear_alloc( lin_alloc, vg_align8(size) );
+ mdl_load_array_file_buffer( mdl, arr, ptr->data );
+ }
else
ptr->data = NULL;
if( !mdl->file ){
vg_error( "mdl_open('%s'): %s\n", path, strerror(errno) );
- vg_fatal_exit_loop( "see above for details" );
+ vg_fatal_error( "see above for details" );
}
u64 l = fread( &mdl->info, sizeof(mdl_header), 1, mdl->file );
vg_warn( " version: %u (current: %u)\n", mdl->info.version,
MDL_VERSION_NR );
- vg_fatal_exit_loop( "Legacy model version incompatable" );
+ vg_fatal_error( "Legacy model version incompatable" );
}
mdl_load_array_file( mdl, &mdl->index, &mdl->info.index, lin_alloc );
mesh_drawn( sm->indice_start, sm->indice_count );
}
-/* WARNING: Destructive! Only use this once and then discard the context. */
-VG_STATIC void mdl_unpack_glmesh( mdl_context *mdl, glmesh *mesh )
+VG_STATIC mdl_mesh *mdl_find_mesh( mdl_context *mdl, const char *name )
{
- if( !mdl->submeshs.count )
- vg_fatal_exit_loop( "Tried to unpack empty model file" );
+ for( u32 i=0; i<mdl_arrcount( &mdl->meshs ); i++ ){
+ mdl_mesh *mesh = mdl_arritm( &mdl->meshs, i );
+ if( !strcmp( name, mdl_pstr( mdl, mesh->pstr_name ))){
+ return mesh;
+ }
+ }
+ return NULL;
+}
- mdl_submesh *sm = mdl_arritm( &mdl->submeshs, 0 );
- u32 offset = sm->vertex_count;
+struct payload_glmesh_load{
+ mdl_vert *verts;
+ u32 *indices;
- for( u32 i=1; i<mdl_arrcount( &mdl->submeshs ); i++ ){
- mdl_submesh *sm = mdl_arritm( &mdl->submeshs, i );
- u32 *indices = mdl_arritm( &mdl->indices, sm->indice_start );
+ u32 vertex_count,
+ indice_count;
- for( u32 j=0; j<sm->indice_count; j++ )
- indices[j] += offset;
+ glmesh *mesh;
+};
- offset += sm->vertex_count;
- }
+VG_STATIC void async_mdl_load_glmesh( void *payload, u32 size )
+{
+ struct payload_glmesh_load *job = payload;
- mesh_upload( mesh, mdl->verts.data, mdl->verts.count,
- mdl->indices.data, mdl->indices.count );
+ mesh_upload( job->mesh, job->verts, job->vertex_count,
+ job->indices, job->indice_count );
}
-VG_STATIC mdl_mesh *mdl_find_mesh( mdl_context *mdl, const char *name )
+VG_STATIC void mdl_async_load_glmesh( mdl_context *mdl, glmesh *mesh )
{
- for( u32 i=0; i<mdl_arrcount( &mdl->meshs ); i++ ){
- mdl_mesh *mesh = mdl_arritm( &mdl->meshs, i );
- if( !strcmp( name, mdl_pstr( mdl, mesh->pstr_name ))){
- return mesh;
+ mdl_array *arr_vertices = mdl_find_array( mdl, "mdl_vert" );
+ mdl_array *arr_indices = mdl_find_array( mdl, "mdl_indice" );
+
+ if( arr_vertices && arr_indices ){
+ u32 size_verts = vg_align8(mdl_query_array_size( arr_vertices )),
+ size_indices = vg_align8(mdl_query_array_size( arr_indices )),
+ size_hdr = vg_align8(sizeof(struct payload_glmesh_load)),
+ total = size_hdr + size_verts + size_indices;
+
+ vg_async_item *call = vg_async_alloc( total );
+ struct payload_glmesh_load *job = call->payload;
+
+ u8 *payload = call->payload;
+
+ job->mesh = mesh;
+ job->verts = (void*)(payload + size_hdr);
+ job->indices = (void*)(payload + size_hdr + size_verts);
+ job->vertex_count = arr_vertices->item_count;
+ job->indice_count = arr_indices->item_count;
+
+ mdl_load_array_file_buffer( mdl, arr_vertices, job->verts );
+ mdl_load_array_file_buffer( mdl, arr_indices, job->indices );
+
+ /*
+ * Unpack the indices (if there are meshes)
+ * ---------------------------------------------------------
+ */
+
+ if( mdl_arrcount( &mdl->submeshs ) ){
+ mdl_submesh *sm = mdl_arritm( &mdl->submeshs, 0 );
+ u32 offset = sm->vertex_count;
+
+ for( u32 i=1; i<mdl_arrcount( &mdl->submeshs ); i++ ){
+ mdl_submesh *sm = mdl_arritm( &mdl->submeshs, i );
+ u32 *indices = job->indices + sm->indice_start;
+
+ for( u32 j=0; j<sm->indice_count; j++ )
+ indices[j] += offset;
+
+ offset += sm->vertex_count;
+ }
}
+
+ /*
+ * Dispatch
+ * -------------------------
+ */
+
+ vg_async_dispatch( call, async_mdl_load_glmesh );
+ }
+ else{
+ vg_fatal_error( "no vertex/indice data\n" );
}
- return NULL;
}
#endif
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff