Add CesiumImpl class.

CesiumGS · Sep 6, 2024 · 22eb15f · 22eb15f
1 parent e4dae96
commit 22eb15f
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 71 deletions.
diff --git a/native~/Editor/src/CesiumEditorWindowImpl.h b/native~/Editor/src/CesiumEditorWindowImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <CesiumUtility/ReferenceCounted.h>
+#include "CesiumImpl.h"
 
 #include <DotNet/CesiumForUnity/Cesium3DTileset.h>
 #include <DotNet/System/String.h>
@@ -15,8 +15,7 @@ class CesiumEditorWindow;
 
 namespace CesiumForUnityNative {
 
-class CesiumEditorWindowImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumEditorWindowImpl> {
+class CesiumEditorWindowImpl : public CesiumImpl<CesiumEditorWindowImpl> {
 
 public:
   CesiumEditorWindowImpl(

diff --git a/native~/Editor/src/CesiumIonSessionImpl.h b/native~/Editor/src/CesiumIonSessionImpl.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumAsync/AsyncSystem.h>
 #include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumAsync/SharedFuture.h>
@@ -8,7 +10,6 @@
 #include <CesiumIonClient/Defaults.h>
 #include <CesiumIonClient/Profile.h>
 #include <CesiumIonClient/Token.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/System/Collections/Generic/List1.h>
 #include <DotNet/System/String.h>
@@ -34,8 +35,7 @@ class Token;
 } // namespace CesiumIonClient
 
 namespace CesiumForUnityNative {
-class CesiumIonSessionImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumIonSessionImpl> {
+class CesiumIonSessionImpl : public CesiumImpl<CesiumIonSessionImpl> {
 public:
   CesiumIonSessionImpl(const DotNet::CesiumForUnity::CesiumIonSession& session);
   ~CesiumIonSessionImpl();

diff --git a/native~/Editor/src/IonAssetsTreeViewImpl.h b/native~/Editor/src/IonAssetsTreeViewImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumIonClient/Assets.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/IonAssetsColumn.h>
 #include <DotNet/System/String.h>
@@ -16,8 +17,7 @@ class IonAssetsTreeView;
 
 namespace CesiumForUnityNative {
 
-class IonAssetsTreeViewImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<IonAssetsTreeViewImpl> {
+class IonAssetsTreeViewImpl : public CesiumImpl<IonAssetsTreeViewImpl> {
 public:
   IonAssetsTreeViewImpl(
       const DotNet::CesiumForUnity::IonAssetsTreeView& treeView);

diff --git a/native~/Editor/src/SelectIonTokenWindowImpl.h b/native~/Editor/src/SelectIonTokenWindowImpl.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumAsync/AsyncSystem.h>
 #include <CesiumIonClient/Token.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/IonTokenSource.h>
 #include <DotNet/System/String.h>
@@ -18,9 +19,7 @@ class CesiumIonServer;
 
 namespace CesiumForUnityNative {
 
-class SelectIonTokenWindowImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          SelectIonTokenWindowImpl> {
+class SelectIonTokenWindowImpl : public CesiumImpl<SelectIonTokenWindowImpl> {
 
 public:
   static CesiumAsync::SharedFuture<std::optional<CesiumIonClient::Token>>

diff --git a/native~/Runtime/src/Cesium3DTilesetImpl.h b/native~/Runtime/src/Cesium3DTilesetImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <Cesium3DTilesSelection/ViewUpdateResult.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumCreditSystem.h>
 #include <DotNet/CesiumForUnity/CesiumGeoreference.h>
@@ -26,8 +27,7 @@ class Tileset;
 
 namespace CesiumForUnityNative {
 
-class Cesium3DTilesetImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<Cesium3DTilesetImpl> {
+class Cesium3DTilesetImpl : public CesiumImpl<Cesium3DTilesetImpl> {
 public:
   Cesium3DTilesetImpl(const DotNet::CesiumForUnity::Cesium3DTileset& tileset);
   ~Cesium3DTilesetImpl();

diff --git a/native~/Runtime/src/CesiumBingMapsRasterOverlayImpl.h b/native~/Runtime/src/CesiumBingMapsRasterOverlayImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/IntrusivePointer.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -15,8 +16,7 @@ class BingMapsRasterOverlay;
 namespace CesiumForUnityNative {
 
 class CesiumBingMapsRasterOverlayImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumBingMapsRasterOverlayImpl> {
+    : public CesiumImpl<CesiumBingMapsRasterOverlayImpl> {
 public:
   CesiumBingMapsRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumBingMapsRasterOverlay& overlay);

diff --git a/native~/Runtime/src/CesiumCreditSystemImpl.h b/native~/Runtime/src/CesiumCreditSystemImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/CreditSystem.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumCredit.h>
 #include <DotNet/System/Collections/Generic/List1.h>
@@ -22,8 +23,7 @@ struct Credit;
 
 namespace CesiumForUnityNative {
 
-class CesiumCreditSystemImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumCreditSystemImpl> {
+class CesiumCreditSystemImpl : public CesiumImpl<CesiumCreditSystemImpl> {
 public:
   CesiumCreditSystemImpl(
       const DotNet::CesiumForUnity::CesiumCreditSystem& creditSystem);

diff --git a/native~/Runtime/src/CesiumDebugColorizeTilesRasterOverlayImpl.h b/native~/Runtime/src/CesiumDebugColorizeTilesRasterOverlayImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/IntrusivePointer.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -15,8 +16,7 @@ class DebugColorizeTilesRasterOverlay;
 namespace CesiumForUnityNative {
 
 class CesiumDebugColorizeTilesRasterOverlayImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumDebugColorizeTilesRasterOverlayImpl> {
+    : public CesiumImpl<CesiumDebugColorizeTilesRasterOverlayImpl> {
 public:
   CesiumDebugColorizeTilesRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumDebugColorizeTilesRasterOverlay&

diff --git a/native~/Runtime/src/CesiumEllipsoidImpl.h b/native~/Runtime/src/CesiumEllipsoidImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGeospatial/Ellipsoid.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/Unity/Mathematics/double3.h>
 
@@ -13,8 +14,7 @@ class CesiumEllipsoid;
 
 namespace CesiumForUnityNative {
 
-class CesiumEllipsoidImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumEllipsoidImpl> {
+class CesiumEllipsoidImpl : public CesiumImpl<CesiumEllipsoidImpl> {
 public:
   CesiumEllipsoidImpl(
       const DotNet::CesiumForUnity::CesiumEllipsoid& unityEllipsoid);

diff --git a/native~/Runtime/src/CesiumFeatureIdAttributeImpl.h b/native~/Runtime/src/CesiumFeatureIdAttributeImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGltf/AccessorUtility.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class CesiumFeatureIdAttribute;
@@ -14,8 +15,7 @@ struct MeshPrimitive;
 
 namespace CesiumForUnityNative {
 class CesiumFeatureIdAttributeImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumFeatureIdAttributeImpl> {
+    : public CesiumImpl<CesiumFeatureIdAttributeImpl> {
 public:
   CesiumFeatureIdAttributeImpl(
       const DotNet::CesiumForUnity::CesiumFeatureIdAttribute&

diff --git a/native~/Runtime/src/CesiumFeatureIdTextureImpl.h b/native~/Runtime/src/CesiumFeatureIdTextureImpl.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGltf/AccessorUtility.h>
 #include <CesiumGltf/FeatureIdTextureView.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class CesiumFeatureIdTexture;
@@ -21,8 +22,7 @@ struct FeatureIdTexture;
 
 namespace CesiumForUnityNative {
 class CesiumFeatureIdTextureImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumFeatureIdTextureImpl> {
+    : public CesiumImpl<CesiumFeatureIdTextureImpl> {
 public:
   CesiumFeatureIdTextureImpl(
       const DotNet::CesiumForUnity::CesiumFeatureIdTexture& featureIdTexture);

diff --git a/native~/Runtime/src/CesiumFeatureImpl.h b/native~/Runtime/src/CesiumFeatureImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGltf/PropertyTablePropertyView.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumMetadataValue.h>
 #include <DotNet/CesiumForUnity/MetadataType.h>
@@ -45,8 +46,7 @@ using ValueType = swl::variant<
     CesiumGltf::PropertyArrayView<bool>,
     CesiumGltf::PropertyArrayView<std::string_view>>;
 
-class CesiumFeatureImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumFeatureImpl> {
+class CesiumFeatureImpl : public CesiumImpl<CesiumFeatureImpl> {
 public:
   CesiumFeatureImpl(const DotNet::CesiumForUnity::CesiumFeature& feature);
   ~CesiumFeatureImpl();

diff --git a/native~/Runtime/src/CesiumGeoreferenceImpl.h b/native~/Runtime/src/CesiumGeoreferenceImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGeospatial/LocalHorizontalCoordinateSystem.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/Unity/Mathematics/double3.h>
 #include <DotNet/Unity/Mathematics/double4x4.h>
@@ -17,8 +18,7 @@ class Transform;
 }
 
 namespace CesiumForUnityNative {
-class CesiumGeoreferenceImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumGeoreferenceImpl> {
+class CesiumGeoreferenceImpl : public CesiumImpl<CesiumGeoreferenceImpl> {
 public:
   CesiumGeoreferenceImpl(
       const DotNet::CesiumForUnity::CesiumGeoreference& georeference);

diff --git a/native~/Runtime/src/CesiumIonRasterOverlayImpl.h b/native~/Runtime/src/CesiumIonRasterOverlayImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/IntrusivePointer.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -15,8 +16,7 @@ class IonRasterOverlay;
 namespace CesiumForUnityNative {
 
 class CesiumIonRasterOverlayImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumIonRasterOverlayImpl> {
+    : public CesiumImpl<CesiumIonRasterOverlayImpl> {
 public:
   CesiumIonRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumIonRasterOverlay& overlay);

diff --git a/native~/Runtime/src/CesiumMetadataImpl.h b/native~/Runtime/src/CesiumMetadataImpl.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGltf/AccessorUtility.h>
 #include <CesiumGltf/Model.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumFeature.h>
 #include <DotNet/System/Array1.h>
@@ -22,8 +23,7 @@ class Transform;
 
 namespace CesiumForUnityNative {
 
-class CesiumMetadataImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumMetadataImpl> {
+class CesiumMetadataImpl : public CesiumImpl<CesiumMetadataImpl> {
 public:
   CesiumMetadataImpl(const DotNet::CesiumForUnity::CesiumMetadata& metadata);
   ~CesiumMetadataImpl();

diff --git a/native~/Runtime/src/CesiumPolygonRasterOverlayImpl.h b/native~/Runtime/src/CesiumPolygonRasterOverlayImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/IntrusivePointer.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/System/Collections/Generic/List1.h>
 
@@ -27,8 +28,7 @@ class CartographicPolygon;
 namespace CesiumForUnityNative {
 
 class CesiumPolygonRasterOverlayImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumPolygonRasterOverlayImpl> {
+    : public CesiumImpl<CesiumPolygonRasterOverlayImpl> {
 public:
   CesiumPolygonRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumPolygonRasterOverlay& overlay);

diff --git a/native~/Runtime/src/CesiumPropertyTablePropertyImpl.h b/native~/Runtime/src/CesiumPropertyTablePropertyImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <CesiumUtility/ReferenceCounted.h>
+#include "CesiumImpl.h"
 
 #include <any>
 #include <cstdint>
@@ -46,8 +46,7 @@ class double4x4;
 namespace CesiumForUnityNative {
 
 class CesiumPropertyTablePropertyImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumPropertyTablePropertyImpl> {
+    : public CesiumImpl<CesiumPropertyTablePropertyImpl> {
 public:
   CesiumPropertyTablePropertyImpl(
       const DotNet::CesiumForUnity::CesiumPropertyTableProperty& property);

diff --git a/native~/Runtime/src/CesiumSimplePlanarEllipsoidCurveImpl.h b/native~/Runtime/src/CesiumSimplePlanarEllipsoidCurveImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumGeospatial/SimplePlanarEllipsoidCurve.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumEllipsoid.h>
 #include <DotNet/Unity/Mathematics/double3.h>
@@ -19,8 +20,7 @@ struct double3;
 namespace CesiumForUnityNative {
 
 class CesiumSimplePlanarEllipsoidCurveImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumSimplePlanarEllipsoidCurveImpl> {
+    : public CesiumImpl<CesiumSimplePlanarEllipsoidCurveImpl> {
 public:
   CesiumSimplePlanarEllipsoidCurveImpl(
       const DotNet::CesiumForUnity::CesiumSimplePlanarEllipsoidCurve& path);

diff --git a/native~/Runtime/src/CesiumTileMapServiceRasterOverlayImpl.h b/native~/Runtime/src/CesiumTileMapServiceRasterOverlayImpl.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "CesiumImpl.h"
+
 #include <CesiumUtility/IntrusivePointer.h>
-#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -15,8 +16,7 @@ class TileMapServiceRasterOverlay;
 namespace CesiumForUnityNative {
 
 class CesiumTileMapServiceRasterOverlayImpl
-    : public CesiumUtility::ReferenceCountedThreadSafe<
-          CesiumTileMapServiceRasterOverlayImpl> {
+    : public CesiumImpl<CesiumTileMapServiceRasterOverlayImpl> {
 public:
   CesiumTileMapServiceRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumTileMapServiceRasterOverlay& overlay);