@galacean/effects 1.1.1 → 1.1.2

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime player for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.1.1
+ * Version: v1.1.2
  */
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -19366,18 +19366,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();
@@ -29168,6 +29169,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;
@@ -29206,7 +29208,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);
@@ -29231,10 +29232,7 @@ var CompositionSourceManager = /** @class */ (function () {
     CompositionSourceManager.prototype.assembleItems = function (composition) {
         var _this = this;
         var items = [];
-        var mask = this.mask;
-        if (isNaN(mask)) {
-            mask = 0;
-        }
+        this.mask++;
         composition.items.forEach(function (item) {
             var _a;
             var option = {};
@@ -29251,13 +29249,7 @@ var CompositionSourceManager = /** @class */ (function () {
                     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, _this.mask);
                         }
                         var split = renderContent.splits && !renderContent.textureSheetAnimation && renderContent.splits[0];
                         if (Number.isInteger(renderContent.renderer.shape)) {
@@ -29303,16 +29295,18 @@ var CompositionSourceManager = /** @class */ (function () {
                     }
                     // 处理预合成的渲染顺序
                     if (option.type === ItemType$1.composition) {
+                        var maskRef_1 = ++_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, maskRef_1);
                         });
                         option.items = ref.items;
                     }
@@ -29348,6 +29342,17 @@ var CompositionSourceManager = /** @class */ (function () {
             }
         }
     };
+    /**
+     * 处理蒙版和遮挡关系写入 stencil 的 ref 值
+     */
+    CompositionSourceManager.prototype.processMask = function (renderer, maskRef) {
+        if (!renderer.mask) {
+            var maskMode = renderer.maskMode;
+            if (maskMode !== MaskMode$1.NONE) {
+                renderer.mask = maskRef;
+            }
+        }
+    };
     CompositionSourceManager.prototype.dispose = function () {
         this.textureOptions = [];
         this.textures = [];
@@ -36353,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.2";
 console.info({
-    content: '[Galacean Effects Player] version: ' + "1.1.1",
+    content: '[Galacean Effects Player] version: ' + "1.1.2",
     type: LOG_TYPE,
 });