three-base 2.0.60 → 2.0.62

package/InstancedMeshBase.js

@@ -35,7 +35,7 @@ export default class InstancedMeshBase extends MeshBase {
         if (!MeshBase.models.get(url) && !MeshBase.loadModeling.get(url)) {
             MeshBase.loadModeling.set(url, true);
             // 万能加载器
-            let modal = await threeLoader.loadModal(url, filename);
+            let modal = await threeLoader.loadModel(url, filename);
             threeUtils.center(modal);
             threeUtils.alignBottom(modal);
             modal.updateMatrixWorld(true);

package/InstancedMeshBase.ts

@@ -53,7 +53,7 @@ export default class InstancedMeshBase extends MeshBase {
             MeshBase.loadModeling.set(url, true);
 
             // 万能加载器
-            let modal = await threeLoader.loadModal(url, filename);
+            let modal = await threeLoader.loadModel(url, filename);
 
             threeUtils.center(modal);
             threeUtils.alignBottom(modal);

package/MeshBase.js

@@ -36,7 +36,7 @@ export default class MeshBase extends Group {
         if (!MeshBase.models.get(url) && !MeshBase.loadModeling.get(url)) {
             MeshBase.loadModeling.set(url, true);
             // 万能加载器
-            let modal = await threeLoader.loadModal(url, filename);
+            let modal = await threeLoader.loadModel(url, filename);
             MeshBase.models.set(url, modal);
             MeshBase.loadModeling.set(url, false);
         }

package/MeshBase.ts

@@ -50,7 +50,7 @@ export default class MeshBase extends Group {
             MeshBase.loadModeling.set(url, true);
 
             // 万能加载器
-            let modal = await threeLoader.loadModal(url, filename);
+            let modal = await threeLoader.loadModel(url, filename);
 
             MeshBase.models.set(url, modal);
             MeshBase.loadModeling.set(url, false);

package/ThreeBase.js

@@ -133,6 +133,7 @@ export default class ThreeBase extends EventDispatcher {
             if (this.rendererLost) {
                 this.renderer.forceContextRestore();
                 this.renderer.domElement.style.opacity = "1";
+                this.needRender = true;
             }
             this.setSize(div.clientWidth, div.clientHeight);
             // 开启时时渲染

package/ThreeBase.ts

@@ -152,6 +152,7 @@ export default class ThreeBase extends EventDispatcher {
             if (this.rendererLost) {
                 this.renderer.forceContextRestore();
                 this.renderer.domElement.style.opacity = "1";
+                this.needRender = true;
             }
 
             this.setSize(div.clientWidth, div.clientHeight);

package/Transition.d.ts

@@ -21,7 +21,7 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
     setDuration(duration?: number): this;
     setDelay(delay?: number): this;
     _: {
-        [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: T[K];
+        [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: number;
     };
     private onChangeCall;
     private onDoneCall;

package/Transition.ts

@@ -85,7 +85,7 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
     }
 
     // 存储 每个参数的 起始位置 起始时间 终止位置  终止时间
-    _: { [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: T[K] } = {} as { [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: T[K] };
+    _: { [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: number } = {} as { [key in `${K}_start` | `${K}_end` | `${K}_startTime`]: number };
 
     // 数据改变的事件回调
     private onChangeCall = (josn: T) => { };
@@ -127,13 +127,13 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
 
         key = String(key) as Extract<keyof T, string>;
 
-        if (this._keys.includes(key) && this.timeTemp < (this._[key + "_startTime"] + this._duration)) {
+        if (this._keys.includes(key) && this.timeTemp < ((this._ as any)[key + "_startTime"] + this._duration)) {
 
-            let start = this._[key + "_start"];
+            let start = (this._ as any)[key + "_start"];
 
-            let end = this._[key + "_end"];
+            let end = (this._ as any)[key + "_end"];
 
-            let timeProgress = Math.min(1, Math.max(0, (this.timeTemp - this._[key + "_startTime"]) / this._duration));
+            let timeProgress = Math.min(1, Math.max(0, (this.timeTemp - (this._ as any)[key + "_startTime"]) / this._duration));
 
             // 斜率
             let t = 0;
@@ -154,9 +154,9 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
             // 通过斜率求y值
             return (bezier(this._Ybezier, t) * (end - start)) + start;
 
-        } else if (this._keys.includes(key) && this.timeTemp >= (this._[key + "_startTime"] + this._duration)) {
+        } else if (this._keys.includes(key) && this.timeTemp >= ((this._ as any)[key + "_startTime"] + this._duration)) {
 
-            return this._[key + "_end"];
+            return (this._ as any)[key + "_end"];
         }
 
         // `没有 ${ key } 的值`;
@@ -170,13 +170,13 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
         for (let key in param) {
 
             // 有就赋值
-            if (this._keys.includes(key) && Math.abs(param[key] - this._[key + "_end"]) > 0.0001) {
+            if (this._keys.includes(key) && Math.abs(param[key] - (this._ as any)[key + "_end"]) > 0.0001) {
 
-                this._[key + "_start"] = this.get(key);
+                (this._ as any)[key + "_start"] = this.get(key);
 
-                this._[key + "_end"] = param[key];
+                (this._ as any)[key + "_end"] = param[key];
                 // 起始时间
-                this._[key + "_startTime"] = timetemp;
+                (this._ as any)[key + "_startTime"] = timetemp;
 
                 // 执行状态未完成
                 this._isDone = false;
@@ -184,11 +184,11 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
                 // 没有就添加一个
             } else if (!this._keys.includes(key)) {
 
-                this._[key + "_start"] = param[key];
+                (this._ as any)[key + "_start"] = param[key];
 
-                this._[key + "_end"] = param[key];
+                (this._ as any)[key + "_end"] = param[key];
                 // 起始时间
-                this._[key + "_startTime"] = timetemp - this._duration;
+                (this._ as any)[key + "_startTime"] = timetemp - this._duration;
 
                 // 执行状态未完成
                 this._isDone = false;
@@ -221,9 +221,9 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
                 this._keys.push(key);
             }
 
-            this._[key + "_start"] = param[key];
-            this._[key + "_end"] = param[key];
-            this._[key + "_startTime"] = -this._duration;
+            (this._ as any)[key + "_start"] = param[key];
+            (this._ as any)[key + "_end"] = param[key];
+            (this._ as any)[key + "_startTime"] = -this._duration;
         }
 
         if (this.onChangeCall) {
@@ -270,7 +270,7 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
 
         for (let i in this._keys) {
 
-            isisDone = this._[this._keys[i] + "_startTime"] + this._duration < this.timeTemp;
+            isisDone = (this._ as any)[this._keys[i] + "_startTime"] + this._duration < this.timeTemp;
 
             // 只要有一个没有完成 都算没有完成 过渡
             if (!isisDone) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "2.0.60",
+    "version": "2.0.62",
     "description": "three 3d three-base",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"

package/threeLoader.d.ts

@@ -19,7 +19,7 @@ declare class ThreeLoader extends EventDispatcher {
     gltfLoader: GLTFLoader;
     usdzLoader: USDZLoader;
     /** 加载模型支持glb,fbx,stl,obj */
-    loadModal(url: string, filename?: string): Promise<Object3D<import("three").Object3DEventMap>>;
+    loadModel(url: string, filename?: string): Promise<Object3D<import("three").Object3DEventMap>>;
     onload: boolean;
 }
 declare const threeLoader: ThreeLoader;

package/threeLoader.js

@@ -124,7 +124,7 @@ class ThreeLoader extends EventDispatcher {
     //usdz加载器
     usdzLoader = new USDZLoader();
     /** 加载模型支持glb,fbx,stl,obj */
-    async loadModal(url, filename = "") {
+    async loadModel(url, filename = "") {
         // 获取后缀
         const suffix = (get((filename || url).match(/\.([^\.]+)$/), [1]) || "").toLowerCase();
         let Object3d = new Object3D();

package/threeLoader.ts

@@ -152,7 +152,7 @@ class ThreeLoader extends EventDispatcher {
     usdzLoader = new USDZLoader();
 
     /** 加载模型支持glb,fbx,stl,obj */
-    async loadModal(url: string, filename: string = "") {
+    async loadModel(url: string, filename: string = "") {
 
         // 获取后缀
         const suffix = (get((filename || url).match(/\.([^\.]+)$/), [1]) || "").toLowerCase();

package/threeUtils.d.ts

@@ -41,6 +41,7 @@ declare class ThreeUtils extends EventDispatcher {
     exportUsdz(): void;
     getVolume(geometry: BufferGeometry): number;
     signedVolumeOfTriangle(p1: Vector3, p2: Vector3, p3: Vector3): number;
+    dipose(object3d: Object3D): void;
 }
 declare const threeUtils: ThreeUtils;
 export default threeUtils;

package/threeUtils.js

@@ -4,7 +4,7 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2023-05-03 00:36:18
  */
-import { Box3, Clock, EventDispatcher, Vector3 } from "three";
+import { Box3, Clock, EventDispatcher, Material, Vector3 } from "three";
 import { GLTFExporter } from 'three/examples/jsm/exporters/GLTFExporter';
 class ThreeUtils extends EventDispatcher {
     constructor() {
@@ -244,6 +244,23 @@ class ThreeUtils extends EventDispatcher {
     signedVolumeOfTriangle(p1, p2, p3) {
         return p1.dot(p2.cross(p3)) / 6.0;
     }
+    //清理对象的网格和材质的缓存
+    dipose(object3d) {
+        object3d.traverse(obj => {
+            const mesh = obj;
+            if (mesh.isMesh) {
+                mesh.geometry.dispose();
+                if (mesh.material instanceof Material) {
+                    mesh.material.dispose();
+                }
+                else if (mesh.material instanceof Array) {
+                    mesh.material.map(m => {
+                        m.dispose();
+                    });
+                }
+            }
+        });
+    }
 }
 const threeUtils = new ThreeUtils();
 export default threeUtils;

package/threeUtils.ts

@@ -5,7 +5,7 @@
  * @Last Modified time: 2023-05-03 00:36:18
  */
 
-import { Box3, BufferAttribute, BufferGeometry, Clock, EventDispatcher, Mesh, MeshStandardMaterial, Object3D, Vector3 } from "three";
+import { Box3, BufferAttribute, BufferGeometry, Clock, EventDispatcher, Material, Mesh, MeshStandardMaterial, Object3D, Vector3 } from "three";
 import { GLTFExporter } from 'three/examples/jsm/exporters/GLTFExporter';
 
 class ThreeUtils extends EventDispatcher {
@@ -242,7 +242,7 @@ class ThreeUtils extends EventDispatcher {
 
     //导出usdz
     exportUsdz() {
-        
+
     }
 
     // 计算网格的体积
@@ -283,6 +283,23 @@ class ThreeUtils extends EventDispatcher {
         return p1.dot(p2.cross(p3)) / 6.0;
     }
 
+    //清理对象的网格和材质的缓存
+    dipose(object3d: Object3D) {
+        object3d.traverse(obj => {
+            const mesh = obj as Mesh;
+            if (mesh.isMesh) {
+                mesh.geometry.dispose();
+                if (mesh.material instanceof Material) {
+                    mesh.material.dispose();
+                } else if (mesh.material instanceof Array) {
+                    mesh.material.map(m => {
+                        m.dispose();
+                    })
+                }
+            }
+        });
+    }
+
 }
 
 const threeUtils = new ThreeUtils();