@galacean/effects 1.2.3 → 1.2.4

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.3
+ * Version: v1.2.4
  */
 
 'use strict';
@@ -9247,10 +9247,10 @@ var VFXItem = /** @class */ (function () {
     };
     VFXItem.prototype.translateByPixel = function (x, y) {
         if (this.composition) {
+            // @ts-expect-error
+            var _a = this.composition.renderer.canvas.getBoundingClientRect(), width = _a.width, height = _a.height;
             var z = this.transform.getWorldPosition().z;
-            var _a = this.composition.camera.getInverseVPRatio(z), rx = _a.x, ry = _a.y;
-            var width = this.composition.renderer.getWidth() / 2;
-            var height = this.composition.renderer.getHeight() / 2;
+            var _b = this.composition.camera.getInverseVPRatio(z), rx = _b.x, ry = _b.y;
             this.transform.translate(2 * x * rx / width, -2 * y * ry / height, 0);
         }
     };
@@ -21356,8 +21356,9 @@ var Camera = /** @class */ (function () {
     Camera.prototype.getInverseVPRatio = function (z) {
         var pos = new Vector3(0, 0, z);
         var mat = this.getViewProjectionMatrix();
-        var nz = pos.applyMatrix(mat).z;
-        return new Vector3(1, 1, nz).applyMatrix(mat);
+        var inverseVP = this.getInverseViewProjectionMatrix();
+        var nz = mat.projectPoint(pos).z;
+        return inverseVP.projectPoint(new Vector3(1, 1, nz));
     };
     /**
      * 设置相机的旋转四元数
@@ -21369,7 +21370,6 @@ var Camera = /** @class */ (function () {
             this.dirty = true;
         }
         else {
-            this.options.quat;
             if (!this.options.quat.equals(value)) {
                 this.options.quat.copyFrom(value);
                 this.dirty = true;
@@ -23701,16 +23701,17 @@ var AssetManager = /** @class */ (function () {
     };
     AssetManager.prototype.processBins = function (bins) {
         return __awaiter(this, void 0, void 0, function () {
-            var renderLevel, jobs;
+            var renderLevel, baseUrl, jobs;
             var _this = this;
             return __generator(this, function (_a) {
                 renderLevel = this.options.renderLevel;
+                baseUrl = this.baseUrl;
                 jobs = bins.map(function (bin) {
                     if (bin instanceof ArrayBuffer) {
                         return bin;
                     }
                     if (passRenderLevel(bin.renderLevel, renderLevel)) {
-                        return _this.loadBins(bin.url);
+                        return _this.loadBins(new URL(bin.url, baseUrl).href);
                     }
                     throw new Error("Invalid bins source: ".concat(JSON.stringify(bins)));
                 });
@@ -23728,13 +23729,14 @@ var AssetManager = /** @class */ (function () {
                     return [2 /*return*/];
                 }
                 jobs = fonts.map(function (font) { return __awaiter(_this, void 0, void 0, function () {
-                    var fontFace;
+                    var url, fontFace;
                     var _a;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
                                 if (!(font.fontURL && !AssetManager.fonts.has(font.fontFamily))) return [3 /*break*/, 4];
-                                fontFace = new FontFace((_a = font.fontFamily) !== null && _a !== void 0 ? _a : '', 'url(' + font.fontURL + ')');
+                                url = new URL(font.fontURL, this.baseUrl).href;
+                                fontFace = new FontFace((_a = font.fontFamily) !== null && _a !== void 0 ? _a : '', 'url(' + url + ')');
                                 _b.label = 1;
                             case 1:
                                 _b.trys.push([1, 3, , 4]);
@@ -23747,7 +23749,7 @@ var AssetManager = /** @class */ (function () {
                                 return [3 /*break*/, 4];
                             case 3:
                                 _b.sent();
-                                logger.warn("Invalid fonts source: ".concat(JSON.stringify(font.fontURL)));
+                                logger.warn("Invalid fonts source: ".concat(JSON.stringify(url)));
                                 return [3 /*break*/, 4];
                             case 4: return [2 /*return*/];
                         }
@@ -23979,7 +23981,7 @@ function createTextureOptionsBySource(image, sourceFrom) {
         return image.source;
     }
     else if (image instanceof HTMLImageElement ||
-        image instanceof HTMLCanvasElement) {
+        isCanvas(image)) {
         return {
             image: image,
             sourceType: exports.TextureSourceType.image,
@@ -24016,6 +24018,11 @@ function createTextureOptionsBySource(image, sourceFrom) {
     }
     throw new Error('Invalid texture options');
 }
+function isCanvas(cavnas) {
+    var _a;
+    // 小程序 Canvas 无法使用 instanceof HTMLCanvasElement 判断
+    return typeof cavnas === 'object' && cavnas !== null && ((_a = cavnas.tagName) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === 'CANVAS';
+}
 
 var CompVFXItem = /** @class */ (function (_super) {
     __extends(CompVFXItem, _super);
@@ -29599,6 +29606,7 @@ var Player = /** @class */ (function () {
         this.displayScale = 1;
         this.resumePending = false;
         this.disposed = false;
+        this.assetManagers = [];
         this.speed = 1;
         this.baseCompositionIndex = 0;
         /**
@@ -29881,7 +29889,7 @@ var Player = /** @class */ (function () {
     Player.prototype.createComposition = function (url, options) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var renderer, last, opts, source, scene, composition, firstFrameTime;
+            var renderer, last, opts, source, assetManager, scene, composition, firstFrameTime;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -29896,13 +29904,9 @@ var Player = /** @class */ (function () {
                         else {
                             source = url;
                         }
-                        if (this.assetManager) {
-                            this.assetManager.updateOptions(opts);
-                        }
-                        else {
-                            this.assetManager = new AssetManager(opts);
-                        }
-                        return [4 /*yield*/, this.assetManager.loadScene(source, this.renderer, { env: this.env })];
+                        assetManager = new AssetManager(opts);
+                        this.assetManagers.push(assetManager);
+                        return [4 /*yield*/, assetManager.loadScene(source, this.renderer, { env: this.env })];
                     case 1:
                         scene = _a.sent();
                         // 加载期间 player 销毁
@@ -30232,7 +30236,7 @@ var Player = /** @class */ (function () {
      * @param keepCanvas - 是否保留 canvas 画面，默认不保留，canvas 不能再被使用
      */
     Player.prototype.dispose = function (keepCanvas) {
-        var _a, _b;
+        var _a;
         logger.info("call player destroy: ".concat(this.name));
         if (this.disposed) {
             return;
@@ -30240,7 +30244,7 @@ var Player = /** @class */ (function () {
         playerMap.delete(this.canvas);
         this.pause();
         (_a = this.ticker) === null || _a === void 0 ? void 0 : _a.stop();
-        (_b = this.assetManager) === null || _b === void 0 ? void 0 : _b.dispose();
+        this.assetManagers.forEach(function (assetManager) { return assetManager.dispose(); });
         this.compositions.forEach(function (comp) { return comp.dispose(); });
         this.compositions.length = 0;
         this.renderer.context.removeLostHandler({ lost: this.lost });
@@ -30446,7 +30450,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.2.3";
+var version = "1.2.4";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;