lythreeframe 1.0.20 → 1.0.22

package/dist/bundle.cjs.js

@@ -1080,6 +1080,22 @@ const DefaultPostProcessParam = {
     }
 };
 
+class ThreeObjectLibrary {
+    static disposeMeshMaterial(mesh) {
+        let mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
+        mats.forEach((elem) => {
+            elem.dispose();
+        });
+    }
+    static disposeMeshGeometry(mesh) {
+        mesh.geometry.dispose();
+    }
+    static disposeMeshResource(mesh) {
+        ThreeObjectLibrary.disposeMeshMaterial(mesh);
+        ThreeObjectLibrary.disposeMeshGeometry(mesh);
+    }
+}
+
 class World {
     get scene() {
         return this._scene;
@@ -1102,6 +1118,18 @@ class World {
             elem.tick(deltaTime);
         });
     }
+    destroy() {
+        this.actors.forEach((elem) => {
+            elem.destroy();
+        });
+        this.actors.clear();
+        this.scene.traverse((child) => {
+            if (child instanceof three.Mesh) {
+                ThreeObjectLibrary.disposeMeshResource(child);
+            }
+        });
+        this.scene.clear();
+    }
     addActor(actor) {
         if (!actor.rootComponent.threeObject) {
             throw Error("actor.threeObject is null");
@@ -1112,8 +1140,6 @@ class World {
         actor.onAddedToWorld(this);
         this.viewport.markRenderStateDirty();
     }
-    destroy() {
-    }
 }
 
 const DefaultToneMappingParams = {
@@ -2024,9 +2050,6 @@ class CameraFactory {
     }
 }
 
-const DefaultRenderParam = {
-    antialias: true,
-};
 const DefaultCameraParam = {
     near: 0.1,
     far: 1000,
@@ -2035,11 +2058,16 @@ const DefaultCameraParam = {
         aspect: 1,
     }
 };
+
+const DefaultRenderParam = {
+    antialias: true,
+};
 const DefaultAppParam = {
     renderParam: DefaultRenderParam,
     cameraParam: DefaultCameraParam,
     postProcessParam: DefaultPostProcessParam,
 };
+
 class ThreeJsApp {
     get camera() {
         return this._camera;
@@ -2098,6 +2126,12 @@ class ThreeJsApp {
         this.world.tick(delta);
         this.viewport.render();
     }
+    destroy() {
+        this.onCameraChangedDelegate.clear();
+        this.world.destroy();
+        this.controller.destroy();
+        this.viewport.destroy();
+    }
     updateCamera(param) {
         const previousCam = this.camera;
         this._camera = CameraFactory.updataCamera(param, this.camera);
@@ -2116,12 +2150,6 @@ class ThreeJsApp {
         // }
         this.camera.updateProjectionMatrix();
     }
-    destroy() {
-        this.onCameraChangedDelegate.clear();
-        this.world.destroy();
-        this.controller.destroy();
-        this.viewport.destroy();
-    }
 }
 
 class Actor extends BaseObject {
@@ -2881,7 +2909,6 @@ exports.BoxComponent = BoxComponent;
 exports.Controller = Controller;
 exports.DefaultAppParam = DefaultAppParam;
 exports.DefaultBloomParam = DefaultBloomParam;
-exports.DefaultCameraParam = DefaultCameraParam;
 exports.DefaultDOFParam = DefaultDOFParam;
 exports.DefaultDenoiseParam = DefaultDenoiseParam;
 exports.DefaultGTAOParam = DefaultGTAOParam;
@@ -2904,6 +2931,7 @@ exports.PlaneComponent = PlaneComponent;
 exports.SceneComponent = SceneComponent;
 exports.SphereComponent = SphereComponent;
 exports.ThreeJsApp = ThreeJsApp;
+exports.ThreeObjectLibrary = ThreeObjectLibrary;
 exports.ToneMappingOptions = ToneMappingOptions;
 exports.TransformGizmo = TransformGizmo;
 exports.Viewport = Viewport;

package/dist/bundle.esm.js

@@ -1078,6 +1078,22 @@ const DefaultPostProcessParam = {
     }
 };
 
+class ThreeObjectLibrary {
+    static disposeMeshMaterial(mesh) {
+        let mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
+        mats.forEach((elem) => {
+            elem.dispose();
+        });
+    }
+    static disposeMeshGeometry(mesh) {
+        mesh.geometry.dispose();
+    }
+    static disposeMeshResource(mesh) {
+        ThreeObjectLibrary.disposeMeshMaterial(mesh);
+        ThreeObjectLibrary.disposeMeshGeometry(mesh);
+    }
+}
+
 class World {
     get scene() {
         return this._scene;
@@ -1100,6 +1116,18 @@ class World {
             elem.tick(deltaTime);
         });
     }
+    destroy() {
+        this.actors.forEach((elem) => {
+            elem.destroy();
+        });
+        this.actors.clear();
+        this.scene.traverse((child) => {
+            if (child instanceof Mesh) {
+                ThreeObjectLibrary.disposeMeshResource(child);
+            }
+        });
+        this.scene.clear();
+    }
     addActor(actor) {
         if (!actor.rootComponent.threeObject) {
             throw Error("actor.threeObject is null");
@@ -1110,8 +1138,6 @@ class World {
         actor.onAddedToWorld(this);
         this.viewport.markRenderStateDirty();
     }
-    destroy() {
-    }
 }
 
 const DefaultToneMappingParams = {
@@ -2022,9 +2048,6 @@ class CameraFactory {
     }
 }
 
-const DefaultRenderParam = {
-    antialias: true,
-};
 const DefaultCameraParam = {
     near: 0.1,
     far: 1000,
@@ -2033,11 +2056,16 @@ const DefaultCameraParam = {
         aspect: 1,
     }
 };
+
+const DefaultRenderParam = {
+    antialias: true,
+};
 const DefaultAppParam = {
     renderParam: DefaultRenderParam,
     cameraParam: DefaultCameraParam,
     postProcessParam: DefaultPostProcessParam,
 };
+
 class ThreeJsApp {
     get camera() {
         return this._camera;
@@ -2096,6 +2124,12 @@ class ThreeJsApp {
         this.world.tick(delta);
         this.viewport.render();
     }
+    destroy() {
+        this.onCameraChangedDelegate.clear();
+        this.world.destroy();
+        this.controller.destroy();
+        this.viewport.destroy();
+    }
     updateCamera(param) {
         const previousCam = this.camera;
         this._camera = CameraFactory.updataCamera(param, this.camera);
@@ -2114,12 +2148,6 @@ class ThreeJsApp {
         // }
         this.camera.updateProjectionMatrix();
     }
-    destroy() {
-        this.onCameraChangedDelegate.clear();
-        this.world.destroy();
-        this.controller.destroy();
-        this.viewport.destroy();
-    }
 }
 
 class Actor extends BaseObject {
@@ -2873,4 +2901,4 @@ class TransformGizmo extends Pawn {
     }
 }
 
-export { Actor, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, LYAssetManager, LYLoadTask, LabelComponent, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SphereComponent, ThreeJsApp, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };
+export { Actor, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, LYAssetManager, LYLoadTask, LabelComponent, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SphereComponent, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };

package/dist/index.d.ts

@@ -2,12 +2,14 @@ export { LYLoadTask } from "./lythreeframe/AssetManagement/Task/Task";
 export { LYAssetManager } from "./lythreeframe/AssetManagement/AssetManager";
 export { AttachmentRules } from "./lythreeframe/Defines";
 export { Delegate } from "./lythreeframe/Delegate";
-export { ThreeJsApp, DefaultRenderParam, DefaultCameraParam, DefaultAppParam } from "./lythreeframe/ThreeJsApp";
-export type { AppParam } from "./lythreeframe/ThreeJsApp";
+export { ThreeJsApp, } from "./lythreeframe/ThreeJsApp";
 export { Controller } from "./lythreeframe/Frame/Controller";
 export { Viewport } from "./lythreeframe/Frame/Viewport";
 export { World } from "./lythreeframe/Frame/World";
-export type { CameraParam } from "./lythreeframe/Factory/CameraFactory";
+export type { CameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
+export type { DefaultCameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
+export type { AppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
+export { DefaultRenderParam, DefaultAppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
 export { Actor } from "./lythreeframe/Object/Actor";
 export { DirectionalLightActor } from "./lythreeframe/Object/Actors/Light/DirectionalLightActor";
 export { BoxActor } from "./lythreeframe/Object/Actors/Shape/BoxActor";
@@ -41,3 +43,4 @@ export { FirstPerson } from "./lythreeframe/Object/PawnV2/FirstPerson";
 export type { ITransforming } from "./lythreeframe/Object/PawnV2/TransformControl";
 export { TransformType } from "./lythreeframe/Object/PawnV2/TransformControl";
 export { TransformGizmo } from "./lythreeframe/Object/PawnV2/TransformControl";
+export { ThreeObjectLibrary } from "./lythreeframe/Library/ResourceLibrary";

package/dist/lythreeframe/Factory/CameraFactory.d.ts

@@ -1,19 +1,5 @@
 import { OrthographicCamera, PerspectiveCamera } from "three";
-export interface CameraParam {
-    near: number;
-    far: number;
-    param: PerspectiveCameraParam | OrthographicCameraParam;
-}
-export interface PerspectiveCameraParam {
-    fov: number;
-    aspect: number;
-}
-export interface OrthographicCameraParam {
-    left: number;
-    right: number;
-    top: number;
-    bottom: number;
-}
+import { CameraParam } from "../Frame/Parameters/CameraParameter";
 export declare class CameraFactory {
     static createCamera(param: CameraParam): PerspectiveCamera | OrthographicCamera;
     static updataCamera(param: CameraParam, camera: PerspectiveCamera | OrthographicCamera): PerspectiveCamera | OrthographicCamera;

package/dist/lythreeframe/Frame/Parameters/AppParameter.d.ts

@@ -0,0 +1,12 @@
+import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURenderer";
+import { CameraParam } from "./CameraParameter";
+import { PostProcessParam } from "@/lythreeframe/PostProcess/PostProcessParam";
+import { WorldParam } from "./WorldParameter";
+export interface AppParam {
+    renderParam?: WebGPURendererParameters;
+    cameraParam?: CameraParam;
+    postProcessParam?: PostProcessParam;
+    worldParam?: WorldParam;
+}
+export declare const DefaultRenderParam: WebGPURendererParameters;
+export declare const DefaultAppParam: AppParam;

package/dist/lythreeframe/Frame/Parameters/CameraParameter.d.ts

@@ -0,0 +1,16 @@
+export interface CameraParam {
+    near: number;
+    far: number;
+    param: PerspectiveCameraParam | OrthographicCameraParam;
+}
+export interface PerspectiveCameraParam {
+    fov: number;
+    aspect: number;
+}
+export interface OrthographicCameraParam {
+    left: number;
+    right: number;
+    top: number;
+    bottom: number;
+}
+export declare const DefaultCameraParam: CameraParam;

package/dist/lythreeframe/Frame/Parameters/WorldParameter.d.ts

@@ -0,0 +1,2 @@
+export interface WorldParam {
+}

package/dist/lythreeframe/Frame/World.d.ts

@@ -13,6 +13,6 @@ export declare class World {
     constructor(app: ThreeJsApp);
     init(): void;
     tick(deltaTime: number): void;
-    addActor(actor: Actor): void;
     destroy(): void;
+    addActor(actor: Actor): void;
 }

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

@@ -1,5 +1,5 @@
 import { Mesh } from "three";
-export declare class ResourceLibrary {
+export declare class ThreeObjectLibrary {
     static disposeMeshMaterial(mesh: Mesh): void;
     static disposeMeshGeometry(mesh: Mesh): void;
     static disposeMeshResource(mesh: Mesh): void;

package/dist/lythreeframe/ThreeJsApp.d.ts

@@ -1,19 +1,10 @@
-import { PostProcessParam } from './PostProcess/PostProcessParam';
 import { World } from "./Frame/World";
 import { Viewport } from "./Frame/Viewport";
 import { Controller } from "./Frame/Controller";
 import { Clock, OrthographicCamera, PerspectiveCamera } from "three";
-import { CameraParam } from "./Factory/CameraFactory";
-import { WebGPURendererParameters } from 'three/src/renderers/webgpu/WebGPURenderer.js';
 import { Delegate } from './Delegate';
-export interface AppParam {
-    renderParam?: WebGPURendererParameters;
-    cameraParam?: CameraParam;
-    postProcessParam?: PostProcessParam;
-}
-export declare const DefaultRenderParam: WebGPURendererParameters;
-export declare const DefaultCameraParam: CameraParam;
-export declare const DefaultAppParam: AppParam;
+import { CameraParam } from './Frame/Parameters/CameraParameter';
+import { AppParam } from './Frame/Parameters/AppParameter';
 export declare class ThreeJsApp {
     get camera(): PerspectiveCamera | OrthographicCamera;
     get clock(): Clock;
@@ -35,7 +26,7 @@ export declare class ThreeJsApp {
     constructor(elementId: string, appParam?: AppParam);
     init(): void;
     tick(): void;
+    destroy(): void;
     updateCamera(param: CameraParam): void;
     onWindowResize(width: number, height: number): void;
-    destroy(): void;
 }

package/package.json

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