Add new Cesium3DTilesContent library.

CesiumGS · Nov 2, 2023 · a71a982 · a71a982
1 parent af24dbe
commit a71a982
Show file tree

Hide file tree

Showing 30 changed files with 140 additions and 40 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### ? - ?
+
+##### Breaking Changes :mega:
+
+- Moved `ErrorList` from `Cesium3DTilesSelection` to `CesiumUtility`.
+
 ### v0.29.0 - 2023-11-01
 
 ##### Breaking Changes :mega:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,6 +148,7 @@ add_subdirectory(CesiumAsync)
 add_subdirectory(Cesium3DTiles)
 add_subdirectory(Cesium3DTilesReader)
 add_subdirectory(Cesium3DTilesWriter)
+add_subdirectory(Cesium3DTilesContent)
 add_subdirectory(Cesium3DTilesSelection)
 add_subdirectory(CesiumIonClient)
 

diff --git a/Cesium3DTilesContent/CMakeLists.txt b/Cesium3DTilesContent/CMakeLists.txt
@@ -0,0 +1,65 @@
+add_library(Cesium3DTilesContent "")
+configure_cesium_library(Cesium3DTilesContent)
+
+cesium_glob_files(CESIUM_3DTILES_CONTENT_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/generated/src/*.cpp
+)
+cesium_glob_files(CESIUM_3DTILES_CONTENT_HEADERS
+    ${CMAKE_CURRENT_LIST_DIR}/src/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/generated/src/*.h
+)
+cesium_glob_files(CESIUM_3DTILES_CONTENT_PUBLIC_HEADERS
+    ${CMAKE_CURRENT_LIST_DIR}/include/Cesium3DTilesContent/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/generated/include/Cesium3DTilesContent/*.h
+)
+cesium_glob_files(CESIUM_3DTILES_CONTENT_TEST_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/test/*.cpp
+)
+cesium_glob_files(CESIUM_3DTILES_CONTENT_TEST_HEADERS
+    ${CMAKE_CURRENT_LIST_DIR}/test/*.h
+)
+
+set_target_properties(Cesium3DTilesContent
+    PROPERTIES
+        TEST_SOURCES "${CESIUM_3DTILES_CONTENT_TEST_SOURCES}"
+        TEST_HEADERS "${CESIUM_3DTILES_CONTENT_TEST_HEADERS}"
+        TEST_DATA_DIR ${CMAKE_CURRENT_LIST_DIR}/test/data
+)
+
+set_target_properties(Cesium3DTilesContent
+    PROPERTIES
+    PUBLIC_HEADER "${CESIUM_3DTILES_CONTENT_PUBLIC_HEADERS}"
+)
+
+target_sources(
+    Cesium3DTilesContent
+    PRIVATE
+        ${CESIUM_3DTILES_CONTENT_SOURCES}
+        ${CESIUM_3DTILES_CONTENT_HEADERS}
+    PUBLIC
+        ${CESIUM_3DTILES_CONTENT_PUBLIC_HEADERS}
+)
+
+target_include_directories(
+    Cesium3DTilesContent
+    SYSTEM PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}/include
+        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+    PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/src
+        ${CMAKE_CURRENT_LIST_DIR}/generated/src
+)
+
+target_link_libraries(Cesium3DTilesContent
+    PUBLIC
+        CesiumAsync
+        CesiumGeometry
+        CesiumGltf
+        CesiumGltfReader
+)
+
+install(TARGETS Cesium3DTilesContent
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Cesium3DTilesContent
+)
diff --git a/...DTilesSelection/src/B3dmToGltfConverter.h → ...esium3DTilesContent/B3dmToGltfConverter.h b/...DTilesSelection/src/B3dmToGltfConverter.h → ...esium3DTilesContent/B3dmToGltfConverter.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/GltfConverterResult.h>
+#include "GltfConverterResult.h"
+
 #include <CesiumGltf/Model.h>
 #include <CesiumGltfReader/GltfReader.h>
 

diff --git a/...ilesSelection/src/BinaryToGltfConverter.h → ...ium3DTilesContent/BinaryToGltfConverter.h b/...ilesSelection/src/BinaryToGltfConverter.h → ...ium3DTilesContent/BinaryToGltfConverter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/GltfConverterResult.h>
+#include <Cesium3DTilesContent/GltfConverterResult.h>
 #include <CesiumGltfReader/GltfReader.h>
 
 #include <gsl/span>

diff --git a/...ium3DTilesSelection/GltfConverterResult.h → ...esium3DTilesContent/GltfConverterResult.h b/...ium3DTilesSelection/GltfConverterResult.h → ...esium3DTilesContent/GltfConverterResult.h
@@ -2,8 +2,8 @@
 
 #include "Library.h"
 
-#include <Cesium3DTilesSelection/ErrorList.h>
 #include <CesiumGltf/Model.h>
+#include <CesiumUtility/ErrorList.h>
 
 #include <optional>
 
@@ -15,7 +15,7 @@ namespace Cesium3DTilesSelection {
  * {@link GltfConverters}, when the response to a network request for
  * loading the tile content was received.
  */
-struct CESIUM3DTILESSELECTION_API GltfConverterResult {
+struct CESIUM3DTILESCONTENT_API GltfConverterResult {
   /**
    * @brief The gltf model converted from a binary content. This is empty if
    * there are errors during the conversion
@@ -26,6 +26,6 @@ struct CESIUM3DTILESSELECTION_API GltfConverterResult {
    * @brief The error and warning list when converting a binary content to gltf
    * model. This is empty if there are no errors during the conversion
    */
-  ErrorList errors;
+  CesiumUtility::ErrorList errors;
 };
 } // namespace Cesium3DTilesSelection
diff --git a/Cesium3DTilesContent/include/Cesium3DTilesContent/Library.h b/Cesium3DTilesContent/include/Cesium3DTilesContent/Library.h
@@ -0,0 +1,16 @@
+#pragma once
+
+/**
+ * @brief Classes that support the 3D Tiles tile content types.
+ */
+namespace Cesium3DTilesContent {}
+
+#if defined(_WIN32) && defined(CESIUM_SHARED)
+#ifdef CESIUM3DTILESCONTENT_BUILDING
+#define CESIUM3DTILESCONTENT_API __declspec(dllexport)
+#else
+#define CESIUM3DTILESCONTENT_API __declspec(dllimport)
+#endif
+#else
+#define CESIUM3DTILESCONTENT_API
+#endif
diff --git a/...DTilesSelection/src/PntsToGltfConverter.h → ...esium3DTilesContent/PntsToGltfConverter.h b/...DTilesSelection/src/PntsToGltfConverter.h → ...esium3DTilesContent/PntsToGltfConverter.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/GltfConverterResult.h>
+#include "GltfConverterResult.h"
+
 #include <CesiumGltf/Model.h>
 #include <CesiumGltfReader/GltfReader.h>
 

diff --git a/...ilesSelection/src/B3dmToGltfConverter.cpp → ...DTilesContent/src/B3dmToGltfConverter.cpp b/...ilesSelection/src/B3dmToGltfConverter.cpp → ...DTilesContent/src/B3dmToGltfConverter.cpp
@@ -1,8 +1,7 @@
-#include "B3dmToGltfConverter.h"
-
 #include "BatchTableToGltfStructuralMetadata.h"
-#include "BinaryToGltfConverter.h"
 
+#include <Cesium3DTilesContent/B3dmToGltfConverter.h>
+#include <Cesium3DTilesContent/BinaryToGltfConverter.h>
 #include <CesiumGltf/ExtensionCesiumRTC.h>
 
 #include <rapidjson/document.h>

diff --git a/...src/BatchTableHierarchyPropertyValues.cpp → ...src/BatchTableHierarchyPropertyValues.cpp b/...src/BatchTableHierarchyPropertyValues.cpp → ...src/BatchTableHierarchyPropertyValues.cpp
diff --git a/...n/src/BatchTableHierarchyPropertyValues.h → ...t/src/BatchTableHierarchyPropertyValues.h b/...n/src/BatchTableHierarchyPropertyValues.h → ...t/src/BatchTableHierarchyPropertyValues.h
diff --git a/...rc/BatchTableToGltfStructuralMetadata.cpp → ...rc/BatchTableToGltfStructuralMetadata.cpp b/...rc/BatchTableToGltfStructuralMetadata.cpp → ...rc/BatchTableToGltfStructuralMetadata.cpp
@@ -1,7 +1,6 @@
 #include "BatchTableToGltfStructuralMetadata.h"
 
 #include "BatchTableHierarchyPropertyValues.h"
-#include "Cesium3DTilesSelection/spdlog-cesium.h"
 
 #include <CesiumGltf/ExtensionExtMeshFeatures.h>
 #include <CesiumGltf/ExtensionModelExtStructuralMetadata.h>
@@ -20,6 +19,7 @@
 
 using namespace CesiumGltf;
 using namespace Cesium3DTilesSelection::CesiumImpl;
+using namespace CesiumUtility;
 
 namespace Cesium3DTilesSelection {
 namespace {

diff --git a/.../src/BatchTableToGltfStructuralMetadata.h → .../src/BatchTableToGltfStructuralMetadata.h b/.../src/BatchTableToGltfStructuralMetadata.h → .../src/BatchTableToGltfStructuralMetadata.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/ErrorList.h>
 #include <CesiumGltf/Model.h>
+#include <CesiumUtility/ErrorList.h>
 
 #include <gsl/span>
 #include <rapidjson/document.h>
@@ -10,13 +10,13 @@
 
 namespace Cesium3DTilesSelection {
 struct BatchTableToGltfStructuralMetadata {
-  static ErrorList convertFromB3dm(
+  static CesiumUtility::ErrorList convertFromB3dm(
       const rapidjson::Document& featureTableJson,
       const rapidjson::Document& batchTableJson,
       const gsl::span<const std::byte>& batchTableBinaryData,
       CesiumGltf::Model& gltf);
 
-  static ErrorList convertFromPnts(
+  static CesiumUtility::ErrorList convertFromPnts(
       const rapidjson::Document& featureTableJson,
       const rapidjson::Document& batchTableJson,
       const gsl::span<const std::byte>& batchTableBinaryData,

diff --git a/...esSelection/src/BinaryToGltfConverter.cpp → ...ilesContent/src/BinaryToGltfConverter.cpp b/...esSelection/src/BinaryToGltfConverter.cpp → ...ilesContent/src/BinaryToGltfConverter.cpp
@@ -1,4 +1,4 @@
-#include "BinaryToGltfConverter.h"
+#include <Cesium3DTilesContent/BinaryToGltfConverter.h>
 
 namespace Cesium3DTilesSelection {
 CesiumGltfReader::GltfReader BinaryToGltfConverter::_gltfReader;

diff --git a/...ilesSelection/src/PntsToGltfConverter.cpp → ...DTilesContent/src/PntsToGltfConverter.cpp b/...ilesSelection/src/PntsToGltfConverter.cpp → ...DTilesContent/src/PntsToGltfConverter.cpp
@@ -1,7 +1,6 @@
-#include "PntsToGltfConverter.h"
-
 #include "BatchTableToGltfStructuralMetadata.h"
 
+#include <Cesium3DTilesContent/PntsToGltfConverter.h>
 #include <CesiumGeometry/Transforms.h>
 #include <CesiumGltf/ExtensionCesiumRTC.h>
 #include <CesiumGltf/ExtensionKhrMaterialsUnlit.h>
@@ -228,7 +227,7 @@ struct PntsContent {
   std::map<std::string, DracoMetadataSemantic> dracoMetadataSemantics;
   std::vector<std::byte> dracoBatchTableBinary;
 
-  Cesium3DTilesSelection::ErrorList errors;
+  ErrorList errors;
   bool dracoMetadataHasErrors = false;
 };
 

diff --git a/...radeBatchTableToExtStructuralMetadata.cpp → ...radeBatchTableToExtStructuralMetadata.cpp b/...radeBatchTableToExtStructuralMetadata.cpp → ...radeBatchTableToExtStructuralMetadata.cpp
diff --git a/Cesium3DTilesSelection/CMakeLists.txt b/Cesium3DTilesSelection/CMakeLists.txt
@@ -44,6 +44,7 @@ target_include_directories(
 target_link_libraries(Cesium3DTilesSelection
     PUBLIC
         Cesium3DTiles
+        Cesium3DTilesContent
         Cesium3DTilesReader
         CesiumAsync
         CesiumGeospatial

diff --git a/Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfConverters.h b/Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfConverters.h
@@ -2,7 +2,7 @@
 
 #include "Library.h"
 
-#include <Cesium3DTilesSelection/GltfConverterResult.h>
+#include <Cesium3DTilesContent/GltfConverterResult.h>
 #include <CesiumGltfReader/GltfReader.h>
 
 #include <gsl/span>

diff --git a/Cesium3DTilesSelection/src/CmptToGltfConverter.h b/Cesium3DTilesSelection/src/CmptToGltfConverter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/GltfConverterResult.h>
+#include <Cesium3DTilesContent/GltfConverterResult.h>
 #include <CesiumGltfReader/GltfReader.h>
 
 #include <gsl/span>

diff --git a/Cesium3DTilesSelection/src/GltfConverters.cpp b/Cesium3DTilesSelection/src/GltfConverters.cpp
@@ -2,6 +2,8 @@
 
 #include <spdlog/spdlog.h>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTilesSelection {
 std::unordered_map<std::string, GltfConverters::ConverterFunction>
     GltfConverters::_loadersByMagic;

diff --git a/Cesium3DTilesSelection/src/QuantizedMeshLoader.h b/Cesium3DTilesSelection/src/QuantizedMeshLoader.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <Cesium3DTilesSelection/BoundingVolume.h>
-#include <Cesium3DTilesSelection/ErrorList.h>
 #include <Cesium3DTilesSelection/Library.h>
 #include <Cesium3DTilesSelection/TileID.h>
 #include <CesiumGeometry/QuadtreeTileRectangularRange.h>
 #include <CesiumGltf/Model.h>
+#include <CesiumUtility/ErrorList.h>
 
 #include <rapidjson/document.h>
 
@@ -52,12 +52,12 @@ struct QuantizedMeshLoadResult {
    */
   std::shared_ptr<CesiumAsync::IAssetRequest> pRequest;
 
-  ErrorList errors;
+  CesiumUtility::ErrorList errors;
 };
 
 struct QuantizedMeshMetadataResult {
   std::vector<CesiumGeometry::QuadtreeTileRectangularRange> availability;
-  ErrorList errors;
+  CesiumUtility::ErrorList errors;
 };
 
 /**

diff --git a/Cesium3DTilesSelection/src/TilesetContentLoaderResult.h b/Cesium3DTilesSelection/src/TilesetContentLoaderResult.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/ErrorList.h>
 #include <Cesium3DTilesSelection/Tile.h>
 #include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumGeometry/Axis.h>
+#include <CesiumUtility/ErrorList.h>
 
 #include <memory>
 #include <type_traits>
@@ -24,7 +24,7 @@ template <class TilesetContentLoaderType> struct TilesetContentLoaderResult {
       std::unique_ptr<Tile>&& pRootTile_,
       std::vector<LoaderCreditResult>&& credits_,
       std::vector<CesiumAsync::IAssetAccessor::THeader>&& requestHeaders_,
-      ErrorList&& errors_)
+      CesiumUtility::ErrorList&& errors_)
       : pLoader{std::move(pLoader_)},
         pRootTile{std::move(pRootTile_)},
         credits{std::move(credits_)},
@@ -85,7 +85,7 @@ template <class TilesetContentLoaderType> struct TilesetContentLoaderResult {
 
   std::vector<CesiumAsync::IAssetAccessor::THeader> requestHeaders;
 
-  ErrorList errors;
+  CesiumUtility::ErrorList errors;
 
   uint16_t statusCode{200};
 };

diff --git a/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp b/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp
@@ -24,6 +24,8 @@
 
 #include <cctype>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTilesSelection {
 namespace {
 struct ExternalContentInitializer {

diff --git a/Cesium3DTilesSelection/src/logTileLoadResult.cpp b/Cesium3DTilesSelection/src/logTileLoadResult.cpp
@@ -1,5 +1,7 @@
 #include "logTileLoadResult.h"
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTilesSelection {
 void logTileLoadResult(
     const std::shared_ptr<spdlog::logger>& pLogger,

diff --git a/Cesium3DTilesSelection/src/logTileLoadResult.h b/Cesium3DTilesSelection/src/logTileLoadResult.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Cesium3DTilesSelection/ErrorList.h>
+#include <CesiumUtility/ErrorList.h>
 
 #include <spdlog/spdlog.h>
 
@@ -11,5 +11,5 @@ namespace Cesium3DTilesSelection {
 void logTileLoadResult(
     const std::shared_ptr<spdlog::logger>& pLogger,
     const std::string& url,
-    const ErrorList& errorLists);
+    const CesiumUtility::ErrorList& errorLists);
 }
diff --git a/Cesium3DTilesSelection/src/registerAllTileContentTypes.cpp b/Cesium3DTilesSelection/src/registerAllTileContentTypes.cpp
@@ -1,8 +1,8 @@
-#include "B3dmToGltfConverter.h"
-#include "BinaryToGltfConverter.h"
 #include "CmptToGltfConverter.h"
-#include "PntsToGltfConverter.h"
 
+#include <Cesium3DTilesContent/B3dmToGltfConverter.h>
+#include <Cesium3DTilesContent/BinaryToGltfConverter.h>
+#include <Cesium3DTilesContent/PntsToGltfConverter.h>
 #include <Cesium3DTilesSelection/GltfConverters.h>
 #include <Cesium3DTilesSelection/registerAllTileContentTypes.h>
 

diff --git a/Cesium3DTilesSelection/test/ConvertTileToGltf.h b/Cesium3DTilesSelection/test/ConvertTileToGltf.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "B3dmToGltfConverter.h"
-#include "PntsToGltfConverter.h"
 #include "readFile.h"
 
+#include <Cesium3DTilesContent/B3dmToGltfConverter.h>
+#include <Cesium3DTilesContent/PntsToGltfConverter.h>
+
 #include <filesystem>
 
 namespace Cesium3DTilesSelection {

diff --git a/CesiumUtility/CMakeLists.txt b/CesiumUtility/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries_system(
     PUBLIC
         glm
         uriparser
+        spdlog
 )
 
 target_link_libraries(CesiumUtility