diff --git a/build/CMakeFiles/ModernEngine.dir/compiler_depend.internal b/build/CMakeFiles/ModernEngine.dir/compiler_depend.internal index d7c4deb..6445b72 100644 --- a/build/CMakeFiles/ModernEngine.dir/compiler_depend.internal +++ b/build/CMakeFiles/ModernEngine.dir/compiler_depend.internal @@ -6716,6 +6716,7 @@ CMakeFiles/ModernEngine.dir/src/OBJModelPrimitive.cpp.o /opt/homebrew/include/glm/fwd.hpp /opt/homebrew/include/glm/geometric.hpp /opt/homebrew/include/glm/glm.hpp + /opt/homebrew/include/glm/detail/setup.hpp /opt/homebrew/include/glm/ext/scalar_constants.hpp /opt/homebrew/include/glm/geometric.hpp /opt/homebrew/include/glm/detail/setup.hpp @@ -6738,6 +6739,8 @@ CMakeFiles/ModernEngine.dir/src/OBJModelPrimitive.cpp.o /opt/homebrew/include/glm/vec2.hpp /opt/homebrew/include/glm/vec3.hpp /opt/homebrew/include/glm/vec4.hpp + /opt/homebrew/include/glm/gtc/matrix_access.hpp + /opt/homebrew/include/glm/gtc/matrix_access.inl /opt/homebrew/include/glm/gtc/matrix_transform.hpp /opt/homebrew/include/glm/gtc/matrix_transform.inl /opt/homebrew/include/glm/integer.hpp @@ -13302,6 +13305,7 @@ CMakeFiles/ModernEngine.dir/src/main.cpp.o /opt/homebrew/include/glm/fwd.hpp /opt/homebrew/include/glm/geometric.hpp /opt/homebrew/include/glm/glm.hpp + /opt/homebrew/include/glm/detail/setup.hpp /opt/homebrew/include/glm/ext/scalar_constants.hpp /opt/homebrew/include/glm/geometric.hpp /opt/homebrew/include/glm/detail/setup.hpp @@ -13324,6 +13328,8 @@ CMakeFiles/ModernEngine.dir/src/main.cpp.o /opt/homebrew/include/glm/vec2.hpp /opt/homebrew/include/glm/vec3.hpp /opt/homebrew/include/glm/vec4.hpp + /opt/homebrew/include/glm/gtc/matrix_access.hpp + /opt/homebrew/include/glm/gtc/matrix_access.inl /opt/homebrew/include/glm/gtc/matrix_transform.hpp /opt/homebrew/include/glm/gtc/matrix_transform.inl /opt/homebrew/include/glm/integer.hpp diff --git a/build/CMakeFiles/ModernEngine.dir/compiler_depend.make b/build/CMakeFiles/ModernEngine.dir/compiler_depend.make index c87d651..e0bbc5a 100644 --- a/build/CMakeFiles/ModernEngine.dir/compiler_depend.make +++ b/build/CMakeFiles/ModernEngine.dir/compiler_depend.make @@ -6709,6 +6709,7 @@ CMakeFiles/ModernEngine.dir/src/OBJModelPrimitive.cpp.o: /Users/will/Documents/z /opt/homebrew/include/glm/fwd.hpp \ /opt/homebrew/include/glm/geometric.hpp \ /opt/homebrew/include/glm/glm.hpp \ + /opt/homebrew/include/glm/detail/setup.hpp \ /opt/homebrew/include/glm/ext/scalar_constants.hpp \ /opt/homebrew/include/glm/geometric.hpp \ /opt/homebrew/include/glm/detail/setup.hpp \ @@ -6731,6 +6732,8 @@ CMakeFiles/ModernEngine.dir/src/OBJModelPrimitive.cpp.o: /Users/will/Documents/z /opt/homebrew/include/glm/vec2.hpp \ /opt/homebrew/include/glm/vec3.hpp \ /opt/homebrew/include/glm/vec4.hpp \ + /opt/homebrew/include/glm/gtc/matrix_access.hpp \ + /opt/homebrew/include/glm/gtc/matrix_access.inl \ /opt/homebrew/include/glm/gtc/matrix_transform.hpp \ /opt/homebrew/include/glm/gtc/matrix_transform.inl \ /opt/homebrew/include/glm/integer.hpp \ @@ -13287,6 +13290,7 @@ CMakeFiles/ModernEngine.dir/src/main.cpp.o: /Users/will/Documents/zoomengine/src /opt/homebrew/include/glm/fwd.hpp \ /opt/homebrew/include/glm/geometric.hpp \ /opt/homebrew/include/glm/glm.hpp \ + /opt/homebrew/include/glm/detail/setup.hpp \ /opt/homebrew/include/glm/ext/scalar_constants.hpp \ /opt/homebrew/include/glm/geometric.hpp \ /opt/homebrew/include/glm/detail/setup.hpp \ @@ -13309,6 +13313,8 @@ CMakeFiles/ModernEngine.dir/src/main.cpp.o: /Users/will/Documents/zoomengine/src /opt/homebrew/include/glm/vec2.hpp \ /opt/homebrew/include/glm/vec3.hpp \ /opt/homebrew/include/glm/vec4.hpp \ + /opt/homebrew/include/glm/gtc/matrix_access.hpp \ + /opt/homebrew/include/glm/gtc/matrix_access.inl \ /opt/homebrew/include/glm/gtc/matrix_transform.hpp \ /opt/homebrew/include/glm/gtc/matrix_transform.inl \ /opt/homebrew/include/glm/integer.hpp \ diff --git a/build/CMakeFiles/ModernEngine.dir/src/main.cpp.o b/build/CMakeFiles/ModernEngine.dir/src/main.cpp.o index d5c15b6..e51af3a 100644 Binary files a/build/CMakeFiles/ModernEngine.dir/src/main.cpp.o and b/build/CMakeFiles/ModernEngine.dir/src/main.cpp.o differ diff --git a/build/ModernEngine b/build/ModernEngine index 386ce69..38e638a 100755 Binary files a/build/ModernEngine and b/build/ModernEngine differ diff --git a/build/monkey.bmp b/build/monkey.bmp new file mode 100644 index 0000000..4ab60d0 Binary files /dev/null and b/build/monkey.bmp differ diff --git a/src/main.cpp b/src/main.cpp index 9c202b7..49353fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -397,7 +397,7 @@ public: // Load OBJ monkey primitive once std::shared_ptr monkey_primitive; try { - monkey_primitive = CreateOBJModel("monkey.obj", "monkey.jpg"); + monkey_primitive = CreateOBJModel("monkey.obj", "monkey.bmp"); if (!monkey_primitive) monkey_primitive = CreateOBJModel("monkey.obj"); } catch (...) {