three-base 2.0.68 → 2.0.70

package/InstancedMeshBase.d.ts

@@ -1,8 +1,7 @@
-import { Color, InstancedBufferAttribute, InstancedMesh, Matrix4, Mesh, Vector3 } from "three";
+import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Mesh, Quaternion, Vector3 } from "three";
 import MeshBase from "./MeshBase";
 export default class InstancedMeshBase extends MeshBase {
     constructor(url?: string);
-    url: string;
     isInstancedGroupMesh: boolean;
     count: number;
     size: Vector3;
@@ -10,6 +9,10 @@ export default class InstancedMeshBase extends MeshBase {
     instanceCollect: Record<string, InstancedMesh>;
     colorMap: Map<String, Color>;
     children: InstancedMesh[];
+    static _position: Vector3;
+    static _scale: Vector3;
+    static _rotation: Euler;
+    static _Quaternion: Quaternion;
     static matrix: Matrix4;
     instanceMatrix: InstancedBufferAttribute;
     instanceColor: InstancedBufferAttribute;
@@ -17,6 +20,11 @@ export default class InstancedMeshBase extends MeshBase {
     computeBoundingSphere: import("lodash").DebouncedFunc<() => void>;
     setCount(count?: number): void;
     setMatrixAt(index: number, matrix: Matrix4): void;
+    setTRS(index: number, { position, rotation, scale }: {
+        position?: Vector3;
+        rotation?: Euler;
+        scale?: Vector3;
+    }): void;
     setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined): void;
     updateMatrixWorld(force?: boolean): void;
     addEventListener(name: string, callback: (e: any) => void): void;

package/InstancedMeshBase.js

@@ -5,7 +5,7 @@
  * @Last Modified time: 2024-06-07 22:14:53
  */
 import { throttle } from "lodash";
-import { InstancedBufferAttribute, InstancedMesh, Matrix4, Vector3 } from "three";
+import { Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Quaternion, Vector3 } from "three";
 import MeshBase from "./MeshBase";
 import threeUtils from "./threeUtils";
 import threeLoader from "./threeLoader";
@@ -14,13 +14,16 @@ export default class InstancedMeshBase extends MeshBase {
     constructor(url) {
         super(url);
     }
-    url = "";
     isInstancedGroupMesh = true;
     count = 0;
     size = new Vector3(1, 1, 1);
     meshCollect = {};
     instanceCollect = {};
     colorMap = new Map();
+    static _position = new Vector3();
+    static _scale = new Vector3(1, 1, 1);
+    static _rotation = new Euler();
+    static _Quaternion = new Quaternion();
     static matrix = new Matrix4();
     instanceMatrix = new InstancedBufferAttribute(new Float32Array(0 * 16), 16);
     instanceColor = new InstancedBufferAttribute(new Float32Array(0 * 3), 3);
@@ -37,7 +40,6 @@ export default class InstancedMeshBase extends MeshBase {
             // 万能加载器
             let modal = await threeLoader.loadModel(url, filename);
             threeUtils.center(modal);
-            threeUtils.alignBottom(modal);
             modal.updateMatrixWorld(true);
             MeshBase.models.set(url, modal);
             MeshBase.loadModeling.set(url, false);
@@ -151,6 +153,29 @@ export default class InstancedMeshBase extends MeshBase {
         });
         this.computeBoundingSphere();
     }
+    //设置移动旋转缩放
+    setTRS(index, { position = InstancedMeshBase._position, rotation = InstancedMeshBase._rotation, scale = InstancedMeshBase._scale }) {
+        Object.keys(this.meshCollect).forEach(uuid => {
+            const instancedMesh = this.instanceCollect[uuid];
+            const collect = this.meshCollect[uuid];
+            collect.forEach((mesh, i) => {
+                //获取对应的模型的矩阵
+                instancedMesh.getMatrixAt(collect.length * index + i, InstancedMeshBase.matrix);
+                InstancedMeshBase.matrix.premultiply(mesh.matrix.clone().invert());
+                InstancedMeshBase.matrix.decompose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
+                InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
+                InstancedMeshBase._position.copy(position);
+                InstancedMeshBase._rotation.copy(rotation);
+                InstancedMeshBase._scale.copy(scale);
+                InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
+                InstancedMeshBase.matrix.compose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
+                InstancedMeshBase.matrix.premultiply(mesh.matrix);
+                instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase.matrix);
+                instancedMesh.instanceMatrix.needsUpdate = true;
+            });
+        });
+        this.computeBoundingSphere();
+    }
     // 设置颜色
     setColorAt(index, color) {
         Object.keys(this.meshCollect).forEach(uuid => {

package/InstancedMeshBase.ts

@@ -6,7 +6,7 @@
  */
 
 import { throttle } from "lodash";
-import { Color, InstancedBufferAttribute, InstancedMesh, Material, Matrix4, Mesh, Object3D, Vector3 } from "three";
+import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Material, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "three";
 import MeshBase from "./MeshBase";
 import threeUtils from "./threeUtils";
 import threeLoader from "./threeLoader";
@@ -17,8 +17,6 @@ export default class InstancedMeshBase extends MeshBase {
         super(url);
     }
 
-    url = "";
-
     isInstancedGroupMesh = true
 
     count: number = 0;
@@ -33,6 +31,10 @@ export default class InstancedMeshBase extends MeshBase {
 
     declare children: InstancedMesh[];
 
+    static _position: Vector3 = new Vector3();
+    static _scale: Vector3 = new Vector3(1, 1, 1);
+    static _rotation: Euler = new Euler();
+    static _Quaternion: Quaternion = new Quaternion();
     static matrix = new Matrix4()
 
     instanceMatrix = new InstancedBufferAttribute(new Float32Array(0 * 16), 16);
@@ -56,7 +58,6 @@ export default class InstancedMeshBase extends MeshBase {
             let modal = await threeLoader.loadModel(url, filename);
 
             threeUtils.center(modal);
-            threeUtils.alignBottom(modal);
             modal.updateMatrixWorld(true);
 
             MeshBase.models.set(url, modal);
@@ -201,6 +202,56 @@ export default class InstancedMeshBase extends MeshBase {
         this.computeBoundingSphere();
     }
 
+    //设置移动旋转缩放
+    setTRS(
+        index: number,
+        {
+            position = InstancedMeshBase._position,
+            rotation = InstancedMeshBase._rotation,
+            scale = InstancedMeshBase._scale
+        }: {
+            position?: Vector3;
+            rotation?: Euler;
+            scale?: Vector3
+        }
+    ) {
+        Object.keys(this.meshCollect).forEach(uuid => {
+            const instancedMesh = this.instanceCollect[uuid]
+            const collect = this.meshCollect[uuid]
+            collect.forEach((mesh: Mesh, i: number) => {
+
+                //获取对应的模型的矩阵
+                instancedMesh.getMatrixAt(collect.length * index + i, InstancedMeshBase.matrix);
+
+                InstancedMeshBase.matrix.premultiply(mesh.matrix.clone().invert());
+
+                InstancedMeshBase.matrix.decompose(
+                    InstancedMeshBase._position,
+                    InstancedMeshBase._Quaternion,
+                    InstancedMeshBase._scale
+                );
+                InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
+                InstancedMeshBase._position.copy(position);
+                InstancedMeshBase._rotation.copy(rotation);
+                InstancedMeshBase._scale.copy(scale);
+                InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
+
+                InstancedMeshBase.matrix.compose(
+                    InstancedMeshBase._position,
+                    InstancedMeshBase._Quaternion,
+                    InstancedMeshBase._scale
+                );
+
+                InstancedMeshBase.matrix.premultiply(mesh.matrix);
+
+                instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase.matrix);
+                instancedMesh.instanceMatrix.needsUpdate = true;
+            })
+        })
+
+        this.computeBoundingSphere();
+    }
+
     // 设置颜色
     setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined) {
         Object.keys(this.meshCollect).forEach(uuid => {

package/MeshBase.d.ts

@@ -1,6 +1,7 @@
 import { AnimationAction, AnimationMixer, Clock, Group, Mesh, Object3D, Vector3 } from "three";
 export default class MeshBase extends Group {
     constructor(url?: string);
+    url: string;
     static models: Map<string, Object3D>;
     static loadModeling: Map<string, boolean>;
     loaded: boolean;

package/MeshBase.js

@@ -8,6 +8,7 @@ export default class MeshBase extends Group {
         super();
         url && this.loadModel(url);
     }
+    url = "";
     // 模型对象
     static models = new Map();
     // 模型是否在加载中
@@ -27,6 +28,7 @@ export default class MeshBase extends Group {
     }
     // 如果url 是blob地址的话,就用suffix字段来制定模型的类型
     async loadModel(url, filename = "") {
+        this.url = url;
         if (!url) {
             this.clear();
             return;

package/MeshBase.ts

@@ -12,6 +12,8 @@ export default class MeshBase extends Group {
         url && this.loadModel(url);
     }
 
+    url = "";
+
     // 模型对象
     static models: Map<string, Object3D> = new Map();
 
@@ -38,6 +40,9 @@ export default class MeshBase extends Group {
 
     // 如果url 是blob地址的话,就用suffix字段来制定模型的类型
     async loadModel(url: string, filename: string = "") {
+
+        this.url = url;
+
         if (!url) {
             this.clear();
             return;

package/package.json

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