@galacean/effects-core 1.2.0 → 1.2.2

package/dist/asset-manager.d.ts

@@ -1,5 +1,4 @@
 import type * as spec from '@galacean/effects-specification';
-import type { JSONValue } from './downloader';
 import { Downloader } from './downloader';
 import type { Disposable } from './utils';
 import type { Scene } from './scene';
@@ -73,6 +72,10 @@ export interface SceneLoadOptions {
      */
     speed?: number;
 }
+/**
+ * 被接受用于加载的数据类型
+ */
+export type SceneType = string | Scene | Record<string, unknown>;
 /**
  * 资源管理器
  * 用于加载和动效中所有的资源文件，包括图片、插件、图层粒子数据等
@@ -98,6 +101,10 @@ export declare class AssetManager implements Disposable {
      * @default 10
      */
     private timeout;
+    /**
+     * 场景加载的超时定时器
+     */
+    private timers;
     /**
      * 构造函数
      * @param options - 场景加载参数
@@ -112,7 +119,7 @@ export declare class AssetManager implements Disposable {
      * @param options - 扩展参数
      * @returns
      */
-    loadScene(url: string | JSONValue | Scene, renderer?: Renderer, options?: {
+    loadScene(url: SceneType, renderer?: Renderer, options?: {
         env: string;
     }): Promise<Scene>;
     private precompile;
@@ -123,6 +130,7 @@ export declare class AssetManager implements Disposable {
     private processTextures;
     private loadJSON;
     private loadBins;
+    private removeTimer;
     /**
      * 销毁方法
      */

package/dist/composition.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@galacean/effects-specification';
 import type { Ray } from '@galacean/effects-math/es/core/index';
-import type { JSONValue } from './downloader';
+import type { SceneType } from './asset-manager';
 import type { Scene } from './scene';
 import type { Disposable, LostHandler } from './utils';
 import { Transform } from './transform';
@@ -138,7 +138,7 @@ export declare class Composition implements Disposable, LostHandler {
     /**
      * 合成对应的 url 或者 JSON
      */
-    readonly url: string | JSONValue;
+    readonly url: SceneType;
     /**
      * 合成对象
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core 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$1++;
+        /**
+         * 场景加载的超时定时器
+         */
+        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 = [];
     };
     /**
      * 自定义文本缓存，随页面销毁而销毁