From 38a13b76d13c6e4f6f6c02bfd63900de56de4a42 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Fri, 5 Apr 2019 13:13:42 +0200
Subject: [PATCH] Corrected issue with LoadMesh()
---
examples/models/models_obj_loading.c | 2 +-
examples/models/models_obj_viewer.c | 30 ++++++++++++++--------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/models/models_obj_loading.c b/examples/models/models_obj_loading.c
index 0251fd3ee..74e7d08a0 100644
--- a/examples/models/models_obj_loading.c
+++ b/examples/models/models_obj_loading.c
@@ -59,7 +59,7 @@ int main()
DrawGizmo(position); // Draw gizmo
EndMode3D();
-
+
DrawText("(c) Castle 3D model by Alberto Cano", screenWidth - 200, screenHeight - 20, 10, GRAY);
DrawFPS(10, 10);
diff --git a/examples/models/models_obj_viewer.c b/examples/models/models_obj_viewer.c
index ffa609e08..0581df343 100644
--- a/examples/models/models_obj_viewer.c
+++ b/examples/models/models_obj_viewer.c
@@ -28,11 +28,11 @@ int main()
Model model = LoadModel("resources/models/turret.obj"); // Load default model obj
Texture2D texture = LoadTexture("resources/models/turret_diffuse.png"); // Load default model texture
model.materials[0].maps[MAP_DIFFUSE].texture = texture; // Bind texture to model
-
+
Vector3 position = { 0.0, 0.0, 0.0 }; // Set model position
- BoundingBox bounds = MeshBoundingBox(model.meshes[0]); // Set model bounds
+ BoundingBox bounds = MeshBoundingBox(model.meshes[0]); // Set model bounds
bool selected = false; // Selected object flag
-
+
SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode
char objFilename[64] = "turret.obj";
@@ -49,13 +49,13 @@ int main()
{
int count = 0;
char **droppedFiles = GetDroppedFiles(&count);
-
+
if (count == 1)
{
if (IsFileExtension(droppedFiles[0], ".obj"))
{
- UnloadMesh(&model.meshes[0]);
- model.meshes[0] = LoadMesh(droppedFiles[0]);
+ for (int i = 0; i < model.meshCount; i++) UnloadMesh(&model.meshes[i]);
+ model.meshes = LoadMeshes(droppedFiles[0], &model.meshCount);
bounds = MeshBoundingBox(model.meshes[0]);
}
else if (IsFileExtension(droppedFiles[0], ".png"))
@@ -67,12 +67,12 @@ int main()
strcpy(objFilename, GetFileName(droppedFiles[0]));
}
-
+
ClearDroppedFiles(); // Clear internal buffers
}
-
+
UpdateCamera(&camera);
-
+
// Select model on mouse click
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
{
@@ -93,21 +93,21 @@ int main()
DrawModel(model, position, 1.0f, WHITE); // Draw 3d model with texture
DrawGrid(20.0, 10.0); // Draw a grid
-
+
if (selected) DrawBoundingBox(bounds, GREEN);
-
+
EndMode3D();
-
+
DrawText("Free camera default controls:", 10, 20, 10, DARKGRAY);
DrawText("- Mouse Wheel to Zoom in-out", 20, 40, 10, GRAY);
DrawText("- Mouse Wheel Pressed to Pan", 20, 60, 10, GRAY);
DrawText("- Alt + Mouse Wheel Pressed to Rotate", 20, 80, 10, GRAY);
DrawText("- Alt + Ctrl + Mouse Wheel Pressed for Smooth Zoom", 20, 100, 10, GRAY);
-
+
DrawText("Drag & drop .obj/.png to load mesh/texture.", 10, GetScreenHeight() - 20, 10, DARKGRAY);
DrawText(FormatText("Current file: %s", objFilename), 250, GetScreenHeight() - 20, 10, GRAY);
if (selected) DrawText("MODEL SELECTED", GetScreenWidth() - 110, 10, 10, GREEN);
-
+
DrawText("(c) Turret 3D model by Alberto Cano", screenWidth - 200, screenHeight - 20, 10, GRAY);
EndDrawing();
@@ -119,7 +119,7 @@ int main()
UnloadModel(model); // Unload model
ClearDroppedFiles(); // Clear internal buffers
-
+
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------