Pass factory to asset depot constructor

CesiumGS · Oct 11, 2024 · 38b4811 · 38b4811
1 parent 3e5eb71
commit 38b4811
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 41 deletions.
diff --git a/Cesium3DTilesSelection/src/TilesetContentManager.cpp b/Cesium3DTilesSelection/src/TilesetContentManager.cpp
@@ -666,7 +666,9 @@ TilesetContentManager::TilesetContentManager(
       _tileLoadsInProgress{0},
       _loadedTilesCount{0},
       _tilesDataUsed{0},
-      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault()),
+      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault(
+          CesiumGltfReader::AssetSystemOptions{
+              tilesetOptions.contentOptions.ktx2TranscodeTargets})),
       _destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
       _destructionCompleteFuture{
           this->_destructionCompletePromise.getFuture().share()},
@@ -696,7 +698,9 @@ TilesetContentManager::TilesetContentManager(
       _tileLoadsInProgress{0},
       _loadedTilesCount{0},
       _tilesDataUsed{0},
-      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault()),
+      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault(
+          CesiumGltfReader::AssetSystemOptions{
+              tilesetOptions.contentOptions.ktx2TranscodeTargets})),
       _destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
       _destructionCompleteFuture{
           this->_destructionCompletePromise.getFuture().share()},
@@ -848,7 +852,9 @@ TilesetContentManager::TilesetContentManager(
       _tileLoadsInProgress{0},
       _loadedTilesCount{0},
       _tilesDataUsed{0},
-      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault()),
+      _pSharedAssets(CesiumGltfReader::GltfSharedAssetSystem::getDefault(
+          CesiumGltfReader::AssetSystemOptions{
+              tilesetOptions.contentOptions.ktx2TranscodeTargets})),
       _destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
       _destructionCompleteFuture{
           this->_destructionCompletePromise.getFuture().share()},

diff --git a/CesiumAsync/include/CesiumAsync/SharedAssetDepot.h b/CesiumAsync/include/CesiumAsync/SharedAssetDepot.h
@@ -20,6 +20,12 @@ namespace CesiumAsync {
 
 template <typename T> class SharedAsset;
 
+template <typename AssetType> class AssetFactory {
+public:
+  virtual CesiumUtility::IntrusivePointer<AssetType>
+  createFrom(const gsl::span<const gsl::byte>& data) const = 0;
+};
+
 /**
  * A depot for {@link SharedAsset} instances, which are potentially shared between multiple objects.
  * @tparam AssetType The type of asset stored in this depot. This should usually
@@ -44,7 +50,8 @@ class CESIUMASYNC_API SharedAssetDepot
    */
   int64_t staleAssetSizeLimit = 16 * 1024 * 1024;
 
-  SharedAssetDepot() = default;
+  SharedAssetDepot(std::unique_ptr<AssetFactory<AssetType>> _factory)
+      : factory(std::move(_factory)) {}
 
   ~SharedAssetDepot() {
     // It's possible the assets will outlive the depot, if they're still in use.
@@ -102,12 +109,10 @@ class CESIUMASYNC_API SharedAssetDepot
    * If the asset has already started loading in this depot but hasn't finished,
    * its future will be returned.
    */
-  template <typename Factory>
   CesiumAsync::SharedFuture<CesiumUtility::IntrusivePointer<AssetType>>
   getOrFetch(
       const CesiumAsync::AsyncSystem& asyncSystem,
       const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
-      const Factory& factory,
       const std::string& uri,
       const std::vector<CesiumAsync::IAssetAccessor::THeader>& headers) {
     // We need to avoid:
@@ -138,16 +143,15 @@ class CESIUMASYNC_API SharedAssetDepot
     CesiumAsync::Future<CesiumUtility::IntrusivePointer<AssetType>> future =
         pAssetAccessor->get(asyncSystem, uri, headers)
             .thenInWorkerThread(
-                [factory = std::move(factory)](
-                    std::shared_ptr<CesiumAsync::IAssetRequest>&& pRequest)
+                [this](std::shared_ptr<CesiumAsync::IAssetRequest>&& pRequest)
                     -> CesiumUtility::IntrusivePointer<AssetType> {
                   const CesiumAsync::IAssetResponse* pResponse =
                       pRequest->response();
                   if (!pResponse) {
                     return nullptr;
                   }
 
-                  return factory.createFrom(pResponse->data());
+                  return this->factory->createFrom(pResponse->data());
                 })
             // Do this in main thread since we're messing with the collections.
             .thenInMainThread(
@@ -271,6 +275,9 @@ class CESIUMASYNC_API SharedAssetDepot
   // Mutex for modifying the deletionCandidates list.
   mutable std::mutex deletionCandidatesMutex;
 
+  // The factory used to create new AssetType instances.
+  std::unique_ptr<AssetFactory<AssetType>> factory;
+
   friend class SharedAsset<AssetType>;
 };
 

diff --git a/CesiumGltfReader/include/CesiumGltfReader/GltfReader.h b/CesiumGltfReader/include/CesiumGltfReader/GltfReader.h
@@ -115,7 +115,7 @@ struct CESIUMGLTFREADER_API GltfReaderOptions {
    * that might appear in this glTF.
    */
   CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> pSharedAssets =
-      GltfSharedAssetSystem::getDefault();
+      nullptr;
 };
 
 /**

diff --git a/CesiumGltfReader/include/CesiumGltfReader/GltfSharedAssetSystem.h b/CesiumGltfReader/include/CesiumGltfReader/GltfSharedAssetSystem.h
@@ -2,21 +2,28 @@
 
 #include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumAsync/SharedFuture.h>
+#include <CesiumGltf/Ktx2TranscodeTargets.h>
 
 namespace CesiumGltf {
 struct ImageAsset;
 }
 
 namespace CesiumGltfReader {
 
+class AssetSystemOptions {
+public:
+  CesiumGltf::Ktx2TranscodeTargets ktx2TranscodeTargets;
+};
+
 /**
  * @brief Contains assets that are potentially shared across multiple glTF
  * models.
  */
 class GltfSharedAssetSystem
     : public CesiumUtility::ReferenceCountedThreadSafe<GltfSharedAssetSystem> {
 public:
-  static CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> getDefault();
+  static CesiumUtility::IntrusivePointer<GltfSharedAssetSystem>
+  getDefault(const AssetSystemOptions& options);
 
   CesiumUtility::IntrusivePointer<
       CesiumAsync::SharedAssetDepot<CesiumGltf::ImageAsset>>

diff --git a/CesiumGltfReader/include/CesiumGltfReader/ImageDecoder.h b/CesiumGltfReader/include/CesiumGltfReader/ImageDecoder.h
@@ -1,6 +1,7 @@
 #include "CesiumGltf/ImageAsset.h"
 #include "CesiumGltfReader/Library.h"
 
+#include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumUtility/IntrusivePointer.h>
 
 #include <gsl/span>
@@ -66,4 +67,24 @@ class ImageDecoder {
   generateMipMaps(CesiumGltf::ImageAsset& image);
 };
 
+/**
+ * Used to construct an ImageAsset.
+ */
+struct ImageAssetFactory : CesiumAsync::AssetFactory<CesiumGltf::ImageAsset> {
+  ImageAssetFactory(
+      const CesiumGltf::Ktx2TranscodeTargets& ktx2TranscodeTargets_)
+      : ktx2TranscodeTargets(ktx2TranscodeTargets_) {}
+
+  CesiumUtility::IntrusivePointer<CesiumGltf::ImageAsset>
+  createFrom(const gsl::span<const gsl::byte>& data) const override {
+    CesiumGltfReader::ImageReaderResult imageResult =
+        ImageDecoder::readImage(data, this->ktx2TranscodeTargets);
+    // TODO: report warnings and errors!
+    return imageResult.pImage;
+  }
+
+private:
+  const CesiumGltf::Ktx2TranscodeTargets ktx2TranscodeTargets;
+};
+
 } // namespace CesiumGltfReader
diff --git a/CesiumGltfReader/src/GltfReader.cpp b/CesiumGltfReader/src/GltfReader.cpp
@@ -41,26 +41,6 @@ using namespace CesiumJsonReader;
 using namespace CesiumUtility;
 
 namespace {
-
-/**
- * Used to construct an ImageAsset.
- */
-struct ImageAssetFactory {
-  ImageAssetFactory(const Ktx2TranscodeTargets& ktx2TranscodeTargets_)
-      : ktx2TranscodeTargets(ktx2TranscodeTargets_) {}
-
-  CesiumUtility::IntrusivePointer<ImageAsset>
-  createFrom(const gsl::span<const gsl::byte>& data) const {
-    ImageReaderResult imageResult =
-        ImageDecoder::readImage(data, this->ktx2TranscodeTargets);
-    // TODO: report warnings and errors!
-    return imageResult.pImage;
-  }
-
-private:
-  const Ktx2TranscodeTargets ktx2TranscodeTargets;
-};
-
 #pragma pack(push, 1)
 struct GlbHeader {
   uint32_t magic;
@@ -581,12 +561,8 @@ void CesiumGltfReader::GltfReader::postprocessGltf(
                     .share();
               } else {
                 // We have a depot, this is easy!
-                return options.pSharedAssets->pImage->getOrFetch(
-                    asyncSystem,
-                    pAssetAccessor,
-                    ImageAssetFactory(options.ktx2TranscodeTargets),
-                    uri,
-                    headers);
+                return options.pSharedAssets->pImage
+                    ->getOrFetch(asyncSystem, pAssetAccessor, uri, headers);
               }
             };
 

diff --git a/CesiumGltfReader/src/GltfSharedAssetSystem.cpp b/CesiumGltfReader/src/GltfSharedAssetSystem.cpp
@@ -1,25 +1,29 @@
 #include <CesiumGltf/ImageAsset.h>
 #include <CesiumGltfReader/GltfSharedAssetSystem.h>
+#include <CesiumGltfReader/ImageDecoder.h>
+#include <CesiumGltfReader/ImageReader.h>
 
 namespace CesiumGltfReader {
 
 namespace {
 
-CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> createDefault() {
+CesiumUtility::IntrusivePointer<GltfSharedAssetSystem>
+createDefault(const AssetSystemOptions& options) {
   CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> p =
       new GltfSharedAssetSystem();
 
-  p->pImage.emplace();
+  p->pImage.emplace(
+      std::make_unique<ImageAssetFactory>(options.ktx2TranscodeTargets));
 
   return p;
 }
 
 } // namespace
 
 /*static*/ CesiumUtility::IntrusivePointer<GltfSharedAssetSystem>
-GltfSharedAssetSystem::getDefault() {
+GltfSharedAssetSystem::getDefault(const AssetSystemOptions& options) {
   static CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> pDefault =
-      createDefault();
+      createDefault(options);
   return pDefault;
 }