three-base 1.0.24 → 1.0.26

package/lib/ThreeBase.ts

@@ -214,10 +214,7 @@ export default class ThreeBase extends EventDispatcher {
         }
 
         // 等待动画执行完成
-        while (!this.controlsCenter.isDone() || !this.controlsPosition.isDone()) {
-            await new Promise(resolve => setTimeout(resolve, 100));
-        }
-
+        await new Promise(resolve => setTimeout(resolve, Math.max(this.controlsCenter._duration, this.controlsPosition._duration)));
     }
 
     // 获取控制的位置和朝向 保留3位小数

package/lib/Transition.ts

@@ -186,9 +186,7 @@ export default class Transition {
         }
         threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
 
-        while (!this._isDone) {
-            await new Promise(resolve => setTimeout(resolve, 50));
-        }
+        await new Promise(resolve => setTimeout(resolve, this._duration));
 
         return this;
     }

package/lib/threeUtils.ts

@@ -5,7 +5,7 @@
  * @Last Modified time: 2022-06-21 16:45:33
  */
 
-import { Box3, Clock, EventDispatcher, Object3D, Vector3 } from "three";
+import { Box3, BufferGeometry, Clock, EventDispatcher, Object3D, Vector3 } from "three";
 
 class ThreeUtils extends EventDispatcher {
 
@@ -16,7 +16,7 @@ class ThreeUtils extends EventDispatcher {
     }
     //@ts-ignore
     isProd = process.env.NODE_ENV === "production";
-    
+
     //@ts-ignore
     isDev = process.env.NODE_ENV === "development";
 
@@ -45,37 +45,60 @@ class ThreeUtils extends EventDispatcher {
     }
 
     // 获取模型大小
-    getSize(object3d: Object3D) {
-        this.box3.setFromObject(object3d);
-        this.box3.getSize(this.size);
+    getSize(object3d: Object3D | BufferGeometry) {
+
+        if (object3d instanceof Object3D) {
+            this.box3.setFromObject(object3d);
+            this.box3.getSize(this.size);
+        } else if (object3d instanceof BufferGeometry) {
+            object3d.computeBoundingBox();
+            object3d.boundingBox!.getSize(this.size);
+        }
+
         return this.size;
     }
 
     // 模型对齐底面
-    alignButton(object3d: Object3D, y = 0) {
-        this.box3.setFromObject(object3d);
-        this.box3.getCenter(this.center);
-        this.box3.getSize(this.size);
-        object3d.position.y -= (this.center.y - (this.size.y * 0.5));
-        object3d.position.y += y;
-        object3d.updateMatrixWorld(true);
+    alignBotton(object3d: Object3D | BufferGeometry, y = 0) {
+
+        if (object3d instanceof Object3D) {
+            this.box3.setFromObject(object3d);
+            this.box3.getCenter(this.center);
+            this.box3.getSize(this.size);
+            object3d.position.y -= (this.center.y - (this.size.y * 0.5));
+            object3d.position.y += y;
+            object3d.updateMatrixWorld(true);
+        } else if (object3d instanceof BufferGeometry) {
+            object3d.computeBoundingBox();
+            object3d.translate(0, -object3d.boundingBox!.min.y, 0);
+        }
     }
 
     // 居中对象
-    centerObject3D(object3d: Object3D) {
-        this.box3.setFromObject(object3d);
-        this.box3.getCenter(this.center);
-        object3d.position.sub(this.center);
-        object3d.updateMatrixWorld(true);
+    centerObject3D(object3d: Object3D | BufferGeometry) {
+        if (object3d instanceof Object3D) {
+            this.box3.setFromObject(object3d);
+            this.box3.getCenter(this.center);
+            object3d.position.sub(this.center);
+            object3d.updateMatrixWorld(true);
+        } else if (object3d instanceof BufferGeometry) {
+            object3d.center();
+        }
     }
 
     //缩放至指定大小
-    scaleTo(object3d: Object3D, size: number = 1) {
-        this.box3.setFromObject(object3d);
-        this.box3.getSize(this.size);
-        const scale = size / Math.max(this.size.x, this.size.y, this.size.z);
-        object3d.scale.multiplyScalar(scale);
-        object3d.updateMatrixWorld(true);
+    scaleTo(object3d: Object3D | BufferGeometry, size: number = 1) {
+        if (object3d instanceof Object3D) {
+            this.box3.setFromObject(object3d);
+            this.box3.getSize(this.size);
+            const scale = size / Math.max(this.size.x, this.size.y, this.size.z);
+            object3d.scale.multiplyScalar(scale);
+            object3d.updateMatrixWorld(true);
+        } else if (object3d instanceof BufferGeometry) {
+            const originSize = this.getSize(object3d);
+            const scale = size / Math.max(originSize.x, originSize.y, originSize.z);
+            object3d.scale(scale, scale, scale);
+        }
     }
 
 }

package/package.json

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