@galacean/effects 1.2.0 → 1.2.2

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime player for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.2.0
+ * Version: v1.2.2
  */
 
 'use strict';
@@ -19972,9 +19972,10 @@ var TextItem = /** @class */ (function (_super) {
         if (this.textStyle.fontSize === value) {
             return;
         }
+        // 保证字号变化后位置正常
+        var diff = this.textStyle.fontSize - value;
+        this.textLayout.lineHeight += diff;
         this.textStyle.fontSize = value;
-        // 1.5175 = 31.43 / 20
-        this.textLayout.lineHeight = this.textStyle.fontSize * 1.5175;
         this.isDirty = true;
     };
     /**
@@ -23454,6 +23455,10 @@ var AssetManager = /** @class */ (function () {
          */
         this.assets = {};
         this.id = seed$5++;
+        /**
+         * 场景加载的超时定时器
+         */
+        this.timers = [];
         this.updateOptions(options);
     }
     AssetManager.prototype.updateOptions = function (options) {
@@ -23486,25 +23491,33 @@ var AssetManager = /** @class */ (function () {
                 compressedTexture = (_c = gpuInstance === null || gpuInstance === void 0 ? void 0 : gpuInstance.detail.compressedTexture) !== null && _c !== void 0 ? _c : 0;
                 cancelLoading = false;
                 waitPromise = new Promise(function (resolve, reject) {
-                    return loadTimer = window.setTimeout(function () {
+                    loadTimer = window.setTimeout(function () {
                         cancelLoading = true;
+                        _this.removeTimer(loadTimer);
                         var totalTime = performance.now() - startTime;
                         reject("Load time out: totalTime: ".concat(totalTime.toFixed(4), "ms ").concat(timeInfos.join(' '), ", url: ").concat(assetUrl));
                     }, _this.timeout * 1000);
+                    _this.timers.push(loadTimer);
                 });
                 hookTimeInfo = function (label, func) { return __awaiter(_this, void 0, void 0, function () {
-                    var st, result;
+                    var st, result, e_1;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                if (!!cancelLoading) return [3 /*break*/, 2];
+                                if (!!cancelLoading) return [3 /*break*/, 4];
                                 st = performance.now();
-                                return [4 /*yield*/, func()];
+                                _a.label = 1;
                             case 1:
+                                _a.trys.push([1, 3, , 4]);
+                                return [4 /*yield*/, func()];
+                            case 2:
                                 result = _a.sent();
                                 timeInfos.push("[".concat(label, ": ").concat((performance.now() - st).toFixed(2), "]"));
                                 return [2 /*return*/, result];
-                            case 2: throw new Error('load canceled.');
+                            case 3:
+                                e_1 = _a.sent();
+                                throw new Error("load error in ".concat(label, ", ").concat(e_1));
+                            case 4: throw new Error('load canceled.');
                         }
                     });
                 }); };
@@ -23588,6 +23601,7 @@ var AssetManager = /** @class */ (function () {
                                 totalTime = performance.now() - startTime;
                                 logger.info("Load asset: totalTime: ".concat(totalTime.toFixed(4), "ms ").concat(timeInfos.join(' '), ", url: ").concat(assetUrl));
                                 window.clearTimeout(loadTimer);
+                                this.removeTimer(loadTimer);
                                 scene.totalTime = totalTime;
                                 scene.startTime = startTime;
                                 return [2 /*return*/, scene];
@@ -23896,16 +23910,26 @@ var AssetManager = /** @class */ (function () {
             });
         });
     };
+    AssetManager.prototype.removeTimer = function (id) {
+        var index = this.timers.indexOf(id);
+        if (index !== -1) {
+            this.timers.splice(index, 1);
+        }
+    };
     /**
      * 销毁方法
      */
     AssetManager.prototype.dispose = function () {
         var _a;
+        if (this.timers.length) {
+            this.timers.map(function (id) { return window.clearTimeout(id); });
+        }
         for (var key in this.assets) {
             var asset = this.assets[key];
             (_a = asset === null || asset === void 0 ? void 0 : asset.dispose) === null || _a === void 0 ? void 0 : _a.call(asset);
         }
         this.assets = {};
+        this.timers = [];
     };
     /**
      * 自定义文本缓存，随页面销毁而销毁
@@ -29859,6 +29883,10 @@ var Player = /** @class */ (function () {
                         return [4 /*yield*/, this.assetManager.loadScene(source, this.renderer, { env: this.env })];
                     case 1:
                         scene = _a.sent();
+                        // 加载期间 player 销毁
+                        if (this.disposed) {
+                            throw new Error('Disposed player can not used to create Composition');
+                        }
                         composition = new Composition(__assign$1(__assign$1({}, opts), { renderer: renderer, width: renderer.getWidth(), height: renderer.getHeight(), event: this.event, onPlayerPause: this.handlePlayerPause, onMessageItem: this.handleMessageItem }), scene);
                         if (this.ticker) {
                             if (composition.renderLevel === RenderLevel$1.B) {
@@ -30217,6 +30245,10 @@ var Player = /** @class */ (function () {
         this.resize = throwErrorFunc;
         this.loadScene = throwErrorPromiseFunc;
         this.play = throwErrorPromiseFunc;
+        this.gotoAndPlay = throwErrorPromiseFunc;
+        this.gotoAndStop = throwErrorPromiseFunc;
+        this.playSequence = throwErrorFunc;
+        this.destroyCurrentCompositions = throwErrorFunc;
         this.resume = throwErrorPromiseFunc;
         this.disposed = true;
     };
@@ -30262,7 +30294,7 @@ var Player = /** @class */ (function () {
 }());
 function isSceneWithOptions(scene) {
     // TODO: 判断不太优雅，后期试情况优化
-    return isObject(scene) && 'scene' in scene;
+    return isObject(scene) && 'scene' in scene && 'options' in scene;
 }
 /**
  * 禁止/允许创建新的播放器，已创建的不受影响
@@ -30392,7 +30424,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.2.0";
+var version = "1.2.2";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;