three-base 1.0.14 → 1.0.16

package/index.ts

@@ -14,6 +14,9 @@ export { default as KeyFrameAnimation } from "./lib/KeyFrameAnimation";
 export type { KeyframeAnimationProps } from "./lib/KeyFrameAnimation";
 export type { Keyframe } from "./lib/KeyFrameAnimation";
 
+//实例模型组对象
+export { default as InstancedGroupMesh } from "./lib/InstancedGroupMesh";
+
 //点光源
 export { default as PointLight } from "./lib/PointLight";
 

package/lib/InstancedGroupMesh.ts

@@ -0,0 +1,71 @@
+/*
+ * @Author: xiaosihan 
+ * @Date: 2023-02-21 09:55:52 
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-02-21 10:12:33
+ */
+
+import * as THREE from 'three'
+
+// 模型组转成 实例对象
+export default class InstancedGroupMesh extends THREE.Mesh {
+    isInstancedGroupMesh = true
+
+    count: number = 0
+
+    meshCollect: Record<string, THREE.Mesh[]> = {}
+
+    instanceCollect: Record<string, THREE.InstancedMesh> = {}
+
+    static matrix = new THREE.Matrix4()
+
+    constructor(group: THREE.Group, count: number) {
+        super()
+
+        this.count = count
+
+        const { meshCollect, instanceCollect } = this
+
+        // collect all mesh counts, in case there are more than one copy of the same mesh in this group
+        group.traverse((obj) => {
+            if (obj.type !== 'Mesh') return
+            const mesh = obj as THREE.Mesh
+
+            // this is important
+            mesh.updateMatrix()
+
+            // same geometry and same material consider as the same mesh
+            const uuid = mesh.geometry.uuid + '/' + (mesh.material as THREE.Material).uuid
+
+            if (meshCollect[uuid]) {
+                meshCollect[uuid].push(mesh)
+            } else {
+                meshCollect[uuid] = [mesh]
+            }
+        })
+
+        // create all instances
+        Object.keys(meshCollect).forEach(uuid => {
+            const meshes = meshCollect[uuid]
+            const mesh = meshes[0]
+
+            const instancedMesh = new THREE.InstancedMesh(mesh.geometry, mesh.material, meshes.length * count)
+            instanceCollect[uuid] = instancedMesh
+            this.add(instancedMesh)
+        })
+    }
+
+    setMatrixAt(index: number, matrix: THREE.Matrix4) {
+        Object.keys(this.meshCollect).forEach(uuid => {
+            const instancedMesh = this.instanceCollect[uuid]
+            const collect = this.meshCollect[uuid]
+            collect.forEach((mesh: THREE.Mesh, i: number) => {
+                InstancedGroupMesh.matrix.copy(mesh.matrix)
+                InstancedGroupMesh.matrix.premultiply(matrix)
+
+                instancedMesh.setMatrixAt(collect.length * index + i, InstancedGroupMesh.matrix);
+                instancedMesh.instanceMatrix.needsUpdate = true;
+            })
+        })
+    }
+}

package/lib/Transition.ts

@@ -92,6 +92,7 @@ export default class Transition {
         } else {
             this.onChangeCall(this.getJson());
         }
+        return this;
     }
 
     runbindThis = this.run.bind(this);
@@ -144,7 +145,7 @@ export default class Transition {
         return 0;
     }
 
-    set(param: TParam): this {
+    async set(param: TParam): Promise<this> {
 
         let timetemp = performance.now() + this._delay;;
 
@@ -184,6 +185,11 @@ export default class Transition {
 
         }
         threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
+
+        while (!this._isDone) {
+            await new Promise(resolve => setTimeout(resolve, 50));
+        }
+
         return this;
     }
     // 重置起始和终止位置

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "description": "three 3d three-base",
     "keywords": [
         "three",