three-base 2.0.76 → 2.0.77

package/InstancedMeshBase.d.ts

@@ -19,7 +19,7 @@ export default class InstancedMeshBase extends MeshBase {
     loadModel(url: string, filename?: string): Promise<void>;
     computeBoundingSphere: import("lodash").DebouncedFunc<() => void>;
     setCount(count?: number): Promise<void>;
-    setMatrixAt(index: number, matrix: Matrix4): Promise<void>;
+    setMatrixAt(index: number, matrix?: Matrix4): Promise<void>;
     setTRS(index: number, { position, rotation, scale }: {
         position?: Vector3;
         rotation?: Euler;

package/InstancedMeshBase.js

@@ -149,15 +149,14 @@ export default class InstancedMeshBase extends MeshBase {
         });
     }
     // 设置矩阵
-    async setMatrixAt(index, matrix) {
-        const new_matrix = matrix.clone();
+    async setMatrixAt(index, matrix = new Matrix4().identity()) {
         await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
             collect.forEach((mesh, i) => {
                 InstancedMeshBase._matrix.copy(mesh.matrix);
-                InstancedMeshBase._matrix.premultiply(new_matrix);
+                InstancedMeshBase._matrix.premultiply(matrix);
                 instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
                 instancedMesh.instanceMatrix.needsUpdate = true;
             });
@@ -165,12 +164,8 @@ export default class InstancedMeshBase extends MeshBase {
         this.computeBoundingSphere();
     }
     //设置移动旋转缩放
-    async setTRS(index, { position = InstancedMeshBase._position, rotation = InstancedMeshBase._rotation, scale = InstancedMeshBase._scale }) {
-        const new_position = position.clone();
-        const new_rotation = rotation.clone();
-        const new_scale = scale.clone();
+    async setTRS(index, { position, rotation, scale }) {
         await this.awaitLoaded();
-        console.log("setTRS", index);
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
@@ -180,9 +175,9 @@ export default class InstancedMeshBase extends MeshBase {
                 InstancedMeshBase._matrix.premultiply(mesh.matrix.clone().invert());
                 InstancedMeshBase._matrix.decompose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
                 InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
-                InstancedMeshBase._position.copy(new_position);
-                InstancedMeshBase._rotation.copy(new_rotation);
-                InstancedMeshBase._scale.copy(new_scale);
+                position && InstancedMeshBase._position.copy(position);
+                rotation && InstancedMeshBase._rotation.copy(rotation);
+                scale && InstancedMeshBase._scale.copy(scale);
                 InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
                 InstancedMeshBase._matrix.compose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
                 InstancedMeshBase._matrix.premultiply(mesh.matrix);

package/InstancedMeshBase.ts

@@ -175,7 +175,6 @@ export default class InstancedMeshBase extends MeshBase {
         this.count = count;
 
         this.children.map((instanceMesh: InstancedMesh) => {
-
             const instanceMatrix = new InstancedBufferAttribute(new Float32Array(count * 16), 16);
             const instanceColor = new InstancedBufferAttribute(new Float32Array(count * 3).fill(1), 3);
 
@@ -197,15 +196,14 @@ export default class InstancedMeshBase extends MeshBase {
     }
 
     // 设置矩阵
-    async setMatrixAt(index: number, matrix: Matrix4) {
-        const new_matrix = matrix.clone();
+    async setMatrixAt(index: number, matrix: Matrix4 = new Matrix4().identity()) {
         await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
-            const instancedMesh = this.instanceCollect[uuid]
+            const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid]
             collect.forEach((mesh: Mesh, i: number) => {
-                InstancedMeshBase._matrix.copy(mesh.matrix)
-                InstancedMeshBase._matrix.premultiply(new_matrix);
+                InstancedMeshBase._matrix.copy(mesh.matrix);
+                InstancedMeshBase._matrix.premultiply(matrix);
 
                 instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
                 instancedMesh.instanceMatrix.needsUpdate = true;
@@ -219,20 +217,17 @@ export default class InstancedMeshBase extends MeshBase {
     async setTRS(
         index: number,
         {
-            position = InstancedMeshBase._position,
-            rotation = InstancedMeshBase._rotation,
-            scale = InstancedMeshBase._scale
+            position,
+            rotation,
+            scale
         }: {
             position?: Vector3;
             rotation?: Euler;
             scale?: Vector3
         }
     ) {
-        const new_position = position.clone();
-        const new_rotation = rotation.clone();
-        const new_scale = scale.clone();
         await this.awaitLoaded();
-        console.log("setTRS", index);
+
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid]
             const collect = this.meshCollect[uuid]
@@ -240,7 +235,6 @@ export default class InstancedMeshBase extends MeshBase {
 
                 //获取对应的模型的矩阵
                 instancedMesh.getMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
-
                 InstancedMeshBase._matrix.premultiply(mesh.matrix.clone().invert());
 
                 InstancedMeshBase._matrix.decompose(
@@ -249,9 +243,9 @@ export default class InstancedMeshBase extends MeshBase {
                     InstancedMeshBase._scale
                 );
                 InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
-                InstancedMeshBase._position.copy(new_position);
-                InstancedMeshBase._rotation.copy(new_rotation);
-                InstancedMeshBase._scale.copy(new_scale);
+                position && InstancedMeshBase._position.copy(position);
+                rotation && InstancedMeshBase._rotation.copy(rotation);
+                scale && InstancedMeshBase._scale.copy(scale);
                 InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
 
                 InstancedMeshBase._matrix.compose(
@@ -261,7 +255,6 @@ export default class InstancedMeshBase extends MeshBase {
                 );
 
                 InstancedMeshBase._matrix.premultiply(mesh.matrix);
-
                 instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
                 instancedMesh.instanceMatrix.needsUpdate = true;
             })

package/package.json

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