diff options
| author | Joshua Rowe <17525998+omnisci3nce@users.noreply.github.com> | 2024-06-09 14:59:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 14:59:01 +1000 |
| commit | 9c79df522980eabdc5e52592cbd152e2a285c4cc (patch) | |
| tree | 9082af194033e5e3e4a770456209d3bac7784943 /src/resources | |
| parent | 8d116bd23d9441e33cb3377e90c08169109b438a (diff) | |
| parent | d4ff15d9cd82a6e3bc71da9d04ee0f250460cef1 (diff) | |
Merge pull request #16 from omnisci3nce/port-opengl-ral
Bring back OpenGL (part 1)
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/gltf.c | 5 | ||||
| -rw-r--r-- | src/resources/obj.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/resources/gltf.c b/src/resources/gltf.c index 022bf95..61b99d7 100644 --- a/src/resources/gltf.c +++ b/src/resources/gltf.c @@ -47,7 +47,8 @@ model_handle model_load_gltf(struct core *core, const char *path, bool invert_te model model = { 0 }; model.name = str8_cstr_view(path); - model.meshes = mesh_darray_new(1); + // FIXME: Use mesh* malloc'd + /* model.meshes = mesh_darray_new(1); */ // model.materials = material_darray_new(1); bool success = @@ -771,4 +772,4 @@ bool model_load_gltf(const char *path, model *out_model) { TRACE("Finished loading GLTF"); return true; } -*/
\ No newline at end of file +*/ diff --git a/src/resources/obj.c b/src/resources/obj.c index 888e16e..19d8657 100644 --- a/src/resources/obj.c +++ b/src/resources/obj.c @@ -54,7 +54,7 @@ model_handle model_load_obj(core *core, const char *path, bool invert_textures_y model model = { 0 }; model.name = str8_cstr_view(path); - model.meshes = mesh_darray_new(1); + /* model.meshes = mallocmesh_darray_new(1); */ // model.materials = material_darray_new(1); bool success = model_load_obj_str(file_string, relative_path.path, &model, invert_textures_y); @@ -228,6 +228,8 @@ bool model_load_obj_str(const char *file_string, str8 relative_path, model *out_ // // TODO: bounding box calculation for each mesh // // TODO: bounding box calculation for model + // TODO: copy from mesh_darray to malloc'd mesh* array + return true; } |