@galacean/effects 1.1.1 → 1.1.3

package/dist/weapp.mjs

@@ -9317,11 +9317,9 @@ var Matrix4$1 = /** @class */ (function () {
         var vX = Matrix4.tempVec0;
         var vY = Matrix4.tempVec1;
         var vZ = Matrix4.tempVec2;
-        vZ.subtractVectors(target, eye);
+        vZ.subtractVectors(eye, target);
         vZ.normalize();
-        vY.copyFrom(up);
-        vY.normalize();
-        vX.crossVectors(vY, vZ);
+        vX.crossVectors(up, vZ);
         vX.normalize();
         vY.crossVectors(vZ, vX);
         var te = this.elements;
@@ -16010,7 +16008,7 @@ function loadImage(source) {
             }
             // 2. 非法类型
             if (!url) {
-                throw new Error("Invalid url type: ".concat(source));
+                throw new Error("Invalid url type: ".concat(JSON.stringify(source)));
             }
             return [2 /*return*/, new Promise(function (resolve, reject) {
                     var img = new Image();
@@ -16029,7 +16027,7 @@ function loadImage(source) {
                         if (revokeURL) {
                             URL.revokeObjectURL(url);
                         }
-                        return reject("Load image fail: ".concat(e));
+                        return reject("Load image fail: ".concat(JSON.stringify(e)));
                     };
                     img.src = url;
                 })];
@@ -19360,18 +19358,19 @@ var SpriteMesh = /** @class */ (function () {
         var uSizeStart = start + 4;
         var uQuatStart = start + 8;
         var uColorStart = start + 12;
-        if (!selfData.visible && !init) {
-            mainDataArray[uSizeStart + 2] = -1;
-            return;
-        }
-        var uColor = selfData.color || [mainDataArray[uColorStart], mainDataArray[uColorStart + 1], mainDataArray[uColorStart + 2], mainDataArray[uColorStart + 3]];
-        // if (selfData.startSize) {
-        //   selfData.transform.scaleBy(1 / selfData.startSize[0], 1 / selfData.startSize[1], 1);
-        // }
         var tempPos = new Vector3();
         var tempQuat = new Quaternion();
         var tempScale = new Vector3();
-        selfData.transform.assignWorldTRS(tempPos, tempQuat, tempScale);
+        var uColor = selfData.color || [mainDataArray[uColorStart], mainDataArray[uColorStart + 1], mainDataArray[uColorStart + 2], mainDataArray[uColorStart + 3]];
+        if (selfData.visible) {
+            selfData.transform.assignWorldTRS(tempPos, tempQuat, tempScale);
+        }
+        else {
+            if (!init) {
+                mainDataArray[uSizeStart + 2] = -1;
+                return;
+            }
+        }
         var uPos = __spreadArray$2(__spreadArray$2([], __read$3(tempPos.toArray()), false), [0], false);
         var uSize = __spreadArray$2(__spreadArray$2([], __read$3(tempScale.toArray()), false), [0], false);
         var uQuat = tempQuat.toArray();
@@ -29162,6 +29161,7 @@ var CompositionSourceManager = /** @class */ (function () {
         var e_1, _a;
         this.refCompositions = new Map();
         this.refCompositionProps = new Map();
+        this.mask = 0;
         // 资源
         var jsonScene = scene.jsonScene, renderLevel = scene.renderLevel, textureOptions = scene.textureOptions, pluginSystem = scene.pluginSystem, totalTime = scene.totalTime;
         var compositions = jsonScene.compositions, imgUsage = jsonScene.imgUsage, compositionId = jsonScene.compositionId;
@@ -29200,7 +29200,6 @@ var CompositionSourceManager = /** @class */ (function () {
         this.totalTime = totalTime !== null && totalTime !== void 0 ? totalTime : 0;
         this.imgUsage = imgUsage !== null && imgUsage !== void 0 ? imgUsage : {};
         this.textures = cachedTextures;
-        this.mask = 0;
         listOrder = 0;
         this.textureOptions = textureOptions;
         this.sourceContent = this.getContent(this.composition);
@@ -29225,10 +29224,6 @@ var CompositionSourceManager = /** @class */ (function () {
     CompositionSourceManager.prototype.assembleItems = function (composition) {
         var _this = this;
         var items = [];
-        var mask = this.mask;
-        if (isNaN(mask)) {
-            mask = 0;
-        }
         composition.items.forEach(function (item) {
             var _a;
             var option = {};
@@ -29244,15 +29239,7 @@ var CompositionSourceManager = /** @class */ (function () {
                     option.type = type;
                     if (renderContent.renderer) {
                         renderContent.renderer = _this.changeTex(renderContent.renderer);
-                        if (!renderContent.renderer.mask) {
-                            var maskMode = renderContent.renderer.maskMode;
-                            if (maskMode === MaskMode$1.MASK) {
-                                renderContent.renderer.mask = ++mask;
-                            }
-                            else if (maskMode === MaskMode$1.OBSCURED || maskMode === MaskMode$1.REVERSE_OBSCURED) {
-                                renderContent.renderer.mask = mask;
-                            }
-                        }
+                        _this.processMask(renderContent.renderer);
                         var split = renderContent.splits && !renderContent.textureSheetAnimation && renderContent.splits[0];
                         if (Number.isInteger(renderContent.renderer.shape)) {
                             // TODO: scene.shapes 类型问题？
@@ -29297,16 +29284,18 @@ var CompositionSourceManager = /** @class */ (function () {
                     }
                     // 处理预合成的渲染顺序
                     if (option.type === ItemType$1.composition) {
+                        ++_this.mask;
                         var refId = item.content.options.refId;
                         if (!_this.refCompositions.get(refId)) {
                             throw new Error('Invalid Ref Composition id: ' + refId);
                         }
+                        var ref = _this.getContent(_this.refCompositions.get(refId));
                         if (!_this.refCompositionProps.has(refId)) {
-                            _this.refCompositionProps.set(refId, _this.getContent(_this.refCompositions.get(refId)));
+                            _this.refCompositionProps.set(refId, ref);
                         }
-                        var ref = _this.refCompositionProps.get(refId);
                         ref.items.forEach(function (item) {
                             item.listIndex = listOrder++;
+                            _this.processMask(item.content);
                         });
                         option.items = ref.items;
                     }
@@ -29342,6 +29331,23 @@ var CompositionSourceManager = /** @class */ (function () {
             }
         }
     };
+    /**
+     * 处理蒙版和遮挡关系写入 stencil 的 ref 值
+     */
+    CompositionSourceManager.prototype.processMask = function (renderer) {
+        if (renderer.maskMode === MaskMode$1.NONE) {
+            return;
+        }
+        if (!renderer.mask) {
+            var maskMode = renderer.maskMode;
+            if (maskMode === MaskMode$1.MASK) {
+                renderer.mask = ++this.mask;
+            }
+            else if (maskMode === MaskMode$1.OBSCURED || maskMode === MaskMode$1.REVERSE_OBSCURED) {
+                renderer.mask = this.mask;
+            }
+        }
+    };
     CompositionSourceManager.prototype.dispose = function () {
         this.textureOptions = [];
         this.textures = [];
@@ -29416,7 +29422,7 @@ var AssetManager = /** @class */ (function () {
                 waitPromise = new Promise(function (resolve, reject) {
                     return loadTimer = window$1.setTimeout(function () {
                         cancelLoading = true;
-                        reject("Load time out: ".concat(url));
+                        reject("Load time out: ".concat(JSON.stringify(url)));
                     }, _this.timeout * 1000);
                 });
                 hookTimeInfo = function (label, func) { return __awaiter(_this, void 0, void 0, function () {
@@ -29581,7 +29587,7 @@ var AssetManager = /** @class */ (function () {
                     if (passRenderLevel(bin.renderLevel, renderLevel)) {
                         return _this.loadBins(bin.url);
                     }
-                    throw new Error("Invalid bins source: ".concat(bins));
+                    throw new Error("Invalid bins source: ".concat(JSON.stringify(bins)));
                 });
                 return [2 /*return*/, Promise.all(jobs)];
             });
@@ -29617,7 +29623,7 @@ var AssetManager = /** @class */ (function () {
                             case 3:
                                 _b.sent();
                                 console.warn({
-                                    content: "Invalid fonts source: ".concat(font.fontURL),
+                                    content: "Invalid fonts source: ".concat(JSON.stringify(font.fontURL)),
                                     type: LOG_TYPE,
                                 });
                                 return [3 /*break*/, 4];
@@ -29786,7 +29792,7 @@ var AssetManager = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         _this.downloader.downloadJSON(url, resolve, function (status, responseText) {
-                            reject("Couldn't load JSON ".concat(url, ": status ").concat(status, ", ").concat(responseText));
+                            reject("Couldn't load JSON ".concat(JSON.stringify(url), ": status ").concat(status, ", ").concat(responseText));
                         });
                     })];
             });
@@ -29798,7 +29804,7 @@ var AssetManager = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         _this.downloader.downloadBinary(url, resolve, function (status, responseText) {
-                            reject("Couldn't load bins ".concat(url, ": status ").concat(status, ", ").concat(responseText));
+                            reject("Couldn't load bins ".concat(JSON.stringify(url), ": status ").concat(status, ", ").concat(responseText));
                         });
                     })];
             });
@@ -31144,7 +31150,10 @@ var Ticker = /** @class */ (function () {
     };
     Ticker.prototype.setFPS = function (fps) {
         this.targetFPS = clamp$1(fps, 1, 120);
-        this.interval = Math.floor(1000 / fps) - 1;
+        // 注意：-2 的原因是保证帧率稳定
+        // interval 在 fps 为 60 的时候设成 15 累计误差会很大，设成 14 较稳定
+        // requestanimationFrame 在不同的刷新率下时间间隔不一样，120hz 的误差在 8 以内，60hz 的误差在 16 以内
+        this.interval = Math.floor(1000 / fps) - 2;
     };
     /**
      * 获取定时器暂停标志位
@@ -35150,22 +35159,23 @@ var GLRenderer = /** @class */ (function (_super) {
     });
     Object.defineProperty(GLRenderer.prototype, "height", {
         get: function () {
-            var _a;
-            return ((_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.height) || 0;
+            var _a, _b;
+            return (_b = (_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.height) !== null && _b !== void 0 ? _b : 0;
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(GLRenderer.prototype, "width", {
         get: function () {
-            var _a;
-            return ((_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.width) || 0;
+            var _a, _b;
+            return (_b = (_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 0;
         },
         enumerable: false,
         configurable: true
     });
     GLRenderer.prototype.renderRenderFrame = function (renderFrame) {
         var e_1, _a, e_2, _b;
+        var _c, _d;
         var frame = renderFrame;
         // TODO 需要一个贴图统一初始化的管理类，避免在渲染逻辑代码中初始化。
         // 初始化renderframe的贴图资源
@@ -35194,9 +35204,9 @@ var GLRenderer = /** @class */ (function (_super) {
             for (var passes_1 = __values$1(passes), passes_1_1 = passes_1.next(); !passes_1_1.done; passes_1_1 = passes_1.next()) {
                 var pass = passes_1_1.value;
                 var delegate = pass.delegate;
-                delegate.willBeginRenderPass && (delegate === null || delegate === void 0 ? void 0 : delegate.willBeginRenderPass(pass, this.renderingData));
+                (_c = delegate.willBeginRenderPass) === null || _c === void 0 ? void 0 : _c.call(delegate, pass, this.renderingData);
                 this.renderRenderPass(pass);
-                delegate.didEndRenderPass && (delegate === null || delegate === void 0 ? void 0 : delegate.didEndRenderPass(pass, this.renderingData));
+                (_d = delegate.didEndRenderPass) === null || _d === void 0 ? void 0 : _d.call(delegate, pass, this.renderingData);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -35231,6 +35241,7 @@ var GLRenderer = /** @class */ (function (_super) {
     };
     GLRenderer.prototype.renderMeshes = function (meshes) {
         var e_3, _a;
+        var _b, _c;
         var delegate = this.renderingData.currentPass.delegate;
         try {
             for (var meshes_1 = __values$1(meshes), meshes_1_1 = meshes_1.next(); !meshes_1_1.done; meshes_1_1 = meshes_1.next()) {
@@ -35248,9 +35259,9 @@ var GLRenderer = /** @class */ (function (_super) {
                 }
                 mesh.material.initialize();
                 mesh.geometry.initialize();
-                delegate.willRenderMesh && delegate.willRenderMesh(mesh, this.renderingData);
+                (_b = delegate.willRenderMesh) === null || _b === void 0 ? void 0 : _b.call(delegate, mesh, this.renderingData);
                 mesh.render(this);
-                delegate.didiRenderMesh && delegate.didiRenderMesh(mesh, this.renderingData);
+                (_c = delegate.didRenderMesh) === null || _c === void 0 ? void 0 : _c.call(delegate, mesh, this.renderingData);
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -36347,9 +36358,9 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.1.1";
+var version = "1.1.3";
 console.info({
-    content: '[Galacean Effects Player] version: ' + "1.1.1",
+    content: '[Galacean Effects Player] version: ' + "1.1.3",
     type: LOG_TYPE,
 });