assimg progress

desatur · Sep 22, 2024 · c5b05a9 · c5b05a9
1 parent cc6ab4e
commit c5b05a9
Show file tree

Hide file tree

Showing 13 changed files with 196 additions and 434 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -32,3 +32,6 @@
 [submodule "thirdParty/imgui"]
 	path = thirdParty/imgui
 	url = https://github.com/ocornut/imgui
+[submodule "thirdParty/assimp"]
+	path = thirdParty/assimp
+	url = https://github.com/assimp/assimp
diff --git a/Future/CMakeLists.txt b/Future/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory(${THIRD_PARTY_LIB_DIR}/glfw glfw)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/glm glm)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/json json)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/tinygltf tinygltf)
+add_subdirectory(${THIRD_PARTY_LIB_DIR}/assimp assimp)
 
 add_library(Future SHARED
         # GLAD
@@ -41,10 +42,11 @@ add_library(Future SHARED
         src/Rendering/Textures/Texture.hpp
         src/Rendering/Camera.cpp
         src/Rendering/Camera.hpp
-        src/Rendering/Mesh.cpp
-        src/Rendering/Mesh.hpp
-        src/Rendering/Model.cpp
-        src/Rendering/Model.hpp
+        src/Rendering/Model/Mesh.cpp
+        src/Rendering/Model/Mesh.hpp
+        src/Rendering/Model/Model.cpp
+        src/Rendering/Model/Model.hpp
+        src/Rendering/Vertex.hpp
 )
 
 target_include_directories(Future PUBLIC
@@ -55,6 +57,7 @@ target_include_directories(Future PUBLIC
         ${THIRD_PARTY_LIB_DIR}/glm/glm/
         ${THIRD_PARTY_LIB_DIR}/json/include
         ${THIRD_PARTY_LIB_DIR}/tinygltf/
+        ${THIRD_PARTY_LIB_DIR}/assimp/include
 )
 
 target_link_libraries(Future PUBLIC spdlog::spdlog $<$<BOOL:${MINGW}>:ws2_32>)
@@ -63,6 +66,7 @@ target_link_libraries(Future PUBLIC SDL2::SDL2)
 target_link_libraries(Future PUBLIC glfw)
 target_link_libraries(Future PUBLIC glm)
 target_link_libraries(Future PUBLIC tinygltf)
+target_link_libraries(Future PUBLIC assimp)
 
 add_custom_command(TARGET Future POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory

diff --git a/Future/src/Rendering/Buffers/VBO.hpp b/Future/src/Rendering/Buffers/VBO.hpp
@@ -4,14 +4,7 @@
 
 #include "vec2.hpp"
 #include "vec3.hpp"
-
-struct Vertex
-{
-    glm::vec3 Position;
-    glm::vec3 Normal;
-    glm::vec3 color;
-    glm::vec2 TexCoords;
-};
+#include "../Vertex.hpp"
 
 namespace Future
 {