Fixed caching in Cesium AssetAccessor

gwaldron · Sep 15, 2023 · 289192c · 289192c
1 parent 2611449
commit 289192c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/osgEarthCesium/AssetAccessor b/src/osgEarthCesium/AssetAccessor
@@ -24,6 +24,8 @@
 
 #include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumAsync/IAssetResponse.h>
+#include <osgDB/Options>
+#include <osgEarth/Cache>
 
 namespace osgEarth {
     namespace Cesium
@@ -72,6 +74,8 @@ namespace osgEarth {
         class AssetAccessor : public CesiumAsync::IAssetAccessor
         {
         public:
+            AssetAccessor();
+
             virtual CesiumAsync::Future<std::shared_ptr<CesiumAsync::IAssetRequest>>
                 get(const CesiumAsync::AsyncSystem& asyncSystem,
                     const std::string& url,
@@ -87,6 +91,10 @@ namespace osgEarth {
                     const gsl::span<const std::byte>& contentPayload) override;
 
             virtual void tick() noexcept override;
+
+        private:
+            osg::ref_ptr< osgDB::Options > _options;
+            osg::ref_ptr<CacheSettings> _cacheSettings;
         };
     }
 }

diff --git a/src/osgEarthCesium/AssetAccessor.cpp b/src/osgEarthCesium/AssetAccessor.cpp
@@ -23,6 +23,7 @@
 
 #include <osgEarth/Notify>
 #include <osgEarth/URI>
+#include <osgEarth/Registry>
 
 using namespace osgEarth;
 using namespace osgEarth::Cesium;
@@ -85,25 +86,35 @@ gsl::span<const std::byte> AssetResponse::data() const
 
 /**********************************************/
 
+AssetAccessor::AssetAccessor()
+{
+    _options = new osgDB::Options;
+    _cacheSettings = new CacheSettings;
+    _cacheSettings->setCache(Registry::instance()->getDefaultCache());
+    _cacheSettings->store(_options.get());
+}
+
 CesiumAsync::Future<std::shared_ptr<CesiumAsync::IAssetRequest>>
 AssetAccessor::get(const CesiumAsync::AsyncSystem& asyncSystem,
     const std::string& url,
     const std::vector<CesiumAsync::IAssetAccessor::THeader>& headers)
 {
+    osg::ref_ptr<osgDB::Options> options = _options.get();
     auto request = std::make_shared<AssetRequest>("GET", url, headers);
     return asyncSystem.createFuture<std::shared_ptr<CesiumAsync::IAssetRequest>>(
         [&](const auto& promise)
         {
-            asyncSystem.runInWorkerThread([promise, request, url, headers]() {
+            asyncSystem.runInWorkerThread([promise, request, url, headers, options]() {
                 // This should run in another thread.
                 URIContext uriContext;
                 for (auto header : headers)
                 {
                     uriContext.addHeader(header.first, header.second);
                 }
-
+                
                 URI uri(url, uriContext);
-                auto httpResponse = uri.readString();
+
+                auto httpResponse = uri.readString(options.get());
                 std::unique_ptr< AssetResponse > response = std::make_unique< AssetResponse >();
 
                 if (httpResponse.code() == ReadResult::RESULT_OK)