updated from main repo and fixed problems

EzioHelios · Dec 13, 2023 · 4dc0d3e · 4dc0d3e
1 parent ddbb610
commit 4dc0d3e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/...election/WebMapTileServiceRasterOverlay.h → ...Overlays/WebMapTileServiceRasterOverlay.h b/...election/WebMapTileServiceRasterOverlay.h → ...Overlays/WebMapTileServiceRasterOverlay.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <vector>
 
-namespace Cesium3DTilesSelection {
+namespace CesiumRasterOverlays {
 
 class CreditSystem;
 
@@ -128,7 +128,7 @@ struct WebMapTileServiceRasterOverlayOptions {
 /**
  * @brief A {@link RasterOverlay} based on tile map service imagery.
  */
-class CESIUM3DTILESSELECTION_API WebMapTileServiceRasterOverlay final
+class CESIUMRASTEROVERLAYS_API WebMapTileServiceRasterOverlay final
     : public RasterOverlay {
 public:
   /**
@@ -152,8 +152,8 @@ class CESIUM3DTILESSELECTION_API WebMapTileServiceRasterOverlay final
   virtual CesiumAsync::Future<CreateTileProviderResult> createTileProvider(
       const CesiumAsync::AsyncSystem& asyncSystem,
       const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
-      const std::shared_ptr<CreditSystem>& pCreditSystem,
-      const std::shared_ptr<IPrepareRendererResources>&
+      const std::shared_ptr<CesiumUtility::CreditSystem>& pCreditSystem,
+      const std::shared_ptr<IPrepareRasterOverlayRendererResources>&
           pPrepareRendererResources,
       const std::shared_ptr<spdlog::logger>& pLogger,
       CesiumUtility::IntrusivePointer<const RasterOverlay> pOwner)
@@ -165,4 +165,4 @@ class CESIUM3DTILESSELECTION_API WebMapTileServiceRasterOverlay final
   WebMapTileServiceRasterOverlayOptions _options;
 };
 
-} // namespace Cesium3DTilesSelection
+} // namespace CesiumRasterOverlays
diff --git a/...on/src/WebMapTileServiceRasterOverlay.cpp → ...ys/src/WebMapTileServiceRasterOverlay.cpp b/...on/src/WebMapTileServiceRasterOverlay.cpp → ...ys/src/WebMapTileServiceRasterOverlay.cpp
@@ -1,17 +1,12 @@
-#include "Cesium3DTilesSelection/WebMapTileServiceRasterOverlay.h"
-
-#include "Cesium3DTilesSelection/CreditSystem.h"
-#include "Cesium3DTilesSelection/QuadtreeRasterOverlayTileProvider.h"
-#include "Cesium3DTilesSelection/RasterOverlayLoadFailureDetails.h"
-#include "Cesium3DTilesSelection/RasterOverlayTile.h"
-#include "Cesium3DTilesSelection/TilesetExternals.h"
-#include "Cesium3DTilesSelection/spdlog-cesium.h"
-#include "Cesium3DTilesSelection/tinyxml-cesium.h"
-
 #include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumAsync/IAssetResponse.h>
 #include <CesiumGeospatial/GlobeRectangle.h>
 #include <CesiumGeospatial/Projection.h>
+#include <CesiumRasterOverlays/QuadtreeRasterOverlayTileProvider.h>
+#include <CesiumRasterOverlays/RasterOverlayLoadFailureDetails.h>
+#include <CesiumRasterOverlays/RasterOverlayTile.h>
+#include <CesiumRasterOverlays/WebMapTileServiceRasterOverlay.h>
+#include <CesiumUtility/CreditSystem.h>
 #include <CesiumUtility/Uri.h>
 
 #include <cstddef>
@@ -20,7 +15,7 @@
 using namespace CesiumAsync;
 using namespace CesiumUtility;
 
-namespace Cesium3DTilesSelection {
+namespace CesiumRasterOverlays {
 
 class WebMapTileServiceTileProvider final
     : public QuadtreeRasterOverlayTileProvider {
@@ -30,7 +25,7 @@ class WebMapTileServiceTileProvider final
       const CesiumAsync::AsyncSystem& asyncSystem,
       const std::shared_ptr<IAssetAccessor>& pAssetAccessor,
       std::optional<Credit> credit,
-      const std::shared_ptr<IPrepareRendererResources>&
+      const std::shared_ptr<IPrepareRasterOverlayRendererResources>&
           pPrepareRendererResources,
       const std::shared_ptr<spdlog::logger>& pLogger,
       const CesiumGeospatial::Projection& projection,
@@ -184,8 +179,9 @@ Future<RasterOverlay::CreateTileProviderResult>
 WebMapTileServiceRasterOverlay::createTileProvider(
     const CesiumAsync::AsyncSystem& asyncSystem,
     const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
-    const std::shared_ptr<CreditSystem>& pCreditSystem,
-    const std::shared_ptr<IPrepareRendererResources>& pPrepareRendererResources,
+    const std::shared_ptr<CesiumUtility::CreditSystem>& pCreditSystem,
+    const std::shared_ptr<IPrepareRasterOverlayRendererResources>&
+        pPrepareRendererResources,
     const std::shared_ptr<spdlog::logger>& pLogger,
     CesiumUtility::IntrusivePointer<const RasterOverlay> pOwner) const {
 
@@ -316,4 +312,4 @@ WebMapTileServiceRasterOverlay::createTileProvider(
               subdomains));
 }
 
-} // namespace Cesium3DTilesSelection
+} // namespace CesiumRasterOverlays