@galacean/effects-threejs 2.0.0-alpha.15 → 2.0.0-alpha.16

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.15
+ * Version: v2.0.0-alpha.16
  */
 
 'use strict';
@@ -13713,13 +13713,16 @@ var SpriteColorPlayable = /*#__PURE__*/ function(Playable) {
     }
     var _proto = SpriteColorPlayable.prototype;
     _proto.processFrame = function processFrame(context) {
-        var boundItem = context.output.getUserData();
+        var boundObject = context.output.getUserData();
+        if (!_instanceof1(boundObject, exports.VFXItem)) {
+            return;
+        }
         if (!this.spriteMaterial) {
-            this.spriteMaterial = boundItem.getComponent(exports.SpriteComponent).material;
+            this.spriteMaterial = boundObject.getComponent(exports.SpriteComponent).material;
         }
         var colorInc = vecFill(tempColor, 1);
         var colorChanged;
-        var life = this.time / boundItem.duration;
+        var life = this.time / boundObject.duration;
         var opacityOverLifetime = this.opacityOverLifetime;
         var colorOverLifetime = this.colorOverLifetime;
         if (colorOverLifetime) {
@@ -13849,7 +13852,6 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
         renderer.drawGeometry(geo, material);
     };
     _proto.start = function start() {
-        this.priority = this.item.listIndex;
         this.item.getHitTestParams = this.getHitTestParams;
     };
     _proto.update = function update(dt) {
@@ -16253,7 +16255,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, env, gpuCapability)
     }
     var _proto = ParticleSystemRenderer.prototype;
     _proto.start = function start() {
-        this._priority = this.item.listIndex;
+        this._priority = this.item.renderOrder;
         this.particleMesh.gravityModifier.scaleXCoord(this.item.duration);
         for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
             var mesh = _step.value;
@@ -17303,13 +17305,13 @@ function randomArrItem(arr, keepArr) {
     }
     var _proto = ParticleBehaviourPlayable.prototype;
     _proto.start = function start(context) {
-        var binding = context.output.getUserData();
-        if (this.particleSystem) {
+        var boundObject = context.output.getUserData();
+        if (this.particleSystem || !_instanceof1(boundObject, exports.VFXItem)) {
             return;
         }
-        this.particleSystem = binding.getComponent(exports.ParticleSystem);
+        this.particleSystem = boundObject.getComponent(exports.ParticleSystem);
         if (this.particleSystem) {
-            this.particleSystem.name = binding.name;
+            this.particleSystem.name = boundObject.name;
             this.particleSystem.start();
             this.particleSystem.initEmitterTransform();
         }
@@ -18467,10 +18469,13 @@ var tempPos = new Vector3();
     };
     _proto.processFrame = function processFrame(context) {
         if (!this.binding) {
-            this.binding = context.output.getUserData();
-            this.start();
+            var boundObject = context.output.getUserData();
+            if (_instanceof1(boundObject, exports.VFXItem)) {
+                this.binding = boundObject;
+                this.start();
+            }
         }
-        if (this.binding.composition) {
+        if (this.binding && this.binding.composition) {
             this.sampleAnimation();
         }
     };
@@ -18679,9 +18684,12 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
     }
     var _proto = AnimationClipPlayable.prototype;
     _proto.processFrame = function processFrame(context) {
-        var boundItem = context.output.getUserData();
-        if (boundItem.composition) {
-            this.clip.sampleAnimation(boundItem, this.time);
+        var boundObject = context.output.getUserData();
+        if (!_instanceof1(boundObject, exports.VFXItem)) {
+            return;
+        }
+        if (boundObject.composition) {
+            this.clip.sampleAnimation(boundObject, this.time);
         }
     };
     return AnimationClipPlayable;
@@ -18925,13 +18933,11 @@ var ActivationMixerPlayable = /*#__PURE__*/ function(Playable) {
     }
     var _proto = ActivationMixerPlayable.prototype;
     _proto.processFrame = function processFrame(context) {
-        if (!this.bindingItem) {
-            this.bindingItem = context.output.getUserData();
-        }
-        if (!this.bindingItem) {
+        var boundObject = context.output.getUserData();
+        if (!_instanceof1(boundObject, exports.VFXItem)) {
             return;
         }
-        var bindingItem = this.bindingItem;
+        var boundItem = boundObject;
         var hasInput = false;
         for(var i = 0; i < this.getInputCount(); i++){
             if (this.getInputWeight(i) > 0) {
@@ -18940,11 +18946,11 @@ var ActivationMixerPlayable = /*#__PURE__*/ function(Playable) {
             }
         }
         if (hasInput) {
-            bindingItem.transform.setValid(true);
-            this.showRendererComponents(bindingItem);
+            boundItem.transform.setValid(true);
+            this.showRendererComponents(boundItem);
         } else {
-            bindingItem.transform.setValid(false);
-            this.hideRendererComponents(bindingItem);
+            boundItem.transform.setValid(false);
+            this.hideRendererComponents(boundItem);
         }
     };
     _proto.hideRendererComponents = function hideRendererComponents(item) {
@@ -19371,7 +19377,9 @@ var SubCompositionClipPlayable = /*#__PURE__*/ function(Playable) {
     var _proto = SubCompositionClipPlayable.prototype;
     _proto.processFrame = function processFrame(context) {
         var boundObject = context.output.getUserData();
-        boundObject.time = this.getTime();
+        if (_instanceof1(boundObject, CompositionComponent)) {
+            boundObject.time = this.getTime();
+        }
     };
     return SubCompositionClipPlayable;
 }(Playable);
@@ -20398,7 +20406,7 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         this.parentId = parentId;
         this.duration = duration;
         this.endBehavior = endBehavior;
-        this.listIndex = listIndex;
+        this.renderOrder = listIndex;
         //@ts-expect-error
         this.oldId = data.oldId;
         if (!data.content) {
@@ -20530,6 +20538,23 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
                 var _this_composition_reusable;
                 return (_this_composition_reusable = (_this_composition = this.composition) == null ? void 0 : _this_composition.reusable) != null ? _this_composition_reusable : false;
             }
+        },
+        {
+            key: "renderOrder",
+            get: /**
+   * 元素在合成中的索引
+   */ function get() {
+                return this.listIndex;
+            },
+            set: function set(value) {
+                if (this.listIndex !== value) {
+                    this.listIndex = value;
+                    for(var _iterator = _create_for_of_iterator_helper_loose(this.rendererComponents), _step; !(_step = _iterator()).done;){
+                        var rendererComponent = _step.value;
+                        rendererComponent.priority = value;
+                    }
+                }
+            }
         }
     ]);
     return VFXItem;
@@ -20978,9 +21003,8 @@ var SerializationHelper = /*#__PURE__*/ function() {
             console.error("序列化数据的内嵌对象层数大于上限");
             return;
         }
-        if (typeof property === "number" || typeof property === "string" || typeof property === "boolean") {
-            return property;
-        } else if (_instanceof1(property, Array)) {
+        // 加载并链接 DataPath 字段表示的 EffectsObject 引用。Class 对象 copy [key, value] 会丢失对象信息，因此只递归数组对象和普通 js Object 结构对象。
+        if (_instanceof1(property, Array)) {
             var res = [];
             for(var _iterator = _create_for_of_iterator_helper_loose(property), _step; !(_step = _iterator()).done;){
                 var value = _step.value;
@@ -20990,9 +21014,7 @@ var SerializationHelper = /*#__PURE__*/ function() {
         // TODO json 数据避免传 typedArray
         } else if (SerializationHelper.checkDataPath(property)) {
             return engine.assetLoader.loadGUID(property.id);
-        } else if (_instanceof1(property, EffectsObject) || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-            return property;
-        } else if (_instanceof1(property, Object)) {
+        } else if (_instanceof1(property, Object) && property.constructor === Object) {
             var res1;
             if (type) {
                 var classConstructor = effectsClassStore[type];
@@ -21006,6 +21028,8 @@ var SerializationHelper = /*#__PURE__*/ function() {
                 res1[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
             }
             return res1;
+        } else {
+            return property;
         }
     };
     SerializationHelper.deserializePropertyAsync = function deserializePropertyAsync(property, engine, level, type) {
@@ -21020,26 +21044,17 @@ var SerializationHelper = /*#__PURE__*/ function() {
                                 2
                             ];
                         }
-                        if (!(typeof property === "number" || typeof property === "string" || typeof property === "boolean")) return [
-                            3,
-                            1
-                        ];
-                        return [
-                            2,
-                            property
-                        ];
-                    case 1:
                         if (!_instanceof1(property, Array)) return [
                             3,
-                            6
+                            5
                         ];
                         res = [];
                         _iterator = _create_for_of_iterator_helper_loose(property);
-                        _state.label = 2;
-                    case 2:
+                        _state.label = 1;
+                    case 1:
                         if (!!(_step = _iterator()).done) return [
                             3,
-                            5
+                            4
                         ];
                         value = _step.value;
                         _ = res.push;
@@ -21047,43 +21062,38 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             4,
                             SerializationHelper.deserializePropertyAsync(value, engine, level + 1, type)
                         ];
-                    case 3:
+                    case 2:
                         _.apply(res, [
                             _state.sent()
                         ]);
-                        _state.label = 4;
-                    case 4:
+                        _state.label = 3;
+                    case 3:
                         return [
                             3,
-                            2
+                            1
                         ];
-                    case 5:
+                    case 4:
                         return [
                             2,
                             res
                         ];
-                    case 6:
+                    case 5:
                         if (!SerializationHelper.checkDataPath(property)) return [
                             3,
-                            8
+                            7
                         ];
                         return [
                             4,
                             engine.assetLoader.loadGUIDAsync(property.id)
                         ];
-                    case 7:
+                    case 6:
                         res1 = _state.sent();
                         return [
                             2,
                             res1
                         ];
-                    case 8:
-                        if (_instanceof1(property, EffectsObject) || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-                            return [
-                                2,
-                                property
-                            ];
-                        } else if (_instanceof1(property, Object)) {
+                    case 7:
+                        if (_instanceof1(property, Object) && property.constructor === Object) {
                             if (type) {
                                 classConstructor = effectsClassStore[type];
                                 res2 = new classConstructor();
@@ -21099,9 +21109,13 @@ var SerializationHelper = /*#__PURE__*/ function() {
                                 2,
                                 res2
                             ];
+                        } else {
+                            return [
+                                2,
+                                property
+                            ];
                         }
-                        _state.label = 9;
-                    case 9:
+                    case 8:
                         return [
                             2
                         ];
@@ -22995,7 +23009,17 @@ function getStandardItem(item, opt) {
 }
 
 var _obj$1;
-var renderLevelPassSet = (_obj$1 = {}, _obj$1[RenderLevel.S] = [
+/**
+ * 机型和渲染等级对应表
+ *
+ * 机型：B-低端机、A-中端机、S-高端机
+ * 渲染等级：B-低、A-中、S-高、A+-中高、B+-全部
+ *
+ * - S（高端机）：高、全部、中高
+ * - A（中端机）：中、全部、中高
+ * - B（低端机）：低、全部
+ * - undefined（全部机型）
+ */ var renderLevelPassSet = (_obj$1 = {}, _obj$1[RenderLevel.S] = [
     RenderLevel.S,
     RenderLevel.BPlus,
     RenderLevel.APlus
@@ -24399,7 +24423,7 @@ var listOrder = 0;
             scene.textures = undefined;
             scene.consumed = true;
         }
-        var _this_compositionSourceManager = this.compositionSourceManager, sourceContent = _this_compositionSourceManager.sourceContent, pluginSystem = _this_compositionSourceManager.pluginSystem, imgUsage = _this_compositionSourceManager.imgUsage, totalTime = _this_compositionSourceManager.totalTime, renderLevel = _this_compositionSourceManager.renderLevel, refCompositionProps = _this_compositionSourceManager.refCompositionProps;
+        var _this_compositionSourceManager = this.compositionSourceManager, sourceContent = _this_compositionSourceManager.sourceContent, pluginSystem = _this_compositionSourceManager.pluginSystem, imgUsage = _this_compositionSourceManager.imgUsage, totalTime = _this_compositionSourceManager.totalTime, refCompositionProps = _this_compositionSourceManager.refCompositionProps;
         assertExist(sourceContent);
         this.renderer = renderer;
         this.refCompositionProps = refCompositionProps;
@@ -24425,7 +24449,6 @@ var listOrder = 0;
         };
         this.reusable = reusable;
         this.speed = speed;
-        this.renderLevel = renderLevel;
         this.autoRefTex = !this.keepResource && imageUsage && this.rootItem.endBehavior !== ItemEndBehavior.loop;
         this.name = sourceContent.name;
         this.pluginSystem = pluginSystem;
@@ -27157,7 +27180,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.0.0-alpha.15";
+var version = "2.0.0-alpha.16";
 logger.info("THREEJS plugin version: " + version);
 
 exports.AbstractPlugin = AbstractPlugin;