three-base 2.0.70 → 2.0.72

package/InstancedMeshBase.d.ts

@@ -18,15 +18,15 @@ export default class InstancedMeshBase extends MeshBase {
     instanceColor: InstancedBufferAttribute;
     loadModel(url: string, filename?: string): Promise<void>;
     computeBoundingSphere: import("lodash").DebouncedFunc<() => void>;
-    setCount(count?: number): void;
-    setMatrixAt(index: number, matrix: Matrix4): void;
+    setCount(count?: number): Promise<void>;
+    setMatrixAt(index: number, matrix: Matrix4): Promise<void>;
     setTRS(index: number, { position, rotation, scale }: {
         position?: Vector3;
         rotation?: Euler;
         scale?: Vector3;
-    }): void;
-    setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined): void;
+    }): Promise<void>;
+    setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined): Promise<void>;
     updateMatrixWorld(force?: boolean): void;
-    addEventListener(name: string, callback: (e: any) => void): void;
+    addEventListener(name: string, callback: (e: any) => void): Promise<void>;
     removeEventListener(name: string, callback: (e: any) => void): void;
 }

package/InstancedMeshBase.js

@@ -29,6 +29,7 @@ export default class InstancedMeshBase extends MeshBase {
     instanceColor = new InstancedBufferAttribute(new Float32Array(0 * 3), 3);
     // 重构加载模型的方法
     async loadModel(url, filename = "") {
+        this.url = url;
         if (!url) {
             this.clear();
             return;
@@ -110,14 +111,13 @@ export default class InstancedMeshBase extends MeshBase {
     }
     // 更新包围盒
     computeBoundingSphere = throttle(() => {
-        this.traverse(m => {
-            if (m !== this) {
-                m.computeBoundingSphere();
-            }
+        this.children.map(instancedMesh => {
+            instancedMesh.computeBoundingSphere();
         });
     }, 1000);
     //初始实例矩阵的数量
-    setCount(count = 0) {
+    async setCount(count = 0) {
+        await this.awaitLoaded();
         const instanceMatrix = new InstancedBufferAttribute(new Float32Array(count * 16), 16);
         const instanceColor = new InstancedBufferAttribute(new Float32Array(count * 3).fill(1), 3);
         for (let i = 0; i < this.count; i++) {
@@ -140,7 +140,8 @@ export default class InstancedMeshBase extends MeshBase {
         });
     }
     // 设置矩阵
-    setMatrixAt(index, matrix) {
+    async setMatrixAt(index, matrix) {
+        await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
@@ -154,7 +155,8 @@ export default class InstancedMeshBase extends MeshBase {
         this.computeBoundingSphere();
     }
     //设置移动旋转缩放
-    setTRS(index, { position = InstancedMeshBase._position, rotation = InstancedMeshBase._rotation, scale = InstancedMeshBase._scale }) {
+    async setTRS(index, { position = InstancedMeshBase._position, rotation = InstancedMeshBase._rotation, scale = InstancedMeshBase._scale }) {
+        await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
@@ -177,7 +179,8 @@ export default class InstancedMeshBase extends MeshBase {
         this.computeBoundingSphere();
     }
     // 设置颜色
-    setColorAt(index, color) {
+    async setColorAt(index, color) {
+        await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
@@ -199,7 +202,8 @@ export default class InstancedMeshBase extends MeshBase {
         });
     }
     // 事件监听
-    addEventListener(name, callback) {
+    async addEventListener(name, callback) {
+        await this.awaitLoaded();
         super.addEventListener(name, callback);
         this.children.map(mesh => {
             mesh.addEventListener(name, callback);

package/InstancedMeshBase.ts

@@ -43,6 +43,9 @@ export default class InstancedMeshBase extends MeshBase {
 
     // 重构加载模型的方法
     async loadModel(url: string, filename: string = "") {
+
+        this.url = url;
+
         if (!url) {
             this.clear();
             return;
@@ -143,18 +146,16 @@ export default class InstancedMeshBase extends MeshBase {
 
     }
 
-
     // 更新包围盒
     computeBoundingSphere = throttle(() => {
-        this.traverse(m => {
-            if (m !== this) {
-                (m as InstancedMesh).computeBoundingSphere();
-            }
-        })
+        this.children.map(instancedMesh => {
+            instancedMesh.computeBoundingSphere();
+        });
     }, 1000)
 
     //初始实例矩阵的数量
-    setCount(count: number = 0) {
+    async setCount(count: number = 0) {
+        await this.awaitLoaded();
 
         const instanceMatrix = new InstancedBufferAttribute(new Float32Array(count * 16), 16);
         const instanceColor = new InstancedBufferAttribute(new Float32Array(count * 3).fill(1), 3);
@@ -186,7 +187,9 @@ export default class InstancedMeshBase extends MeshBase {
     }
 
     // 设置矩阵
-    setMatrixAt(index: number, matrix: Matrix4) {
+    async setMatrixAt(index: number, matrix: Matrix4) {
+        await this.awaitLoaded();
+
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid]
             const collect = this.meshCollect[uuid]
@@ -203,7 +206,7 @@ export default class InstancedMeshBase extends MeshBase {
     }
 
     //设置移动旋转缩放
-    setTRS(
+    async setTRS(
         index: number,
         {
             position = InstancedMeshBase._position,
@@ -215,6 +218,8 @@ export default class InstancedMeshBase extends MeshBase {
             scale?: Vector3
         }
     ) {
+        await this.awaitLoaded();
+
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid]
             const collect = this.meshCollect[uuid]
@@ -253,7 +258,9 @@ export default class InstancedMeshBase extends MeshBase {
     }
 
     // 设置颜色
-    setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined) {
+    async setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined) {
+        await this.awaitLoaded();
+
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid]
             const collect = this.meshCollect[uuid]
@@ -277,7 +284,9 @@ export default class InstancedMeshBase extends MeshBase {
     }
 
     // 事件监听
-    addEventListener(name: string, callback: (e: any) => void) {
+    async addEventListener(name: string, callback: (e: any) => void) {
+        await this.awaitLoaded();
+
         super.addEventListener(name, callback);
         this.children.map(mesh => {
             mesh.addEventListener(name, callback);

package/package.json

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