feat : add initial gltf loader implementations

CubbyFlow · Nov 4, 2023 · c32abd4 · c32abd4
1 parent cd2a626
commit c32abd4
Show file tree

Hide file tree

Showing 20 changed files with 510 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,7 @@ include_directories(Dependencies/src/vulkan/include)
 include_directories(Dependencies/src/vma/src)
 include_directories(Dependencies/src/glfw/include)
 include_directories(Dependencies/src/glm)
-include_directories(Dependencies/src/assimp/include)
+include_directories(Dependencies/src/tinygltf)
 include_directories(Dependencies/src/etc2comp/EtcLib/Etc)
 include_directories(Dependencies/src/etc2comp/EtcLib/EtcCodec)
 include_directories(Dependencies/src/glslang/glslang/Include)
@@ -103,16 +103,6 @@ set(GLFW_BUILD_DOCS     OFF CACHE BOOL "")
 set(GLFW_INSTALL        OFF CACHE BOOL "")
 add_subdirectory(Dependencies/src/glfw)
 
-set(ASSIMP_NO_EXPORT                         ON  CACHE BOOL "")
-set(ASSIMP_BUILD_DRACO                      OFF CACHE BOOL "")
-set(ASSIMP_BUILD_ASSIMP_TOOLS               OFF CACHE BOOL "")
-set(ASSIMP_BUILD_TESTS                      OFF CACHE BOOL "")
-set(ASSIMP_INSTALL_PDB                      OFF CACHE BOOL "")
-set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT   OFF CACHE BOOL "")
-set(ASSIMP_BUILD_OBJ_IMPORTER                ON  CACHE BOOL "")
-set(ASSIMP_BUILD_GLTF_IMPORTER               ON  CACHE BOOL "")
-add_subdirectory(Dependencies/src/assimp)
-
 set(MESHOPT_BUILD_DEMO          OFF CACHE BOOL "")
 set(MESHOPT_BUILD_TOOLS         OFF CACHE BOOL "")
 set(MESHOPT_BUILD_SHARED_LIBS   OFF CACHE BOOL "")
@@ -153,15 +143,10 @@ add_subdirectory(Dependencies/src/backward-cpp)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(TARGET glfw          PROPERTY FOLDER "ThirdPartyLibraries")
-set_property(TARGET assimp        PROPERTY FOLDER "ThirdPartyLibraries")
 set_property(TARGET EtcLib        PROPERTY FOLDER "ThirdPartyLibraries")
 set_property(TARGET EtcTool       PROPERTY FOLDER "ThirdPartyLibraries")
 set_property(TARGET meshoptimizer PROPERTY FOLDER "ThirdPartyLibraries")
 set_property(TARGET volk          PROPERTY FOLDER "ThirdPartyLibraries")
-if(WIN32)
-    set_property(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs PROPERTY FOLDER "ThirdPartyLibraries")
-endif()
-set_property(TARGET uninstall     PROPERTY FOLDER "ThirdPartyLibraries")
 set_property(TARGET glslang       PROPERTY FOLDER "ThirdPartyLibraries/glslang")
 set_property(TARGET OGLCompiler   PROPERTY FOLDER "ThirdPartyLibraries/glslang")
 set_property(TARGET OSDependent   PROPERTY FOLDER "ThirdPartyLibraries/glslang")

diff --git a/Dependencies/bootstrap.json b/Dependencies/bootstrap.json
@@ -64,11 +64,11 @@
     }
   },
   {
-    "name": "assimp",
+    "name": "tinygltf",
     "source": {
       "type": "git",
-      "url": "https://github.com/assimp/assimp.git",
-      "revision": "a9f82dbe0b8a658003f93c7b5108ee4521458a18"
+      "url": "https://github.com/syoyo/tinygltf.git",
+      "revision": "v2.8.18"
     }
   },
   {

diff --git a/Includes/VoxFlow/Core/Devices/LogicalDevice.hpp b/Includes/VoxFlow/Core/Devices/LogicalDevice.hpp
@@ -8,8 +8,8 @@
 #include <VoxFlow/Core/Devices/Queue.hpp>
 #include <VoxFlow/Core/Utils/NonCopyable.hpp>
 #include <VoxFlow/Core/Utils/RendererCommon.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 #include <functional>
-#include <glm/vec2.hpp>
 #include <memory>
 #include <unordered_map>
 

diff --git a/Includes/VoxFlow/Core/Devices/SwapChain.hpp b/Includes/VoxFlow/Core/Devices/SwapChain.hpp
@@ -6,7 +6,7 @@
 #include <volk/volk.h>
 #include <VoxFlow/Core/Utils/NonCopyable.hpp>
 #include <VoxFlow/Core/Utils/RendererCommon.hpp>
-#include <glm/vec2.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 #include <optional>
 
 struct GLFWwindow;

diff --git a/Includes/VoxFlow/Core/Graphics/RenderPass/RenderPassParams.hpp b/Includes/VoxFlow/Core/Graphics/RenderPass/RenderPassParams.hpp
@@ -6,8 +6,8 @@
 #include <VoxFlow/Core/Utils/BitwiseOperators.hpp>
 #include <VoxFlow/Core/Utils/HashUtil.hpp>
 #include <VoxFlow/Core/Utils/RendererCommon.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 #include <array>
-#include <glm/vec2.hpp>
 
 namespace VoxFlow
 {

diff --git a/Includes/VoxFlow/Core/Scene/Material.hpp b/Includes/VoxFlow/Core/Scene/Material.hpp
@@ -0,0 +1,14 @@
+// Author : snowapril
+
+#ifndef VOX_FLOW_MATERIAL_HPP
+#define VOX_FLOW_MATERIAL_HPP
+
+namespace VoxFlow
+{
+class Material
+{
+ public:
+};
+}  // namespace VoxFlow
+
+#endif  // VOX_FLOW_MATERIAL_HPP
diff --git a/Includes/VoxFlow/Core/Scene/PrimitiveBufferPool.hpp b/Includes/VoxFlow/Core/Scene/PrimitiveBufferPool.hpp
@@ -0,0 +1,14 @@
+// Author : snowapril
+
+#ifndef VOX_FLOW_PRIMITIVE_BUFFER_POOL_HPP
+#define VOX_FLOW_PRIMITIVE_BUFFER_POOL_HPP
+
+namespace VoxFlow
+{
+class PrimitiveBufferPool
+{
+ public:
+};
+}  // namespace VoxFlow
+
+#endif  // VOX_FLOW_PRIMITIVE_BUFFER_POOL_HPP
diff --git a/Includes/VoxFlow/Core/Scene/SceneObject.hpp b/Includes/VoxFlow/Core/Scene/SceneObject.hpp
@@ -0,0 +1,14 @@
+// Author : snowapril
+
+#ifndef VOX_FLOW_SCENE_OBJECT_HPP
+#define VOX_FLOW_SCENE_OBJECT_HPP
+
+namespace VoxFlow
+{
+class SceneObject
+{
+ public:
+};
+}  // namespace VoxFlow
+
+#endif  // VOX_FLOW_SCENE_OBJECT_HPP
diff --git a/Includes/VoxFlow/Core/Scene/SceneObjectLoader.hpp b/Includes/VoxFlow/Core/Scene/SceneObjectLoader.hpp
@@ -0,0 +1,26 @@
+// Author : snowapril
+
+#ifndef VOX_FLOW_SCENE_OBJECT_LOADER_HPP
+#define VOX_FLOW_SCENE_OBJECT_LOADER_HPP
+
+#include <volk/volk.h>
+#include <memory>
+#include <string>
+
+namespace VoxFlow
+{
+class SceneObject;
+class ResourceUploadContext;
+
+class SceneObjectLoader
+{
+ public:
+    SceneObjectLoader();
+    ~SceneObjectLoader();
+
+ public:
+    std::shared_ptr<SceneObject> loadSceneObjectObj(const std::string& objPath, ResourceUploadContext* uploadContext);
+};
+}  // namespace VoxFlow
+
+#endif  // VOX_FLOW_SCENE_OBJECT_LOADER_HPP
diff --git a/Includes/VoxFlow/Core/Utils/MathUtils.hpp b/Includes/VoxFlow/Core/Utils/MathUtils.hpp
@@ -0,0 +1,19 @@
+// Author : snowapril
+
+#ifndef VOXEL_FLOW_MATH_UTILS_HPP
+#define VOXEL_FLOW_MATH_UTILS_HPP
+
+#define GLM_FORCE_RADIANS
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_inverse.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+
+namespace VoxFlow
+{
+
+}
+
+#endif  // VOXEL_FLOW_MATH_UTILS_HPP
diff --git a/Includes/VoxFlow/Core/Utils/RendererCommon.hpp b/Includes/VoxFlow/Core/Utils/RendererCommon.hpp
@@ -6,10 +6,8 @@
 #include <volk/volk.h>
 #include <VoxFlow/Core/Utils/BitwiseOperators.hpp>
 #include <VoxFlow/Core/Utils/HashUtil.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 #include <functional>
-#include <glm/vec2.hpp>
-#include <glm/vec3.hpp>
-#include <glm/vec4.hpp>
 #include <memory>
 #include <optional>
 #include <string>

diff --git a/Sources/VoxFlow/Core/CMakeLists.txt b/Sources/VoxFlow/Core/CMakeLists.txt
@@ -71,13 +71,18 @@ set(PUBLIC_HDRS
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Resources/RenderResourceGarbageCollector.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Resources/RenderResourceMemoryPool.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Resources/StagingBufferContext.hpp
+    ${PUBLIC_HDR_DIR}/VoxFlow/Core/Scene/SceneObject.hpp
+    ${PUBLIC_HDR_DIR}/VoxFlow/Core/Scene/SceneObjectLoader.hpp
+    ${PUBLIC_HDR_DIR}/VoxFlow/Core/Scene/PrimitiveBufferPool.hpp
+    ${PUBLIC_HDR_DIR}/VoxFlow/Core/Scene/Material.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/BitwiseOperators.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/ChromeTracer.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/DebugUtil.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/HashUtil.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/DecisionMaker.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/DeviceInputSubscriber.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/Logger.hpp
+    ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/MathUtils.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/Thread.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/MemoryAllocator.hpp
     ${PUBLIC_HDR_DIR}/VoxFlow/Core/Utils/NonCopyable.hpp
@@ -139,6 +144,10 @@ set(SRCS
     ${SRC_DIR}/Core/Resources/RenderResourceMemoryPool.cpp
     ${SRC_DIR}/Core/Resources/StagingBufferContext.cpp
     ${SRC_DIR}/Core/Resources/StagingBuffer.cpp
+    ${SRC_DIR}/Core/Scene/SceneObject.cpp
+    ${SRC_DIR}/Core/Scene/SceneObjectLoader.cpp
+    ${SRC_DIR}/Core/Scene/PrimitiveBufferPool.cpp
+    ${SRC_DIR}/Core/Scene/Material.cpp
     ${SRC_DIR}/Core/Utils/ChromeTracer.cpp
     ${SRC_DIR}/Core/Utils/DecisionMaker.cpp
     ${SRC_DIR}/Core/Utils/DeviceInputSubscriber.cpp

diff --git a/Sources/VoxFlow/Core/Devices/Queue.cpp b/Sources/VoxFlow/Core/Devices/Queue.cpp
@@ -7,7 +7,7 @@
 #include <VoxFlow/Core/Utils/DebugUtil.hpp>
 #include <VoxFlow/Core/Utils/Logger.hpp>
 #include <VoxFlow/Core/Utils/RendererCommon.hpp>
-#include <glm/common.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 
 namespace VoxFlow
 {

diff --git a/Sources/VoxFlow/Core/Devices/SwapChain.cpp b/Sources/VoxFlow/Core/Devices/SwapChain.cpp
@@ -7,9 +7,8 @@
 #include <VoxFlow/Core/Resources/Texture.hpp>
 #include <VoxFlow/Core/Utils/Logger.hpp>
 #include <VoxFlow/Core/Utils/RendererCommon.hpp>
-
 #include <GLFW/glfw3.h>
-#include <glm/common.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 
 namespace VoxFlow
 {

diff --git a/Sources/VoxFlow/Core/FrameGraph/FrameGraphPass.cpp b/Sources/VoxFlow/Core/FrameGraph/FrameGraphPass.cpp
@@ -5,7 +5,7 @@
 #include <VoxFlow/Core/FrameGraph/FrameGraphResources.hpp>
 #include <VoxFlow/Core/Graphics/Commands/CommandJobSystem.hpp>
 #include <VoxFlow/Core/Resources/Texture.hpp>
-#include <glm/common.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 
 namespace VoxFlow
 {

diff --git a/Sources/VoxFlow/Core/Graphics/Descriptors/DescriptorSetAllocatorPool.cpp b/Sources/VoxFlow/Core/Graphics/Descriptors/DescriptorSetAllocatorPool.cpp
@@ -5,8 +5,8 @@
 #include <VoxFlow/Core/Graphics/Descriptors/DescriptorSetConfig.hpp>
 #include <VoxFlow/Core/Graphics/Pipelines/ShaderModule.hpp>
 #include <VoxFlow/Core/Utils/Logger.hpp>
+#include <VoxFlow/Core/Utils/MathUtils.hpp>
 #include <algorithm>
-#include <glm/common.hpp>
 
 namespace VoxFlow
 {

diff --git a/Sources/VoxFlow/Core/Scene/Material.cpp b/Sources/VoxFlow/Core/Scene/Material.cpp
@@ -0,0 +1,7 @@
+// Author : snowapril
+
+#include <VoxFlow/Core/Scene/Material.hpp>
+
+namespace VoxFlow
+{
+}  // namespace VoxFlow
diff --git a/Sources/VoxFlow/Core/Scene/PrimitiveBufferPool.cpp b/Sources/VoxFlow/Core/Scene/PrimitiveBufferPool.cpp
@@ -0,0 +1,7 @@
+// Author : snowapril
+
+#include <VoxFlow/Core/Scene/PrimitiveBufferPool.hpp>
+
+namespace VoxFlow
+{
+}  // namespace VoxFlow
diff --git a/Sources/VoxFlow/Core/Scene/SceneObject.cpp b/Sources/VoxFlow/Core/Scene/SceneObject.cpp
@@ -0,0 +1,7 @@
+// Author : snowapril
+
+#include <VoxFlow/Core/Scene/SceneObject.hpp>
+
+namespace VoxFlow
+{
+}  // namespace VoxFlow