Merge pull request #106 from CesiumGS/gltf

Replace tinygltf

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "extern/tinygltf"]
-	path = extern/tinygltf
-	url = https://github.com/syoyo/tinygltf
 [submodule "extern/glm"]
 	path = extern/glm
 	url = https://github.com/g-truc/glm.git
@@ -28,3 +25,9 @@
 [submodule "extern/rapidjson"]
 	path = extern/rapidjson
 	url = https://github.com/Tencent/rapidjson.git
+[submodule "extern/glTF"]
+	path = extern/glTF
+	url = https://github.com/KhronosGroup/glTF.git
+[submodule "extern/stb"]
+	path = extern/stb
+	url = https://github.com/nothings/stb.git

.vscode/settings.json

@@ -95,7 +95,11 @@
         "shared_mutex": "cpp",
         "gsl_assert": "cpp",
         "compare": "cpp",
-        "resumable": "cpp"
+        "resumable": "cpp",
+        "codecvt": "cpp",
+        "ranges": "cpp",
+        "scoped_allocator": "cpp",
+        "typeindex": "cpp"
     },
     "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
     "cmake.configureOnOpen": true

CMakeLists.txt

@@ -80,6 +80,8 @@ target_link_libraries(cesium-native-tests PUBLIC Catch2::Catch2)
 add_subdirectory(CesiumUtility)
 add_subdirectory(CesiumGeometry)
 add_subdirectory(CesiumGeospatial)
+add_subdirectory(CesiumGltf)
+add_subdirectory(CesiumGltfReader)
 add_subdirectory(CesiumAsync)
 add_subdirectory(Cesium3DTiles)
 

Cesium3DTiles/CMakeLists.txt

@@ -16,14 +16,11 @@ target_sources(
 target_include_directories(
     Cesium3DTiles
     SYSTEM PUBLIC
-        # We're not using CMake for tinygltf at all, but it's header only. Add its headers here.
-        ${CMAKE_CURRENT_SOURCE_DIR}/../extern/tinygltf
-
-        # Same with RapidJSON
         ${CMAKE_CURRENT_SOURCE_DIR}/../extern/rapidjson/include
 
         # Draco's CMake doesn't use target_include_directories, so we need to manually add draco's include dirs here.
         ${CMAKE_CURRENT_SOURCE_DIR}/../extern/draco/src
+
         ${CMAKE_BINARY_DIR}
     PUBLIC
         include
@@ -33,4 +30,4 @@ target_include_directories(
         "$<BUILD_INTERFACE:$<$<BOOL:$<TARGET_PROPERTY:Cesium3DTiles_PRIVATE_SRC>>:${CMAKE_CURRENT_SOURCE_DIR}/src>>"
 )
 
-target_link_libraries(Cesium3DTiles PUBLIC CesiumAsync CesiumGeospatial CesiumGeometry CesiumUtility uriparser draco tinyxml2 spdlog)
+target_link_libraries(Cesium3DTiles PUBLIC CesiumAsync CesiumGeospatial CesiumGeometry CesiumGltf CesiumGltfReader CesiumUtility uriparser draco tinyxml2 spdlog)

Cesium3DTiles/include/Cesium3DTiles/Gltf.h

@@ -1,17 +1,18 @@
 #pragma once
 
 #include "Cesium3DTiles/Library.h"
+#include "CesiumGltf/Model.h"
 #include <glm/mat4x4.hpp>
 #include <gsl/span>
 #include <optional>
-#include <tiny_gltf.h>
+#include <functional>
 
 namespace Cesium3DTiles {
 
     /**
      * @brief Functions for loading and processing glTF models.
      * 
-     * This class offers basic functions for loading glTF models as `tinygltf::Model`
+     * This class offers basic functions for loading glTF models as `CesiumGltf::Model`
      * instances, and for processing the mesh primitives that appear in the resulting 
      * models.
      */
@@ -22,45 +23,14 @@ namespace Cesium3DTiles {
         /** @brief This class cannot be instantiated */
         Gltf() = delete;
 
-        /**
-         * @brief A summary of the result of loading a glTF model from raw data.
-         */
-        struct LoadResult {
-            /**
-             * @brief The gltf model that was loaded.
-             * 
-             * This will be `std::nullopt` if the model was not loaded successfully.
-             */
-            std::optional<tinygltf::Model> model;
-
-            /**
-             * @brief Warning messages from the attempt to load the model.
-             */
-            std::string warnings;
-
-            /**
-             * @brief Error messages from the attempt to load the model.
-             */
-            std::string errors;
-        };
-
-        /**
-         * @brief Load a glTF model from the given input data.
-         * 
-         * @param data The input data.
-         * @return The {@link LoadResult} containing the model (if it could be loaded),
-         * and possible warning- or error messages.
-         */
-        static LoadResult load(const gsl::span<const uint8_t>& data);
-
         /**
          * @brief A callback function for {@link Gltf::forEachPrimitiveInScene}.
          */
         typedef void ForEachPrimitiveInSceneCallback(
-            tinygltf::Model& gltf,
-            tinygltf::Node& node,
-            tinygltf::Mesh& mesh,
-            tinygltf::Primitive& primitive,
+            CesiumGltf::Model& gltf,
+            CesiumGltf::Node& node,
+            CesiumGltf::Mesh& mesh,
+            CesiumGltf::MeshPrimitive& primitive,
             const glm::dmat4& transform
         );
 
@@ -86,21 +56,21 @@ namespace Cesium3DTiles {
          * @param sceneID The scene ID (index)
          * @param callback The callback to apply
          */
-        static void forEachPrimitiveInScene(tinygltf::Model& gltf, int sceneID, std::function<ForEachPrimitiveInSceneCallback>&& callback);
+        static void forEachPrimitiveInScene(CesiumGltf::Model& gltf, int sceneID, std::function<ForEachPrimitiveInSceneCallback>&& callback);
 
         /**
          * @brief A callback function for {@link Gltf::forEachPrimitiveInScene}.
          */
         typedef void ForEachPrimitiveInSceneConstCallback(
-            const tinygltf::Model& gltf,
-            const tinygltf::Node& node,
-            const tinygltf::Mesh& mesh,
-            const tinygltf::Primitive& primitive,
+            const CesiumGltf::Model& gltf,
+            const CesiumGltf::Node& node,
+            const CesiumGltf::Mesh& mesh,
+            const CesiumGltf::MeshPrimitive& primitive,
             const glm::dmat4& transform
         );
 
         /** @copydoc Gltf::forEachPrimitiveInScene() */
-        static void forEachPrimitiveInScene(const tinygltf::Model& gltf, int sceneID, std::function<ForEachPrimitiveInSceneConstCallback>&& callback);
+        static void forEachPrimitiveInScene(const CesiumGltf::Model& gltf, int sceneID, std::function<ForEachPrimitiveInSceneConstCallback>&& callback);
     };
 
 

Cesium3DTiles/include/Cesium3DTiles/GltfContent.h

@@ -50,7 +50,7 @@ namespace Cesium3DTiles {
          * @return The bounding region.
          */
         static CesiumGeospatial::BoundingRegion createRasterOverlayTextureCoordinates(
-            tinygltf::Model& gltf,
+            CesiumGltf::Model& gltf,
             uint32_t textureCoordinateID,
             const CesiumGeospatial::Projection& projection,
             const CesiumGeometry::Rectangle& rectangle