lythreeframe 1.2.68 → 1.3.0

package/dist/bundle.cjs.js

@@ -2513,7 +2513,7 @@ class Controller {
         this.fireComponentClick(component, hit, isDoubleClick);
         // Actor level
         const actor = component.parentActor;
-        console.log("[Controller]fireClickEvents", actor, actor === null || actor === void 0 ? void 0 : actor.isClickEnabled);
+        //console.log("[Controller]fireClickEvents", actor, actor?.isClickEnabled)
         if (actor && actor.isClickEnabled) {
             this.fireActorClick(actor, component, hit, isDoubleClick);
         }
@@ -3073,18 +3073,38 @@ class Actor extends BaseObject {
 }
 
 class ThreeObjectLibrary {
+    static disposeMaterialTextures(material) {
+        Object.keys(material).forEach((key) => {
+            const value = material[key];
+            if (value && typeof value === 'object' && 'isTexture' in value) {
+                value.dispose();
+            }
+        });
+    }
     static disposeMeshMaterial(mesh) {
         let mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
         mats.forEach((elem) => {
+            ThreeObjectLibrary.disposeMaterialTextures(elem);
             elem.dispose();
         });
     }
-    static disposeMeshGeometry(mesh) {
+    static disposeMeshResource(mesh, recursive = false) {
+        ThreeObjectLibrary.disposeMeshMaterial(mesh);
         mesh.geometry.dispose();
+        if (recursive) {
+            mesh.children.forEach((child) => {
+                if (child instanceof webgpu.Mesh) {
+                    ThreeObjectLibrary.disposeMeshResource(child, true);
+                }
+            });
+        }
     }
-    static disposeMeshResource(mesh) {
-        ThreeObjectLibrary.disposeMeshMaterial(mesh);
-        ThreeObjectLibrary.disposeMeshGeometry(mesh);
+    static disposeObject3DResource(object) {
+        object.traverse((child) => {
+            if (child instanceof webgpu.Mesh) {
+                ThreeObjectLibrary.disposeMeshResource(child);
+            }
+        });
     }
 }
 

package/dist/bundle.esm.js

@@ -2511,7 +2511,7 @@ class Controller {
         this.fireComponentClick(component, hit, isDoubleClick);
         // Actor level
         const actor = component.parentActor;
-        console.log("[Controller]fireClickEvents", actor, actor === null || actor === void 0 ? void 0 : actor.isClickEnabled);
+        //console.log("[Controller]fireClickEvents", actor, actor?.isClickEnabled)
         if (actor && actor.isClickEnabled) {
             this.fireActorClick(actor, component, hit, isDoubleClick);
         }
@@ -3071,18 +3071,38 @@ class Actor extends BaseObject {
 }
 
 class ThreeObjectLibrary {
+    static disposeMaterialTextures(material) {
+        Object.keys(material).forEach((key) => {
+            const value = material[key];
+            if (value && typeof value === 'object' && 'isTexture' in value) {
+                value.dispose();
+            }
+        });
+    }
     static disposeMeshMaterial(mesh) {
         let mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
         mats.forEach((elem) => {
+            ThreeObjectLibrary.disposeMaterialTextures(elem);
             elem.dispose();
         });
     }
-    static disposeMeshGeometry(mesh) {
+    static disposeMeshResource(mesh, recursive = false) {
+        ThreeObjectLibrary.disposeMeshMaterial(mesh);
         mesh.geometry.dispose();
+        if (recursive) {
+            mesh.children.forEach((child) => {
+                if (child instanceof Mesh) {
+                    ThreeObjectLibrary.disposeMeshResource(child, true);
+                }
+            });
+        }
     }
-    static disposeMeshResource(mesh) {
-        ThreeObjectLibrary.disposeMeshMaterial(mesh);
-        ThreeObjectLibrary.disposeMeshGeometry(mesh);
+    static disposeObject3DResource(object) {
+        object.traverse((child) => {
+            if (child instanceof Mesh) {
+                ThreeObjectLibrary.disposeMeshResource(child);
+            }
+        });
     }
 }
 

package/dist/lythreeframe/Library/ResourceLibrary.d.ts

@@ -1,6 +1,7 @@
-import { Mesh } from "three/webgpu";
+import { Mesh, Object3D } from "three/webgpu";
 export declare class ThreeObjectLibrary {
+    static disposeMaterialTextures(material: any): void;
     static disposeMeshMaterial(mesh: Mesh): void;
-    static disposeMeshGeometry(mesh: Mesh): void;
-    static disposeMeshResource(mesh: Mesh): void;
+    static disposeMeshResource(mesh: Mesh, recursive?: boolean): void;
+    static disposeObject3DResource(object: Object3D): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.2.68",
+  "version": "1.3.0",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",