pass asset accessor and request headers to tile content loading

CesiumGS · Sep 8, 2021 · b762be0 · b762be0
1 parent b68440a
commit b762be0
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 10 deletions.
diff --git a/Cesium3DTilesSelection/include/Cesium3DTilesSelection/ExternalTilesetContent.h b/Cesium3DTilesSelection/include/Cesium3DTilesSelection/ExternalTilesetContent.h
@@ -5,7 +5,6 @@
 #include "Cesium3DTilesSelection/TileContentLoadResult.h"
 #include "Cesium3DTilesSelection/TileContentLoader.h"
 #include "Cesium3DTilesSelection/TileRefine.h"
-#include "CesiumAsync/AsyncSystem.h"
 #include <cstddef>
 #include <gsl/span>
 #include <memory>
@@ -31,6 +30,8 @@ class CESIUM3DTILESSELECTION_API ExternalTilesetContent final
    */
   CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) override;
 
 private:

diff --git a/Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfContent.h b/Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfContent.h
@@ -30,6 +30,8 @@ class CESIUM3DTILESSELECTION_API GltfContent final : public TileContentLoader {
    */
   CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) override;
 
   /**

diff --git a/Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentFactory.h b/Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentFactory.h
@@ -93,6 +93,9 @@ class CESIUM3DTILESSELECTION_API TileContentFactory final {
    * If a matching loader is found, it will be applied to the given
    * input, and the result will be returned.
    *
+   * @param asyncSystem The async system to use during the loading.
+   * @param pAssetAccessor The asset accessor to use if needed.
+   * @param requestHeaders The request headers to be used if needed.
    * @param input The {@link TileContentLoadInput}.
    * @return The {@link TileContentLoadResult}, or `nullptr` if there is
    * no loader registered for the magic header of the given
@@ -101,6 +104,8 @@ class CESIUM3DTILESSELECTION_API TileContentFactory final {
   static CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
   createContent(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input);
 
 private:

diff --git a/Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoader.h b/Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoader.h
@@ -3,6 +3,10 @@
 #include "Cesium3DTilesSelection/TileContentLoadInput.h"
 #include "Cesium3DTilesSelection/TileContentLoadResult.h"
 #include "CesiumAsync/AsyncSystem.h"
+#include "CesiumAsync/IAssetAccessor.h"
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace Cesium3DTilesSelection {
 /**
@@ -17,12 +21,17 @@ class CESIUM3DTILESSELECTION_API TileContentLoader {
   /**
    * @brief Loads the tile content from the given input.
    *
+   * @param asyncSystem The async system to use during the loading.
+   * @param pAssetAccessor The asset accessor to use if needed.
+   * @param requestHeaders The request headers to be used if needed.
    * @param input The {@link TileContentLoadInput}
    * @return The {@link TileContentLoadResult}. This may be the `nullptr` if the
    * tile content could not be loaded.
    */
   virtual CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) = 0;
 };
 } // namespace Cesium3DTilesSelection
diff --git a/Cesium3DTilesSelection/src/Batched3DModelContent.cpp b/Cesium3DTilesSelection/src/Batched3DModelContent.cpp
@@ -77,6 +77,8 @@ rapidjson::Document parseFeatureTableJsonData(
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
 Batched3DModelContent::load(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& /*pAssetAccessor*/,
+    const std::vector<std::pair<std::string, std::string>>& /*requestHeaders*/,
     const TileContentLoadInput& input) {
   return asyncSystem.createResolvedFuture(
       load(input.pLogger, input.url, input.data));

diff --git a/Cesium3DTilesSelection/src/Batched3DModelContent.h b/Cesium3DTilesSelection/src/Batched3DModelContent.h
@@ -6,7 +6,6 @@
 #include "Cesium3DTilesSelection/TileContentLoader.h"
 #include "Cesium3DTilesSelection/TileID.h"
 #include "Cesium3DTilesSelection/TileRefine.h"
-#include "CesiumAsync/AsyncSystem.h"
 #include <cstddef>
 #include <memory>
 #include <spdlog/fwd.h>
@@ -30,6 +29,8 @@ class CESIUM3DTILESSELECTION_API Batched3DModelContent final
    */
   CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) override;
 
   /**

diff --git a/Cesium3DTilesSelection/src/CompositeContent.cpp b/Cesium3DTilesSelection/src/CompositeContent.cpp
@@ -65,6 +65,8 @@ TileContentLoadInput derive(
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
 CompositeContent::load(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+    const std::vector<std::pair<std::string, std::string>>& requestHeaders,
     const TileContentLoadInput& input) {
   CESIUM_TRACE("Cesium3DTilesSelection::CompositeContent::load");
   const std::shared_ptr<spdlog::logger>& pLogger = input.pLogger;
@@ -136,6 +138,8 @@ CompositeContent::load(
 
     innerTiles.push_back(std::move(TileContentFactory::createContent(
         asyncSystem,
+        pAssetAccessor,
+        requestHeaders,
         derive(input, innerData))));
   }
 

diff --git a/Cesium3DTilesSelection/src/CompositeContent.h b/Cesium3DTilesSelection/src/CompositeContent.h
@@ -6,7 +6,6 @@
 #include "Cesium3DTilesSelection/TileContentLoader.h"
 #include "Cesium3DTilesSelection/TileID.h"
 #include "Cesium3DTilesSelection/TileRefine.h"
-#include "CesiumAsync/AsyncSystem.h"
 #include <memory>
 #include <spdlog/fwd.h>
 #include <string>
@@ -23,6 +22,8 @@ class CESIUM3DTILESSELECTION_API CompositeContent final
 public:
   CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) override;
 };
 

diff --git a/Cesium3DTilesSelection/src/ExternalTilesetContent.cpp b/Cesium3DTilesSelection/src/ExternalTilesetContent.cpp
@@ -11,6 +11,8 @@ namespace Cesium3DTilesSelection {
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
 ExternalTilesetContent::load(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& /*pAssetAccessor*/,
+    const std::vector<std::pair<std::string, std::string>>& /*requestHeaders*/,
     const TileContentLoadInput& input) {
   return asyncSystem.createResolvedFuture(load(
       input.pLogger,

diff --git a/Cesium3DTilesSelection/src/GltfContent.cpp b/Cesium3DTilesSelection/src/GltfContent.cpp
@@ -16,6 +16,8 @@ namespace Cesium3DTilesSelection {
 
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> GltfContent::load(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& /*pAssetAccessor*/,
+    const std::vector<std::pair<std::string, std::string>>& /*requestHeaders*/,
     const TileContentLoadInput& input) {
   return asyncSystem.createResolvedFuture(
       load(input.pLogger, input.url, input.data));

diff --git a/Cesium3DTilesSelection/src/QuantizedMeshContent.cpp b/Cesium3DTilesSelection/src/QuantizedMeshContent.cpp
@@ -681,6 +681,8 @@ static std::vector<std::byte> generateNormals(
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
 QuantizedMeshContent::load(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& /*pAssetAccessor*/,
+    const std::vector<std::pair<std::string, std::string>>& /*requestHeaders*/,
     const TileContentLoadInput& input) {
   return asyncSystem.createResolvedFuture(load(
       input.pLogger,

diff --git a/Cesium3DTilesSelection/src/QuantizedMeshContent.h b/Cesium3DTilesSelection/src/QuantizedMeshContent.h
@@ -4,7 +4,6 @@
 #include "Cesium3DTilesSelection/Library.h"
 #include "Cesium3DTilesSelection/TileContentLoadResult.h"
 #include "Cesium3DTilesSelection/TileContentLoader.h"
-#include "CesiumAsync/AsyncSystem.h"
 #include <cstddef>
 
 namespace Cesium3DTilesSelection {
@@ -27,6 +26,8 @@ class CESIUM3DTILESSELECTION_API QuantizedMeshContent final
    */
   CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>> load(
       const CesiumAsync::AsyncSystem& asyncSystem,
+      const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+      const std::vector<std::pair<std::string, std::string>>& requestHeaders,
       const TileContentLoadInput& input) override;
 
   /**

diff --git a/Cesium3DTilesSelection/src/Tile.cpp b/Cesium3DTilesSelection/src/Tile.cpp
@@ -214,7 +214,6 @@ void Tile::loadContent() {
   this->setState(LoadState::ContentLoading);
 
   Tileset& tileset = *this->getTileset();
-  AsyncSystem& asyncSystem = tileset.getAsyncSystem();
 
   // TODO: support overlay mapping for tiles that aren't region-based.
   // Probably by creating a placeholder for each raster overlay and resolving it
@@ -296,7 +295,9 @@ void Tile::loadContent() {
            gltfUpAxis,
            pPrepareRendererResources =
                tileset.getExternals().pPrepareRendererResources,
-           &asyncSystem,
+           &asyncSystem = tileset.getAsyncSystem(),
+           pAssetAccessor = tileset.getExternals().pAssetAccessor,
+           &requestHeaders = this->_pContext->requestHeaders,
            pLogger = tileset.getExternals().pLogger,
            generateMissingNormalsSmooth =
                tileset.getOptions()
@@ -337,7 +338,11 @@ void Tile::loadContent() {
             loadInput.contentType = pResponse->contentType();
             loadInput.url = pRequest->url();
 
-            TileContentFactory::createContent(asyncSystem, loadInput)
+            TileContentFactory::createContent(
+                asyncSystem,
+                pAssetAccessor,
+                requestHeaders,
+                loadInput)
                 .thenInWorkerThread([httpStatusCode = pResponse->statusCode(),
                                      gltfUpAxis,
                                      loadInput = std::move(loadInput),

diff --git a/Cesium3DTilesSelection/src/TileContentFactory.cpp b/Cesium3DTilesSelection/src/TileContentFactory.cpp
@@ -32,14 +32,17 @@ void TileContentFactory::registerContentType(
 CesiumAsync::Future<std::unique_ptr<TileContentLoadResult>>
 TileContentFactory::createContent(
     const CesiumAsync::AsyncSystem& asyncSystem,
+    const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
+    const std::vector<std::pair<std::string, std::string>>& requestHeaders,
     const TileContentLoadInput& input) {
 
   const gsl::span<const std::byte>& data = input.data;
   std::string magic = TileContentFactory::getMagic(data).value_or("json");
 
   auto itMagic = TileContentFactory::_loadersByMagic.find(magic);
   if (itMagic != TileContentFactory::_loadersByMagic.end()) {
-    return itMagic->second->load(asyncSystem, input);
+    return itMagic->second
+        ->load(asyncSystem, pAssetAccessor, requestHeaders, input);
   }
 
   const std::string& contentType = input.contentType;
@@ -48,7 +51,8 @@ TileContentFactory::createContent(
   auto itContentType =
       TileContentFactory::_loadersByContentType.find(baseContentType);
   if (itContentType != TileContentFactory::_loadersByContentType.end()) {
-    return itContentType->second->load(asyncSystem, input);
+    return itContentType->second
+        ->load(asyncSystem, pAssetAccessor, requestHeaders, input);
   }
 
   // Determine if this is plausibly a JSON external tileset.
@@ -63,7 +67,8 @@ TileContentFactory::createContent(
     // Might be an external tileset, try loading it that way.
     itMagic = TileContentFactory::_loadersByMagic.find("json");
     if (itMagic != TileContentFactory::_loadersByMagic.end()) {
-      return itMagic->second->load(asyncSystem, input);
+      return itMagic->second
+          ->load(asyncSystem, pAssetAccessor, requestHeaders, input);
     }
   }