three-base 1.0.82 → 1.0.83

package/lib/threeUtils.js

@@ -2,106 +2,84 @@
  * @Author: xiaosihan
  * @Date: 2022-02-24 22:49:42
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-03-16 14:34:49
+ * @Last Modified time: 2023-05-03 00:36:18
  */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 import { Box3, BufferGeometry, Clock, EventDispatcher, Object3D, Vector3 } from "three";
-var ThreeUtils = /** @class */ (function (_super) {
-    __extends(ThreeUtils, _super);
-    function ThreeUtils() {
-        var _this = _super.call(this) || this;
-        //@ts-ignore
-        _this.isProd = (process.env.NODE_ENV === "production");
-        //@ts-ignore
-        _this.isDev = (process.env.NODE_ENV === "development");
-        _this._timeTemp = performance.now();
-        _this._accumulate = 0; // 事件分发次数
-        _this._box3 = new Box3();
-        _this._size = new Vector3();
-        _this._center = new Vector3();
-        _this._clock = new Clock();
-        // 需要保持宽高比的元素列表
-        _this._keepZoomDoms = [];
-        _this.workList = [];
-        // 时钟对象
-        _this.clock = new Clock();
-        _this.requestAnimationFrame();
-        return _this;
+class ThreeUtils extends EventDispatcher {
+    constructor() {
+        super();
+        this.requestAnimationFrame();
     }
-    ThreeUtils.prototype.requestAnimationFrame = function () {
-        var _this = this;
+    //@ts-ignore
+    isProd = (process.env.NODE_ENV === "production");
+    //@ts-ignore
+    isDev = (process.env.NODE_ENV === "development");
+    _timeTemp = performance.now();
+    _accumulate = 0; // 事件分发次数
+    _box3 = new Box3();
+    _size = new Vector3();
+    _center = new Vector3();
+    _clock = new Clock();
+    requestAnimationFrame() {
         this._accumulate += 1;
-        var timeTemp = this._timeTemp = performance.now();
+        const timeTemp = this._timeTemp = performance.now();
         this.dispatchEvent({
             type: "requestAnimationFrame",
-            timeTemp: timeTemp,
+            timeTemp,
             accumulate: this._accumulate
         });
         this._computerDomZoom();
         //执行一个计划任务
-        var work = this.workList.splice(0, 1)[0];
+        let work = this.workList.splice(0, 1)[0];
         work && work();
-        setTimeout(function () {
-            _this.requestAnimationFrame();
+        setTimeout(() => {
+            this.requestAnimationFrame();
         }, 45 - this._clock.getDelta());
-    };
+    }
+    // 需要保持宽高比的元素列表
+    _keepZoomDoms = [];
     /**
      *计算需要保持比例的元素
      */
-    ThreeUtils.prototype._computerDomZoom = function () {
-        var _this = this;
+    _computerDomZoom() {
         //1. 踢除没有出现在页面上的 dom 元素
-        this._keepZoomDoms = this._keepZoomDoms.filter(function (l) { return _this.inDocument(l.dom); });
+        this._keepZoomDoms = this._keepZoomDoms.filter(l => this.inDocument(l.dom));
         //2.设置dom的缩放值样式
-        this._keepZoomDoms.map(function (item, i) {
-            var parentDom = item.dom.parentNode;
-            var scale = Math.min(parentDom.clientWidth / item.width, parentDom.clientHeight / item.height);
+        this._keepZoomDoms.map((item, i) => {
+            let parentDom = item.dom.parentNode;
+            let scale = Math.min(parentDom.clientWidth / item.width, parentDom.clientHeight / item.height);
             Object.assign(item.dom.style, {
                 position: "absolute",
                 top: "50%",
                 left: "50%",
-                transform: "translate(-50%, -50%) scale(".concat(scale, ")"),
-                width: "".concat(item.width, "px"),
-                height: "".concat(item.height, "px")
+                transform: `translate(-50%, -50%) scale(${scale})`,
+                width: `${item.width}px`,
+                height: `${item.height}px`
             });
         });
-    };
+    }
     /**
      * dom元素保持比例
      */
-    ThreeUtils.prototype.keepZoom = function (dom, width, height) {
-        if (width === void 0) { width = 1920; }
-        if (height === void 0) { height = 1080; }
+    keepZoom(dom, width = 1920, height = 1080) {
         if (dom) {
             // 去掉相同的dom存储的信息
-            this._keepZoomDoms = this._keepZoomDoms.filter(function (l) { return l.dom !== dom; });
+            this._keepZoomDoms = this._keepZoomDoms.filter(l => l.dom !== dom);
             // 把配置加入到列表中
-            this._keepZoomDoms.push({ dom: dom, width: width, height: height });
+            this._keepZoomDoms.push({ dom, width, height });
             dom.dataset.a = "这个元素缩放比例由 threeUtils.keepZoom 方法设置";
             this._computerDomZoom();
         }
-    };
+    }
+    workList = [];
+    // 时钟对象
+    clock = new Clock();
     // 按照任务队列依次执行计划任务 性能优化
     /**
      * @param {() => void} [callback]
      * @param {boolean} [first=true] 需要优先执行
      */
-    ThreeUtils.prototype.addWork = function (work, first) {
-        if (first === void 0) { first = false; }
+    addWork(work, first = false) {
         // 加入任务队列
         if (work && !this.workList.includes(work)) {
             if (first) {
@@ -111,11 +89,11 @@ var ThreeUtils = /** @class */ (function (_super) {
                 this.workList.push(work);
             }
         }
-    };
+    }
     /**
      *判断一个元素是否在页面上
      */
-    ThreeUtils.prototype.inDocument = function (dom) {
+    inDocument(dom) {
         if (dom === null) {
             return false;
         }
@@ -128,9 +106,9 @@ var ThreeUtils = /** @class */ (function (_super) {
         else {
             return this.inDocument(dom.parentNode);
         }
-    };
+    }
     // 获取中心点
-    ThreeUtils.prototype.getCenter = function (object3d) {
+    getCenter(object3d) {
         if (object3d instanceof Object3D) {
             this._box3.setFromObject(object3d);
             this._box3.getCenter(this._center);
@@ -140,9 +118,9 @@ var ThreeUtils = /** @class */ (function (_super) {
             object3d.boundingBox.getCenter(this._center);
         }
         return this._center;
-    };
+    }
     // 获取模型大小
-    ThreeUtils.prototype.getSize = function (object3d) {
+    getSize(object3d) {
         if (object3d instanceof Object3D) {
             this._box3.setFromObject(object3d);
             this._box3.getSize(this._size);
@@ -152,10 +130,9 @@ var ThreeUtils = /** @class */ (function (_super) {
             object3d.boundingBox.getSize(this._size);
         }
         return this._size;
-    };
+    }
     // 模型对齐底面
-    ThreeUtils.prototype.alignBottom = function (object3d, y) {
-        if (y === void 0) { y = 0; }
+    alignBottom(object3d, y = 0) {
         if (object3d instanceof Object3D) {
             this._box3.setFromObject(object3d);
             this._box3.getCenter(this._center);
@@ -168,9 +145,9 @@ var ThreeUtils = /** @class */ (function (_super) {
             object3d.computeBoundingBox();
             object3d.translate(0, -object3d.boundingBox.min.y + y, 0);
         }
-    };
+    }
     // 居中对象
-    ThreeUtils.prototype.centerObject3D = function (object3d) {
+    centerObject3D(object3d) {
         if (object3d instanceof Object3D) {
             this._box3.setFromObject(object3d);
             this._box3.getCenter(this._center);
@@ -180,24 +157,23 @@ var ThreeUtils = /** @class */ (function (_super) {
         else if (object3d instanceof BufferGeometry) {
             object3d.center();
         }
-    };
+    }
     //居中对象
-    ThreeUtils.prototype.center = function (object3d) {
+    center(object3d) {
         this.centerObject3D(object3d);
-    };
+    }
     //缩放至指定大小
-    ThreeUtils.prototype.scaleTo = function (object3d, size) {
-        if (size === void 0) { size = 1; }
-        var originSize = this.getSize(object3d);
-        var scale = size / Math.max(originSize.x, originSize.y, originSize.z);
+    scaleTo(object3d, size = 1) {
+        const originSize = this.getSize(object3d);
+        const scale = size / Math.max(originSize.x, originSize.y, originSize.z);
         if (object3d instanceof Object3D) {
             object3d.scale.multiplyScalar(scale);
+            object3d.updateMatrixWorld(true);
         }
         else if (object3d instanceof BufferGeometry) {
             object3d.scale(scale, scale, scale);
         }
-    };
-    return ThreeUtils;
-}(EventDispatcher));
-var threeUtils = new ThreeUtils();
+    }
+}
+const threeUtils = new ThreeUtils();
 export default threeUtils;

package/lib/threeUtils.ts

@@ -2,7 +2,7 @@
  * @Author: xiaosihan
  * @Date: 2022-02-24 22:49:42
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-03-16 14:34:49
+ * @Last Modified time: 2023-05-03 00:36:18
  */
 
 import { Box3, BufferGeometry, Clock, EventDispatcher, Object3D, Vector3 } from "three";
@@ -194,6 +194,7 @@ class ThreeUtils extends EventDispatcher {
         const scale = size / Math.max(originSize.x, originSize.y, originSize.z);
         if (object3d instanceof Object3D) {
             object3d.scale.multiplyScalar(scale);
+            object3d.updateMatrixWorld(true);
         } else if (object3d instanceof BufferGeometry) {
             object3d.scale(scale, scale, scale);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "1.0.82",
+    "version": "1.0.83",
     "description": "three 3d three-base",
     "repository": {
         "type": "git",
@@ -9,8 +9,7 @@
     "keywords": [
         "three",
         "3d",
-        "three-base",
-        "three-spritetext"
+        "three-base"
     ],
     "main": "index.js",
     "module": "index.js",
@@ -44,7 +43,6 @@
         "lodash": "^4",
         "three": ">=0.150.0",
         "dexie": "^3",
-        "three-spritetext": "^1",
         "@types/three": ">=0.149.0",
         "@types/element-resize-event": "^3",
         "@types/lodash": "^4",