Reference count Impl classes instead of strict ownership.

kring · kring · commit e4dae962cbbb · 2024-09-06T18:12:36.000+10:00
diff --git a/Reinterop~/MethodsImplementedInCpp.cs b/Reinterop~/MethodsImplementedInCpp.cs
@@ -33,7 +33,9 @@ public static void Generate(CppGenerationContext context, TypeToGenerate item, G
                     #endif
                     void* {{createName}}(void* handle) {
                       const {{wrapperType.GetFullyQualifiedName()}} wrapper{{{objectHandleType.GetFullyQualifiedName()}}(handle)};
-                      return reinterpret_cast<void*>(new {{implType.GetFullyQualifiedName()}}(wrapper));
+                      auto pImpl = new {{implType.GetFullyQualifiedName()}}(wrapper);
+                      pImpl->addReference();
+                      return reinterpret_cast<void*>(pImpl);
                     }
                     """,
                     TypeDefinitionsReferenced: new[]
@@ -68,7 +70,7 @@ private void CreateImplementation()
                     #endif
                     void {{destroyName}}(void* pImpl) {
                       auto pImplTyped = reinterpret_cast<{{implType.GetFullyQualifiedName()}}*>(pImpl);
-                      delete pImplTyped;
+                      if (pImplTyped) pImplTyped->releaseReference();
                     }
                     """,
                     TypeDefinitionsReferenced: new[]
diff --git a/native~/Editor/src/CesiumEditorWindowImpl.h b/native~/Editor/src/CesiumEditorWindowImpl.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <CesiumUtility/ReferenceCounted.h>
+
 #include <DotNet/CesiumForUnity/Cesium3DTileset.h>
 #include <DotNet/System/String.h>
 #include <DotNet/UnityEngine/GameObject.h>
@@ -13,7 +15,8 @@ class CesiumEditorWindow;
 
 namespace CesiumForUnityNative {
 
-class CesiumEditorWindowImpl {
+class CesiumEditorWindowImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumEditorWindowImpl> {
 
 public:
   CesiumEditorWindowImpl(
diff --git a/native~/Editor/src/CesiumIonSessionImpl.h b/native~/Editor/src/CesiumIonSessionImpl.h
@@ -8,6 +8,7 @@
 #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>
@@ -33,7 +34,8 @@ class Token;
 } // namespace CesiumIonClient
 
 namespace CesiumForUnityNative {
-class CesiumIonSessionImpl {
+class CesiumIonSessionImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumIonSessionImpl> {
 public:
   CesiumIonSessionImpl(const DotNet::CesiumForUnity::CesiumIonSession& session);
   ~CesiumIonSessionImpl();
diff --git a/native~/Editor/src/IonAssetsTreeViewImpl.h b/native~/Editor/src/IonAssetsTreeViewImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumIonClient/Assets.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/IonAssetsColumn.h>
 #include <DotNet/System/String.h>
@@ -15,7 +16,8 @@ class IonAssetsTreeView;
 
 namespace CesiumForUnityNative {
 
-class IonAssetsTreeViewImpl {
+class IonAssetsTreeViewImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<IonAssetsTreeViewImpl> {
 public:
   IonAssetsTreeViewImpl(
       const DotNet::CesiumForUnity::IonAssetsTreeView& treeView);
diff --git a/native~/Editor/src/SelectIonTokenWindowImpl.h b/native~/Editor/src/SelectIonTokenWindowImpl.h
@@ -2,6 +2,7 @@
 
 #include <CesiumAsync/AsyncSystem.h>
 #include <CesiumIonClient/Token.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/IonTokenSource.h>
 #include <DotNet/System/String.h>
@@ -17,7 +18,9 @@ class CesiumIonServer;
 
 namespace CesiumForUnityNative {
 
-class SelectIonTokenWindowImpl {
+class SelectIonTokenWindowImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          SelectIonTokenWindowImpl> {
 
 public:
   static CesiumAsync::SharedFuture<std::optional<CesiumIonClient::Token>>
diff --git a/native~/Runtime/src/Cesium3DTilesetImpl.h b/native~/Runtime/src/Cesium3DTilesetImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Cesium3DTilesSelection/ViewUpdateResult.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumCreditSystem.h>
 #include <DotNet/CesiumForUnity/CesiumGeoreference.h>
@@ -25,7 +26,8 @@ class Tileset;
 
 namespace CesiumForUnityNative {
 
-class Cesium3DTilesetImpl {
+class Cesium3DTilesetImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<Cesium3DTilesetImpl> {
 public:
   Cesium3DTilesetImpl(const DotNet::CesiumForUnity::Cesium3DTileset& tileset);
   ~Cesium3DTilesetImpl();
diff --git a/native~/Runtime/src/CesiumBingMapsRasterOverlayImpl.h b/native~/Runtime/src/CesiumBingMapsRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -13,7 +14,9 @@ class BingMapsRasterOverlay;
 
 namespace CesiumForUnityNative {
 
-class CesiumBingMapsRasterOverlayImpl {
+class CesiumBingMapsRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumBingMapsRasterOverlayImpl> {
 public:
   CesiumBingMapsRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumBingMapsRasterOverlay& overlay);
diff --git a/native~/Runtime/src/CesiumCreditSystemImpl.h b/native~/Runtime/src/CesiumCreditSystemImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/CreditSystem.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumCredit.h>
 #include <DotNet/System/Collections/Generic/List1.h>
@@ -21,7 +22,8 @@ struct Credit;
 
 namespace CesiumForUnityNative {
 
-class CesiumCreditSystemImpl {
+class CesiumCreditSystemImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumCreditSystemImpl> {
 public:
   CesiumCreditSystemImpl(
       const DotNet::CesiumForUnity::CesiumCreditSystem& creditSystem);
diff --git a/native~/Runtime/src/CesiumDebugColorizeTilesRasterOverlayImpl.h b/native~/Runtime/src/CesiumDebugColorizeTilesRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -13,7 +14,9 @@ class DebugColorizeTilesRasterOverlay;
 
 namespace CesiumForUnityNative {
 
-class CesiumDebugColorizeTilesRasterOverlayImpl {
+class CesiumDebugColorizeTilesRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumDebugColorizeTilesRasterOverlayImpl> {
 public:
   CesiumDebugColorizeTilesRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumDebugColorizeTilesRasterOverlay&
diff --git a/native~/Runtime/src/CesiumEllipsoidImpl.h b/native~/Runtime/src/CesiumEllipsoidImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumGeospatial/Ellipsoid.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/Unity/Mathematics/double3.h>
 
@@ -12,7 +13,8 @@ class CesiumEllipsoid;
 
 namespace CesiumForUnityNative {
 
-class CesiumEllipsoidImpl {
+class CesiumEllipsoidImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumEllipsoidImpl> {
 public:
   CesiumEllipsoidImpl(
       const DotNet::CesiumForUnity::CesiumEllipsoid& unityEllipsoid);
diff --git a/native~/Runtime/src/CesiumFeatureIdAttributeImpl.h b/native~/Runtime/src/CesiumFeatureIdAttributeImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumGltf/AccessorUtility.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class CesiumFeatureIdAttribute;
@@ -12,7 +13,9 @@ struct MeshPrimitive;
 } // namespace CesiumGltf
 
 namespace CesiumForUnityNative {
-class CesiumFeatureIdAttributeImpl {
+class CesiumFeatureIdAttributeImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumFeatureIdAttributeImpl> {
 public:
   CesiumFeatureIdAttributeImpl(
       const DotNet::CesiumForUnity::CesiumFeatureIdAttribute&
diff --git a/native~/Runtime/src/CesiumFeatureIdTextureImpl.h b/native~/Runtime/src/CesiumFeatureIdTextureImpl.h
@@ -2,6 +2,7 @@
 
 #include <CesiumGltf/AccessorUtility.h>
 #include <CesiumGltf/FeatureIdTextureView.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class CesiumFeatureIdTexture;
@@ -19,7 +20,9 @@ struct FeatureIdTexture;
 } // namespace CesiumGltf
 
 namespace CesiumForUnityNative {
-class CesiumFeatureIdTextureImpl {
+class CesiumFeatureIdTextureImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumFeatureIdTextureImpl> {
 public:
   CesiumFeatureIdTextureImpl(
       const DotNet::CesiumForUnity::CesiumFeatureIdTexture& featureIdTexture);
diff --git a/native~/Runtime/src/CesiumFeatureImpl.h b/native~/Runtime/src/CesiumFeatureImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumGltf/PropertyTablePropertyView.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumMetadataValue.h>
 #include <DotNet/CesiumForUnity/MetadataType.h>
@@ -44,7 +45,8 @@ using ValueType = swl::variant<
     CesiumGltf::PropertyArrayView<bool>,
     CesiumGltf::PropertyArrayView<std::string_view>>;
 
-class CesiumFeatureImpl {
+class CesiumFeatureImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumFeatureImpl> {
 public:
   CesiumFeatureImpl(const DotNet::CesiumForUnity::CesiumFeature& feature);
   ~CesiumFeatureImpl();
diff --git a/native~/Runtime/src/CesiumGeoreferenceImpl.h b/native~/Runtime/src/CesiumGeoreferenceImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumGeospatial/LocalHorizontalCoordinateSystem.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/Unity/Mathematics/double3.h>
 #include <DotNet/Unity/Mathematics/double4x4.h>
@@ -16,7 +17,8 @@ class Transform;
 }
 
 namespace CesiumForUnityNative {
-class CesiumGeoreferenceImpl {
+class CesiumGeoreferenceImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumGeoreferenceImpl> {
 public:
   CesiumGeoreferenceImpl(
       const DotNet::CesiumForUnity::CesiumGeoreference& georeference);
diff --git a/native~/Runtime/src/CesiumIonRasterOverlayImpl.h b/native~/Runtime/src/CesiumIonRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -13,7 +14,9 @@ class IonRasterOverlay;
 
 namespace CesiumForUnityNative {
 
-class CesiumIonRasterOverlayImpl {
+class CesiumIonRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumIonRasterOverlayImpl> {
 public:
   CesiumIonRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumIonRasterOverlay& overlay);
diff --git a/native~/Runtime/src/CesiumMetadataImpl.h b/native~/Runtime/src/CesiumMetadataImpl.h
@@ -2,6 +2,7 @@
 
 #include <CesiumGltf/AccessorUtility.h>
 #include <CesiumGltf/Model.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumFeature.h>
 #include <DotNet/System/Array1.h>
@@ -21,7 +22,8 @@ class Transform;
 
 namespace CesiumForUnityNative {
 
-class CesiumMetadataImpl {
+class CesiumMetadataImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<CesiumMetadataImpl> {
 public:
   CesiumMetadataImpl(const DotNet::CesiumForUnity::CesiumMetadata& metadata);
   ~CesiumMetadataImpl();
diff --git a/native~/Runtime/src/CesiumPolygonRasterOverlayImpl.h b/native~/Runtime/src/CesiumPolygonRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/System/Collections/Generic/List1.h>
 
@@ -25,7 +26,9 @@ class CartographicPolygon;
 
 namespace CesiumForUnityNative {
 
-class CesiumPolygonRasterOverlayImpl {
+class CesiumPolygonRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumPolygonRasterOverlayImpl> {
 public:
   CesiumPolygonRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumPolygonRasterOverlay& overlay);
diff --git a/native~/Runtime/src/CesiumPropertyTablePropertyImpl.h b/native~/Runtime/src/CesiumPropertyTablePropertyImpl.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <CesiumUtility/ReferenceCounted.h>
+
 #include <any>
 #include <cstdint>
 #include <unordered_map>
@@ -43,7 +45,9 @@ class double4x4;
 
 namespace CesiumForUnityNative {
 
-class CesiumPropertyTablePropertyImpl {
+class CesiumPropertyTablePropertyImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumPropertyTablePropertyImpl> {
 public:
   CesiumPropertyTablePropertyImpl(
       const DotNet::CesiumForUnity::CesiumPropertyTableProperty& property);
diff --git a/native~/Runtime/src/CesiumSimplePlanarEllipsoidCurveImpl.h b/native~/Runtime/src/CesiumSimplePlanarEllipsoidCurveImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumGeospatial/SimplePlanarEllipsoidCurve.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 #include <DotNet/CesiumForUnity/CesiumEllipsoid.h>
 #include <DotNet/Unity/Mathematics/double3.h>
@@ -17,7 +18,9 @@ struct double3;
 
 namespace CesiumForUnityNative {
 
-class CesiumSimplePlanarEllipsoidCurveImpl {
+class CesiumSimplePlanarEllipsoidCurveImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumSimplePlanarEllipsoidCurveImpl> {
 public:
   CesiumSimplePlanarEllipsoidCurveImpl(
       const DotNet::CesiumForUnity::CesiumSimplePlanarEllipsoidCurve& path);
diff --git a/native~/Runtime/src/CesiumTileMapServiceRasterOverlayImpl.h b/native~/Runtime/src/CesiumTileMapServiceRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -13,7 +14,9 @@ class TileMapServiceRasterOverlay;
 
 namespace CesiumForUnityNative {
 
-class CesiumTileMapServiceRasterOverlayImpl {
+class CesiumTileMapServiceRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumTileMapServiceRasterOverlayImpl> {
 public:
   CesiumTileMapServiceRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumTileMapServiceRasterOverlay& overlay);
diff --git a/native~/Runtime/src/CesiumWebMapServiceRasterOverlayImpl.h b/native~/Runtime/src/CesiumWebMapServiceRasterOverlayImpl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CesiumUtility/IntrusivePointer.h>
+#include <CesiumUtility/ReferenceCounted.h>
 
 namespace DotNet::CesiumForUnity {
 class Cesium3DTileset;
@@ -13,7 +14,9 @@ class WebMapServiceRasterOverlay;
 
 namespace CesiumForUnityNative {
 
-class CesiumWebMapServiceRasterOverlayImpl {
+class CesiumWebMapServiceRasterOverlayImpl
+    : public CesiumUtility::ReferenceCountedThreadSafe<
+          CesiumWebMapServiceRasterOverlayImpl> {
 public:
   CesiumWebMapServiceRasterOverlayImpl(
       const DotNet::CesiumForUnity::CesiumWebMapServiceRasterOverlay& overlay);
diff --git a/native~/Runtime/src/CesiumWebMapTileServiceRasterOverlayImpl.h b/native~/Runtime/src/CesiumWebMapTileServiceRasterOverlayImpl.h
diff --git a/native~/Runtime/src/TestGltfModelImpl.h b/native~/Runtime/src/TestGltfModelImpl.h
diff --git a/native~/Shared/src/NativeDownloadHandlerImpl.h b/native~/Shared/src/NativeDownloadHandlerImpl.h
