latest
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Binary file not shown.
Binary file not shown.
BIN
build/monkey.bmp
Normal file
BIN
build/monkey.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
@@ -397,7 +397,7 @@ public:
|
||||
// Load OBJ monkey primitive once
|
||||
std::shared_ptr<Primitive> 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 (...) {
|
||||
|
||||
Reference in New Issue
Block a user