three-base 1.0.52 → 1.0.54

package/declare.d.ts

@@ -1,6 +1,5 @@
 
 // 声明模块
-// declare module "canvas-to-png";
 
 declare interface Window {
 }

package/lib/ThreeBase.ts

@@ -15,7 +15,6 @@ import threeLoader from "./threeLoader";
 import ThreeMouse from "./ThreeMouse";
 import threeUtils from "./threeUtils";
 import Transition from "./Transition";
-import Canvas2image from "canvas-to-png";
 
 // three.js 的基础对象
 export default class ThreeBase extends EventDispatcher {
@@ -283,6 +282,17 @@ export default class ThreeBase extends EventDispatcher {
     //是否需要渲染, 当autoRender=false的时候就需要 手动触发渲染
     needRender = false;
 
+    
+    // 停止渲染
+    stopRender(){
+        threeUtils.removeEventListener("requestAnimationFrame", this.renderBindThis);
+        this.renderer.forceContextLoss();
+        // 标记上下文被销毁了
+        this.isRendererContextLost = true;
+        this.resize(100, 100);
+        this.renderer.domElement.style.opacity = "0";
+    }
+
     // 渲染场景
     render() {
 
@@ -291,12 +301,7 @@ export default class ThreeBase extends EventDispatcher {
 
         // canvas 没有在页面上面的话 就跳过渲染
         if (!threeUtils.inDocument(this.renderer.domElement)) {
-            threeUtils.removeEventListener("requestAnimationFrame", this.renderBindThis);
-            this.renderer.forceContextLoss();
-            // 标记上下文被销毁了
-            this.isRendererContextLost = true;
-            this.resize(100, 100);
-            this.renderer.domElement.style.opacity = "0";
+            this.stopRender();
             return;
         }
 

package/lib/threeUtils.ts

@@ -159,15 +159,11 @@ class ThreeUtils extends EventDispatcher {
 
     //缩放至指定大小
     scaleTo(object3d: Object3D | BufferGeometry, size: number = 1) {
+        const originSize = this.getSize(object3d);
+        const scale = size / Math.max(originSize.x, originSize.y, originSize.z);
         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.52",
+    "version": "1.0.54",
     "description": "three 3d three-base",
     "repository": {
         "type": "git",