Move SharedAsset[Depot] to CesiumAsync.

CesiumGS · Oct 10, 2024 · a9516a0 · a9516a0
1 parent e397591
commit a9516a0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git a/Cesium3DTilesSelection/src/TilesetContentManager.h b/Cesium3DTilesSelection/src/TilesetContentManager.h
@@ -11,7 +11,6 @@
 #include <Cesium3DTilesSelection/TilesetLoadFailureDetails.h>
 #include <Cesium3DTilesSelection/TilesetOptions.h>
 #include <CesiumAsync/IAssetAccessor.h>
-#include <CesiumGltf/SharedAssetDepot.h>
 #include <CesiumUtility/CreditSystem.h>
 #include <CesiumUtility/ReferenceCounted.h>
 

diff --git a/CesiumGltf/include/CesiumGltf/SharedAsset.h → ...umAsync/include/CesiumAsync/SharedAsset.h b/CesiumGltf/include/CesiumGltf/SharedAsset.h → ...umAsync/include/CesiumAsync/SharedAsset.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <CesiumGltf/SharedAssetDepot.h>
+#include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumUtility/ExtensibleObject.h>
 #include <CesiumUtility/IntrusivePointer.h>
 
 #include <atomic>
 
-namespace CesiumGltf {
+namespace CesiumAsync {
 
 /**
  * @brief An asset that is potentially shared between multiple objects, such as
@@ -21,7 +21,7 @@ namespace CesiumGltf {
  * `class MyClass : public SharedAsset<MyClass> { ... };`
  */
 template <typename T>
-class CESIUMGLTF_API SharedAsset : public CesiumUtility::ExtensibleObject {
+class CESIUMASYNC_API SharedAsset : public CesiumUtility::ExtensibleObject {
 public:
   // Assets can be copied, but the fresh instance has no references and is not
   // in the asset depot.
@@ -120,4 +120,4 @@ class CESIUMGLTF_API SharedAsset : public CesiumUtility::ExtensibleObject {
   friend class SharedAssetDepot<T>;
 };
 
-} // namespace CesiumGltf
+} // namespace CesiumAsync
diff --git a/...ltf/include/CesiumGltf/SharedAssetDepot.h → ...nc/include/CesiumAsync/SharedAssetDepot.h b/...ltf/include/CesiumGltf/SharedAssetDepot.h → ...nc/include/CesiumAsync/SharedAssetDepot.h
@@ -16,7 +16,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace CesiumGltf {
+namespace CesiumAsync {
 
 template <typename T> class SharedAsset;
 
@@ -26,8 +26,9 @@ template <typename T> class SharedAsset;
  * be derived from {@link SharedAsset}.
  */
 template <typename AssetType>
-class SharedAssetDepot : public CesiumUtility::ReferenceCountedThreadSafe<
-                             SharedAssetDepot<AssetType>> {
+class CESIUMASYNC_API SharedAssetDepot
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          SharedAssetDepot<AssetType>> {
 public:
   /**
    * @brief The maximum total byte usage of assets that have been loaded but are
@@ -273,4 +274,4 @@ class SharedAssetDepot : public CesiumUtility::ReferenceCountedThreadSafe<
   friend class SharedAsset<AssetType>;
 };
 
-} // namespace CesiumGltf
+} // namespace CesiumAsync
diff --git a/CesiumGltf/include/CesiumGltf/Image.h b/CesiumGltf/include/CesiumGltf/Image.h
@@ -4,7 +4,7 @@
 #include "CesiumGltf/ImageSpec.h"
 #include "CesiumGltf/Library.h"
 
-#include <CesiumGltf/SharedAssetDepot.h>
+#include <CesiumAsync/SharedAssetDepot.h>
 
 namespace CesiumGltf {
 /** @copydoc ImageSpec */

diff --git a/CesiumGltf/include/CesiumGltf/ImageCesium.h b/CesiumGltf/include/CesiumGltf/ImageCesium.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "CesiumAsync/SharedAsset.h"
 #include "CesiumGltf/Ktx2TranscodeTargets.h"
 #include "CesiumGltf/Library.h"
-#include "CesiumGltf/SharedAsset.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -30,7 +30,8 @@ struct CESIUMGLTF_API ImageCesiumMipPosition {
  * @brief Holds {@link Image} properties that are specific to the glTF loader
  * rather than part of the glTF spec.
  */
-struct CESIUMGLTF_API ImageCesium final : public SharedAsset<ImageCesium> {
+struct CESIUMGLTF_API ImageCesium final
+    : public CesiumAsync::SharedAsset<ImageCesium> {
   /**
    * @brief The width of the image in pixels.
    */

diff --git a/CesiumGltf/include/CesiumGltf/SharedAssetSystem.h b/CesiumGltf/include/CesiumGltf/SharedAssetSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumAsync/SharedFuture.h>
-#include <CesiumGltf/SharedAssetDepot.h>
 
 namespace CesiumGltf {
 
@@ -36,10 +36,11 @@ class SharedAssetSystem
         ->getOrFetch(asyncSystem, pAssetAccessor, factory, uri, headers);
   }
 
-  const SharedAssetDepot<CesiumGltf::ImageCesium>& image();
+  const CesiumAsync::SharedAssetDepot<CesiumGltf::ImageCesium>& image();
 
 private:
-  CesiumUtility::IntrusivePointer<SharedAssetDepot<CesiumGltf::ImageCesium>>
+  CesiumUtility::IntrusivePointer<
+      CesiumAsync::SharedAssetDepot<CesiumGltf::ImageCesium>>
       _pImages;
 };
 

diff --git a/CesiumGltf/include/CesiumGltf/TextureView.h b/CesiumGltf/include/CesiumGltf/TextureView.h
@@ -3,7 +3,6 @@
 #include <CesiumGltf/ImageCesium.h>
 #include <CesiumGltf/KhrTextureTransform.h>
 #include <CesiumGltf/Sampler.h>
-#include <CesiumGltf/SharedAssetDepot.h>
 #include <CesiumGltf/TextureInfo.h>
 #include <CesiumUtility/IntrusivePointer.h>
 

diff --git a/CesiumGltf/src/SharedAssetSystem.cpp b/CesiumGltf/src/SharedAssetSystem.cpp
@@ -4,11 +4,12 @@
 namespace CesiumGltf {
 
 SharedAssetSystem::SharedAssetSystem() noexcept
-    : _pImages(new SharedAssetDepot<CesiumGltf::ImageCesium>()) {}
+    : _pImages(new CesiumAsync::SharedAssetDepot<CesiumGltf::ImageCesium>()) {}
 
 SharedAssetSystem::~SharedAssetSystem() noexcept = default;
 
-const SharedAssetDepot<CesiumGltf::ImageCesium>& SharedAssetSystem::image() {
+const CesiumAsync::SharedAssetDepot<CesiumGltf::ImageCesium>&
+SharedAssetSystem::image() {
   return *this->_pImages;
 }
 

diff --git a/CesiumGltfReader/src/GltfReader.cpp b/CesiumGltfReader/src/GltfReader.cpp
@@ -11,11 +11,11 @@
 #include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumAsync/IAssetRequest.h>
 #include <CesiumAsync/IAssetResponse.h>
+#include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumGltf/ExtensionKhrTextureBasisu.h>
 #include <CesiumGltf/ExtensionTextureWebp.h>
 #include <CesiumGltf/ImageCesium.h>
 #include <CesiumGltf/Ktx2TranscodeTargets.h>
-#include <CesiumGltf/SharedAssetDepot.h>
 #include <CesiumJsonReader/JsonHandler.h>
 #include <CesiumJsonReader/JsonReader.h>
 #include <CesiumJsonReader/JsonReaderOptions.h>