Add: Composer for writing glTF files

spnda · Jan 28, 2024 · 7823455 · 7823455
1 parent 54c8f2b
commit 7823455
Show file tree

Hide file tree

Showing 14 changed files with 702 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler_flags.cmake)
 # Create the library target
 add_library(fastgltf
     "src/fastgltf.cpp" "src/base64.cpp"
-    "include/fastgltf/base64.hpp" "include/fastgltf/glm_element_traits.hpp" "include/fastgltf/parser.hpp" "include/fastgltf/tools.hpp" "include/fastgltf/types.hpp" "include/fastgltf/util.hpp")
+    "include/fastgltf/base64.hpp" "include/fastgltf/glm_element_traits.hpp" "include/fastgltf/core.hpp" "include/fastgltf/tools.hpp" "include/fastgltf/types.hpp" "include/fastgltf/util.hpp")
 add_library(fastgltf::fastgltf ALIAS fastgltf)
 
 fastgltf_compiler_flags(fastgltf)
@@ -100,7 +100,7 @@ if (ANDROID)
 endif()
 
 install(
-    FILES "include/fastgltf/base64.hpp" "include/fastgltf/glm_element_traits.hpp" "include/fastgltf/parser.hpp" "include/fastgltf/tools.hpp" "include/fastgltf/types.hpp" "include/fastgltf/util.hpp"
+    FILES "include/fastgltf/base64.hpp" "include/fastgltf/glm_element_traits.hpp" "include/fastgltf/core.hpp" "include/fastgltf/tools.hpp" "include/fastgltf/types.hpp" "include/fastgltf/util.hpp"
     DESTINATION include/fastgltf
 )
 

diff --git a/examples/gl_viewer/gl_viewer.cpp b/examples/gl_viewer/gl_viewer.cpp
@@ -40,7 +40,7 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 
-#include <fastgltf/parser.hpp>
+#include <fastgltf/core.hpp>
 #include <fastgltf/types.hpp>
 
 constexpr std::string_view vertexShaderSource = R"(

diff --git a/include/fastgltf/parser.hpp → include/fastgltf/core.hpp b/include/fastgltf/parser.hpp → include/fastgltf/core.hpp
@@ -762,6 +762,34 @@ namespace fastgltf {
         void setBase64DecodeCallback(Base64DecodeCallback* decodeCallback) noexcept;
         void setUserPointer(void* pointer) noexcept;
     };
+
+	/**
+	 * A composer for one or more glTF files.
+	 */
+	class Composer {
+		Error errorCode = Error::None;
+		const Asset* asset = nullptr;
+
+		void writeAccessors(std::string& json);
+		void writeBuffers(std::string& json);
+		void writeBufferViews(std::string& json);
+		void writeCameras(std::string& json);
+		void writeImages(std::string& json);
+		void writeLights(std::string& json);
+		void writeMaterials(std::string& json);
+		void writeMeshes(std::string& json);
+		void writeNodes(std::string& json);
+		void writeSamplers(std::string& json);
+		void writeScenes(std::string& json);
+		void writeSkins(std::string& json);
+		void writeTextures(std::string& json);
+
+	public:
+		[[nodiscard]] Error getError() const;
+
+		std::string writeGLTF(const Asset* asset);
+		void writeBinaryGLTF(const Asset* asset);
+	};
 } // namespace fastgltf
 
 #ifdef _MSC_VER

diff --git a/include/fastgltf/types.hpp b/include/fastgltf/types.hpp
@@ -375,6 +375,23 @@ namespace fastgltf {
         		return AccessorType::Invalid;
         }
     }
+
+	static constexpr std::array<std::string_view, 7> accessorTypeNames = {
+		"SCALAR",
+		"VEC2",
+		"VEC3",
+		"VEC4",
+		"MAT2",
+		"MAT3",
+		"MAT4"
+	};
+
+	constexpr std::string_view getAccessorTypeName(AccessorType type) noexcept {
+		if (type == AccessorType::Invalid)
+			return "";
+		auto idx = to_underlying(type) & 0xFF;
+		return accessorTypeNames[idx - 1];
+	}
 #pragma endregion
 
 #pragma region Containers
@@ -1315,9 +1332,9 @@ namespace fastgltf {
     };
 
     struct Skin {
-	    FASTGLTF_FG_PMR_NS::MaybeSmallVector<std::size_t> joints;
-	    Optional<std::size_t> skeleton;
 	    Optional<std::size_t> inverseBindMatrices;
+        Optional<std::size_t> skeleton;
+        FASTGLTF_FG_PMR_NS::MaybeSmallVector<std::size_t> joints;
 
         FASTGLTF_STD_PMR_NS::string name;
     };