@galacean/effects-threejs 1.1.0 → 1.1.2

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.1.0
+ * Version: v1.1.2
  */
 
 'use strict';
@@ -14957,6 +14957,11 @@ var VFXItem = /** @class */ (function () {
                         }
                         else if (this.endBehavior === END_BEHAVIOR_DESTROY$1) {
                             this._contentVisible = false;
+                            // 预合成配置 reusable 且销毁时， 需要隐藏其中的元素
+                            if (this.type === ItemType$1.composition) {
+                                this.handleVisibleChanged(false);
+                                this.onItemUpdate(0, lifetime);
+                            }
                         }
                         lifetime = Math.min(lifetime, 1);
                     }
@@ -15202,6 +15207,7 @@ var VFXItem = /** @class */ (function () {
             this.reset();
             this.onUpdate = function () { return -1; };
             this.composition = null;
+            this._contentVisible = false;
             this.transform.setValid(false);
         }
     };
@@ -19386,18 +19392,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();
@@ -24172,13 +24179,6 @@ var ParticleVFXItem = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ParticleVFXItem.prototype, "contentVisible", {
-        get: function () {
-            return !this.destroyed;
-        },
-        enumerable: false,
-        configurable: true
-    });
     ParticleVFXItem.prototype.onConstructed = function (props) {
         this.particle = props.content;
     };
@@ -24196,7 +24196,7 @@ var ParticleVFXItem = /** @class */ (function (_super) {
     ParticleVFXItem.prototype.onItemUpdate = function (dt, lifetime) {
         var _a;
         if (this.content) {
-            var hide = !this.visible;
+            var hide = !this.contentVisible;
             var parentItem = this.parentId && ((_a = this.composition) === null || _a === void 0 ? void 0 : _a.getItemByID(this.parentId));
             if (!hide && parentItem) {
                 var parentData = parentItem.getRenderData();
@@ -26258,9 +26258,9 @@ var TextVFXItem = /** @class */ (function (_super) {
         this.textContext = props.content;
     };
     TextVFXItem.prototype.onLifetimeBegin = function (composition, content) {
-        var _a;
+        var _a, _b;
         content.active = true;
-        (_a = this.content) === null || _a === void 0 ? void 0 : _a.mesh.setItems([this.content]);
+        (_b = (_a = this.content) === null || _a === void 0 ? void 0 : _a.mesh) === null || _b === void 0 ? void 0 : _b.setItems([this.content]);
         this.content.updateTexture();
     };
     TextVFXItem.prototype.onItemRemoved = function (composition, content) {
@@ -29195,6 +29195,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;
@@ -29233,7 +29234,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);
@@ -29258,10 +29258,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 = {};
@@ -29278,13 +29275,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)) {
@@ -29330,16 +29321,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;
                     }
@@ -29375,6 +29368,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 = [];
@@ -29969,7 +29973,7 @@ var CompVFXItem = /** @class */ (function (_super) {
                         throw new Error("\u5F15\u7528\u7684Id: ".concat(refId, " \u7684\u9884\u5408\u6210\u4E0D\u5B58\u5728"));
                     }
                     props.content = itemProps.content;
-                    item = new CompVFXItem(__assign$1(__assign$1({}, props), { refId: refId, id: itemProps.id, name: itemProps.name, duration: itemProps.duration, endBehavior: itemProps.endBehavior, parentId: itemProps.parentId, transform: itemProps.transform }), this.composition);
+                    item = new CompVFXItem(__assign$1(__assign$1({}, props), { refId: refId, delay: itemProps.delay, id: itemProps.id, name: itemProps.name, duration: itemProps.duration, endBehavior: itemProps.endBehavior, parentId: itemProps.parentId, transform: itemProps.transform }), this.composition);
                     item.contentProps = itemProps.content;
                     item.transform.parentTransform = this.transform;
                     this.composition.refContent.push(item);
@@ -32777,9 +32781,9 @@ Geometry.create = function (engine, options) {
 Mesh.create = function (engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "1.1.0";
+var version = "1.1.2";
 console.info({
-    content: '[Galacean Effects THREEJS] version: ' + "1.1.0",
+    content: '[Galacean Effects THREEJS] version: ' + "1.1.2",
     type: LOG_TYPE,
 });