From 8228486ef34dbba44acdaf0bc58d854256fe2fdc Mon Sep 17 00:00:00 2001
From: Nick Fisher <nick.fisher@avinium.com>
Date: Sat, 19 Apr 2025 09:48:17 +0800
Subject: [PATCH] remove asset from internal list when destroyAsset is called

---
 .../src/ffi/src/thermion_viewer_ffi.dart      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart b/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
index 92c7a71c..0b417015 100644
--- a/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
+++ b/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
@@ -163,7 +163,7 @@ class ThermionViewerFFI extends ThermionViewer {
       await callback.call();
     }
     View_setScene(view.view, nullptr);
-    
+
     await FilamentApp.instance!.destroyScene(scene);
     await FilamentApp.instance!.destroyView(view);
 
@@ -272,7 +272,7 @@ class ThermionViewerFFI extends ThermionViewer {
   ///
   @override
   Future removeSkybox() async {
-    if(_disposed) {
+    if (_disposed) {
       throw ViewerDisposedException();
     }
 
@@ -407,16 +407,12 @@ class ThermionViewerFFI extends ThermionViewer {
   @override
   Future destroyAsset(covariant FFIAsset asset) async {
     await scene.remove(asset);
+    if (asset.boundingBoxAsset != null) {
+      await scene.remove(asset.boundingBoxAsset! as FFIAsset);
+      await FilamentApp.instance!.destroyAsset(asset.boundingBoxAsset!);
+    }
     await FilamentApp.instance!.destroyAsset(asset);
-
-    // if (asset.boundingBoxAsset != null) {
-    //   await asset.setBoundingBoxVisibility(false);
-    //   await withVoidCallback((callback) =>
-    //       SceneManager_destroyAssetRenderThread(
-    //           _sceneManager!, asset.boundingBoxAsset!.pointer, callback));
-    // }
-    // await withVoidCallback((callback) => SceneManager_destroyAssetRenderThread(
-    //     _sceneManager!, asset.asset, callback));
+    _assets.remove(asset);
   }
 
   ///
@@ -424,9 +420,16 @@ class ThermionViewerFFI extends ThermionViewer {
   ///
   @override
   Future destroyAssets() async {
+    _logger.info("Destroying ${_assets.length} assets");
     for (final asset in _assets) {
-      await destroyAsset(asset);
+      await scene.remove(asset);
+      if (asset.boundingBoxAsset != null) {
+        await scene.remove(asset.boundingBoxAsset! as FFIAsset);
+        await FilamentApp.instance!.destroyAsset(asset.boundingBoxAsset!);
+      }
+      await FilamentApp.instance!.destroyAsset(asset);
     }
+    _assets.clear();
   }
 
   ///
@@ -564,9 +567,9 @@ class ThermionViewerFFI extends ThermionViewer {
   ///
   ///
   ///
-   Future setLayerVisibility(VisibilityLayers layer, bool visible) async {
+  Future setLayerVisibility(VisibilityLayers layer, bool visible) async {
     await view.setLayerVisibility(layer, visible);
-   }
+  }
 
   ///
   ///
@@ -681,4 +684,4 @@ class ThermionViewerFFI extends ThermionViewer {
   }
 }
 
-class ViewerDisposedException implements Exception {}
\ No newline at end of file
+class ViewerDisposedException implements Exception {}