diff options
Diffstat (limited to 'examples/models')
| -rw-r--r-- | examples/models/models_loading.c | 25 | ||||
| -rw-r--r-- | examples/models/models_skybox.c | 13 |
2 files changed, 18 insertions, 20 deletions
diff --git a/examples/models/models_loading.c b/examples/models/models_loading.c index 7d4543cd..ee3811ee 100644 --- a/examples/models/models_loading.c +++ b/examples/models/models_loading.c @@ -67,35 +67,34 @@ int main(void) // Load new models/textures on drag&drop if (IsFileDropped()) { - int count = 0; - char **droppedFiles = LoadDroppedFiles(&count); + FilePathList droppedFiles = LoadDroppedFiles(); - if (count == 1) // Only support one file dropped + if (droppedFiles.count == 1) // Only support one file dropped { - if (IsFileExtension(droppedFiles[0], ".obj") || - IsFileExtension(droppedFiles[0], ".gltf") || - IsFileExtension(droppedFiles[0], ".glb") || - IsFileExtension(droppedFiles[0], ".vox") || - IsFileExtension(droppedFiles[0], ".iqm")) // Model file formats supported + if (IsFileExtension(droppedFiles.paths[0], ".obj") || + IsFileExtension(droppedFiles.paths[0], ".gltf") || + IsFileExtension(droppedFiles.paths[0], ".glb") || + IsFileExtension(droppedFiles.paths[0], ".vox") || + IsFileExtension(droppedFiles.paths[0], ".iqm")) // Model file formats supported { - UnloadModel(model); // Unload previous model - model = LoadModel(droppedFiles[0]); // Load new model + UnloadModel(model); // Unload previous model + model = LoadModel(droppedFiles.paths[0]); // Load new model model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Set current map diffuse texture bounds = GetMeshBoundingBox(model.meshes[0]); // TODO: Move camera position from target enough distance to visualize model properly } - else if (IsFileExtension(droppedFiles[0], ".png")) // Texture file formats supported + else if (IsFileExtension(droppedFiles.paths[0], ".png")) // Texture file formats supported { // Unload current model texture and load new one UnloadTexture(texture); - texture = LoadTexture(droppedFiles[0]); + texture = LoadTexture(droppedFiles.paths[0]); model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; } } - UnloadDroppedFiles(); // Clear internal buffers + UnloadDroppedFiles(droppedFiles); // Unload filepaths from memory } // Select model on mouse click diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c index b5e0102d..88202aee 100644 --- a/examples/models/models_skybox.c +++ b/examples/models/models_skybox.c @@ -97,18 +97,17 @@ int main(void) // Load new cubemap texture on drag&drop if (IsFileDropped()) { - int count = 0; - char **droppedFiles = LoadDroppedFiles(&count); + FilePathList droppedFiles = LoadDroppedFiles(); - if (count == 1) // Only support one file dropped + if (droppedFiles.count == 1) // Only support one file dropped { - if (IsFileExtension(droppedFiles[0], ".png;.jpg;.hdr;.bmp;.tga")) + if (IsFileExtension(droppedFiles.paths[0], ".png;.jpg;.hdr;.bmp;.tga")) { // Unload current cubemap texture and load new one UnloadTexture(skybox.materials[0].maps[MATERIAL_MAP_CUBEMAP].texture); if (useHDR) { - Texture2D panorama = LoadTexture(droppedFiles[0]); + Texture2D panorama = LoadTexture(droppedFiles.paths[0]); // Generate cubemap from panorama texture skybox.materials[0].maps[MATERIAL_MAP_CUBEMAP].texture = GenTextureCubemap(shdrCubemap, panorama, 1024, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8); @@ -116,7 +115,7 @@ int main(void) } else { - Image img = LoadImage(droppedFiles[0]); + Image img = LoadImage(droppedFiles.paths[0]); skybox.materials[0].maps[MATERIAL_MAP_CUBEMAP].texture = LoadTextureCubemap(img, CUBEMAP_LAYOUT_AUTO_DETECT); UnloadImage(img); } @@ -125,7 +124,7 @@ int main(void) } } - UnloadDroppedFiles(); // Clear internal buffers + UnloadDroppedFiles(droppedFiles); // Unload filepaths from memory } //---------------------------------------------------------------------------------- |