@galacean/effects-core 2.6.0-alpha.0 → 2.6.0-alpha.1

package/dist/composition.d.ts

@@ -220,7 +220,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      */
     postProcessingEnabled: boolean;
     protected rendererOptions: MeshRendererOptions | null;
-    protected assigned: boolean;
     /**
      * 销毁状态位
      */

package/dist/events/types.d.ts

@@ -5,11 +5,12 @@ import type { Region } from '../plugins';
  */
 export type ItemEvent = {
     /**
-     * 元素点击事件
+     * 元素点击事件（编辑器设置交互行为“消息通知”）
      */
     ['click']: [region: Region];
     /**
      * 元素消息事件（元素创建/销毁时触发）
+     * 注意：仅对交互元素有效
      */
     ['message']: [message: Omit<MessageItem, 'compositionId'>];
 };

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.6.0-alpha.0
+ * Version: v2.6.0-alpha.1
  */
 
 'use strict';
@@ -1077,8 +1077,7 @@ function _inherits(subClass, superClass) {
     JSONSceneVersion["3_1"] = "3.1";
     JSONSceneVersion["3_2"] = "3.2";
     JSONSceneVersion["3_3"] = "3.3";
-    JSONSceneVersion["3_4"] = "3.4";
-    JSONSceneVersion["LATEST"] = "3.4";
+    JSONSceneVersion["LATEST"] = "3.3";
 })(JSONSceneVersion || (JSONSceneVersion = {}));
 
 /*********************************************/ /*               元素属性参数类型               */ /*********************************************/ /**
@@ -1727,6 +1726,7 @@ var NodeDataType;
     NodeDataType["AnimationClipNodeData"] = "AnimationClipNodeData";
     NodeDataType["BlendNodeData"] = "BlendNodeData";
     NodeDataType["ApplyAdditiveNodeData"] = "ApplyAdditiveNodeData";
+    NodeDataType["LayerBlendNodeData"] = "LayerBlendNodeData";
     NodeDataType["StateMachineNodeData"] = "StateMachineNodeData";
     NodeDataType["TransitionNodeData"] = "TransitionNodeData";
     NodeDataType["StateNodeData"] = "StateNodeData";
@@ -4193,6 +4193,17 @@ var Pose = /*#__PURE__*/ function() {
             this.floatPropertyValues[animatedObjectIndex] = value;
         }
     };
+    _proto.copyFrom = function copyFrom(pose) {
+        for(var i = 0; i < this.parentSpaceTransforms.length; i++){
+            this.parentSpaceTransforms[i].copyFrom(pose.parentSpaceTransforms[i]);
+        }
+        for(var i1 = 0; i1 < this.colorPropertyValues.length; i1++){
+            this.colorPropertyValues[i1].copyFrom(pose.colorPropertyValues[i1]);
+        }
+        for(var i2 = 0; i2 < this.floatPropertyValues.length; i2++){
+            this.floatPropertyValues[i2] = pose.floatPropertyValues[i2];
+        }
+    };
     return Pose;
 }();
 
@@ -4732,6 +4743,109 @@ var ControlParameterTriggerNode = /*#__PURE__*/ function(BoolValueNode) {
     return ControlParameterTriggerNode;
 }(BoolValueNode);
 
+exports.LayerBlendNodeData = /*#__PURE__*/ function(GraphNodeData) {
+    _inherits(LayerBlendNodeData, GraphNodeData);
+    function LayerBlendNodeData() {
+        var _this;
+        _this = GraphNodeData.apply(this, arguments) || this;
+        _this.baseNodeIndex = InvalidIndex;
+        _this.layerDatas = [];
+        return _this;
+    }
+    var _proto = LayerBlendNodeData.prototype;
+    _proto.instantiate = function instantiate(context) {
+        var node = this.createNode(LayerBlendNode, context);
+        node.baseLayerNode = context.getNode(this.baseNodeIndex);
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.layerDatas), _step; !(_step = _iterator()).done;){
+            var layerData = _step.value;
+            node.layers.push({
+                inputNode: context.getNode(layerData.inputNodeIndex),
+                weightValueNode: context.getNode(layerData.weightValueNodeIndex),
+                weight: 0
+            });
+        }
+    };
+    _proto.load = function load(data) {
+        GraphNodeData.prototype.load.call(this, data);
+        var _data_baseNodeIndex;
+        this.baseNodeIndex = (_data_baseNodeIndex = data.baseNodeIndex) != null ? _data_baseNodeIndex : InvalidIndex;
+        if (data.layerDatas) {
+            for(var _iterator = _create_for_of_iterator_helper_loose(data.layerDatas), _step; !(_step = _iterator()).done;){
+                var layerData = _step.value;
+                this.layerDatas.push(_extends({
+                    inputNodeIndex: InvalidIndex,
+                    weightValueNodeIndex: InvalidIndex
+                }, layerData));
+            }
+        }
+    };
+    return LayerBlendNodeData;
+}(GraphNodeData);
+exports.LayerBlendNodeData = __decorate([
+    nodeDataClass(NodeDataType.LayerBlendNodeData)
+], exports.LayerBlendNodeData);
+var LayerBlendNode = /*#__PURE__*/ function(PoseNode) {
+    _inherits(LayerBlendNode, PoseNode);
+    function LayerBlendNode() {
+        var _this;
+        _this = PoseNode.apply(this, arguments) || this;
+        _this.baseLayerNode = null;
+        _this.layers = [];
+        return _this;
+    }
+    var _proto = LayerBlendNode.prototype;
+    _proto.initializeInternal = function initializeInternal(context) {
+        var //-------------------------------------------------------------------------
+        _this_baseLayerNode;
+        PoseNode.prototype.initializeInternal.call(this, context);
+        //-------------------------------------------------------------------------
+        this.layerNodeResult = new PoseResult(context.skeleton);
+        (_this_baseLayerNode = this.baseLayerNode) == null ? void 0 : _this_baseLayerNode.initialize(context);
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.layers), _step; !(_step = _iterator()).done;){
+            var layer = _step.value;
+            var _layer_inputNode, _layer_weightValueNode;
+            (_layer_inputNode = layer.inputNode) == null ? void 0 : _layer_inputNode.initialize(context);
+            (_layer_weightValueNode = layer.weightValueNode) == null ? void 0 : _layer_weightValueNode.initialize(context);
+        }
+    };
+    _proto.shutdownInternal = function shutdownInternal(context) {
+        var _this_baseLayerNode;
+        (_this_baseLayerNode = this.baseLayerNode) == null ? void 0 : _this_baseLayerNode.shutdown(context);
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.layers), _step; !(_step = _iterator()).done;){
+            var layer = _step.value;
+            var _layer_inputNode, _layer_weightValueNode;
+            (_layer_inputNode = layer.inputNode) == null ? void 0 : _layer_inputNode.shutdown(context);
+            (_layer_weightValueNode = layer.weightValueNode) == null ? void 0 : _layer_weightValueNode.shutdown(context);
+        }
+        PoseNode.prototype.shutdownInternal.call(this, context);
+    };
+    _proto.evaluate = function evaluate(context, result) {
+        if (!(this.baseLayerNode && this.baseLayerNode.isValid())) {
+            return result;
+        }
+        this.markNodeActive(context);
+        this.previousTime = this.baseLayerNode.getCurrentTime();
+        result = this.baseLayerNode.evaluate(context, result);
+        this.currentTime = this.baseLayerNode.getCurrentTime();
+        this.duration = this.baseLayerNode.getDuration();
+        this.updateLayers(context, result);
+        return result;
+    };
+    _proto.updateLayers = function updateLayers(context, result) {
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.layers), _step; !(_step = _iterator()).done;){
+            var layer = _step.value;
+            if (layer.inputNode && layer.weightValueNode) {
+                this.layerNodeResult.pose.copyFrom(result.pose);
+                layer.inputNode.evaluate(context, this.layerNodeResult);
+                var layerWeight = layer.weightValueNode.getValue(context);
+                Blender.localBlend(result.pose, this.layerNodeResult.pose, layerWeight, result.pose);
+            }
+        }
+        return result;
+    };
+    return LayerBlendNode;
+}(PoseNode);
+
 exports.EqualNodeData = /*#__PURE__*/ function(GraphNodeData) {
     _inherits(EqualNodeData, GraphNodeData);
     function EqualNodeData() {
@@ -15179,8 +15293,7 @@ var singleSplits = [
    * 设置当前图层的颜色
    * @since 2.5.0
    */ function set(value) {
-                this._color = value;
-                this.material.setColor("_Color", this._color);
+                this.setColor(value);
             }
         }
     ]);
@@ -16538,7 +16651,11 @@ function buildEasingCurve(leftKeyframe, rightKeyframe) {
     if (BezierMap[str]) {
         bezEasing = BezierMap[str];
     } else {
-        bezEasing = new BezierEasing(x1, y1, x2, y2);
+        if (decimalEqual(valueInterval, 0)) {
+            bezEasing = new BezierEasing();
+        } else {
+            bezEasing = new BezierEasing(x1, y1, x2, y2);
+        }
         BezierMap[str] = bezEasing;
     }
     return {
@@ -18961,12 +19078,23 @@ var seed$3 = 1;
         return transformData;
     };
     _proto.fromData = function fromData(data) {
-        var transformData = {
-            position: new Vector3().copyFrom(data.position),
-            rotation: new Euler(data.eulerHint.x, data.eulerHint.y, data.eulerHint.z),
-            scale: new Vector3().copyFrom(data.scale)
-        };
-        this.setTransform(transformData);
+        var transformProps = {};
+        transformProps.position = new Vector3().copyFrom(data.position);
+        //@ts-expect-error
+        if (data.quat) {
+            //@ts-expect-error
+            transformProps.quat = new Quaternion(data.quat.x, data.quat.y, data.quat.z, data.quat.w);
+        } else {
+            transformProps.rotation = new Euler(data.eulerHint.x, data.eulerHint.y, data.eulerHint.z);
+        }
+        transformProps.scale = new Vector3().copyFrom(data.scale);
+        if (data.size) {
+            transformProps.size = new Vector2().copyFrom(data.size);
+        }
+        if (data.anchor) {
+            transformProps.anchor = new Vector2().copyFrom(data.anchor);
+        }
+        this.setTransform(transformProps);
     };
     _proto.dispose = function dispose() {};
     _proto.updateTRSCache = function updateTRSCache() {
@@ -21386,44 +21514,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
     _proto.setVisible = function setVisible(visible) {
         this.renderer.setVisible(visible);
     };
-    _proto.setOpacity = function setOpacity(opacity) {
-        var _material_getVector4;
-        var material = this.renderer.particleMesh.mesh.material;
-        var geometry = this.renderer.particleMesh.mesh.geometry;
-        var originalColor = ((_material_getVector4 = material.getVector4("uOpacityOverLifetimeValue")) == null ? void 0 : _material_getVector4.toArray()) || [
-            1,
-            1,
-            1,
-            1
-        ];
-        material.setVector4("uOpacityOverLifetimeValue", new Vector4(originalColor[0], originalColor[1], originalColor[2], opacity));
-        var data = geometry.getAttributeData("aColor") || [];
-        for(var i = 0; i < data.length; i += 32){
-            data[i * 8 + 7] = opacity;
-        }
-    };
-    /**
-   * @internal
-   */ _proto.setColor = function setColor(r, g, b, a) {
-        var _material_getVector4;
-        var material = this.renderer.particleMesh.mesh.material;
-        var geometry = this.renderer.particleMesh.mesh.geometry;
-        var originalColor = ((_material_getVector4 = material.getVector4("uOpacityOverLifetimeValue")) == null ? void 0 : _material_getVector4.toArray()) || [
-            1,
-            1,
-            1,
-            1
-        ];
-        material.setVector4("uOpacityOverLifetimeValue", new Vector4(originalColor[0], originalColor[1], originalColor[2], a));
-        var data = geometry.getAttributeData("aColor") || [];
-        for(var i = 0; i < data.length; i += 32){
-            data[i * 8 + 4] = r;
-            data[i * 8 + 5] = g;
-            data[i * 8 + 6] = b;
-            data[i * 8 + 7] = a;
-        }
-    };
-    _proto.setParentTransform = function setParentTransform(transform) {};
     _proto.getTextures = function getTextures() {
         return this.renderer.getTextures();
     };
@@ -23751,8 +23841,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         /**
    * 是否开启后处理
    */ _this.postProcessingEnabled = false;
-        // TODO: 待优化
-        _this.assigned = false;
         /**
    * 销毁状态位
    */ _this.destroyed = false;
@@ -23820,7 +23908,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             aspect: width / height
         }));
         _this.url = scene.url;
-        _this.assigned = true;
         _this.interactive = true;
         _this.handleItemMessage = handleItemMessage;
         _this.createRenderFrame();
@@ -24000,7 +24087,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * 合成更新，针对所有 item 的更新
    * @param deltaTime - 更新的时间步长
    */ _proto.update = function update(deltaTime) {
-        if (!this.assigned || this.getPaused()) {
+        if (this.getPaused()) {
             return;
         }
         // scene VFXItem components lifetime function.
@@ -24633,10 +24720,13 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
    * @param {number} b
    * @param {number} a
    * @internal
+   * @deprecated 2.6.0 Please use `Component.setColor` instead
    */ _proto.setColor = function setColor(r, g, b, a) {};
     /**
    * 设置元素的透明度
    * @param opacity - 透明度值，范围 [0,1]
+   * @internal
+   * @deprecated 2.6.0 Please use `Component.setColor` instead
    */ _proto.setOpacity = function setOpacity(opacity) {};
     /**
    * 激活或停用 VFXItem
@@ -24839,27 +24929,8 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         this.id = id.toString(); // TODO 老数据 id 是 number，需要转换
         this.name = name;
         this.start = delay ? delay : this.start;
-        var transformProps = {};
         if (transform) {
-            transformProps.position = new Vector3().copyFrom(transform.position);
-            // FIXME: transform.rotation待删除
-            //@ts-expect-error
-            if (transform.quat) {
-                //@ts-expect-error
-                transformProps.quat = new Quaternion(transform.quat.x, transform.quat.y, transform.quat.z, transform.quat.w);
-            } else {
-                var _transform_eulerHint;
-                //@ts-expect-error
-                transformProps.rotation = new Euler().copyFrom((_transform_eulerHint = transform.eulerHint) != null ? _transform_eulerHint : transform.rotation);
-            }
-            transformProps.scale = new Vector3().copyFrom(transform.scale);
-            if (transform.size) {
-                transformProps.size = new Vector2().copyFrom(transform.size);
-            }
-            if (transform.anchor) {
-                transformProps.anchor = new Vector2().copyFrom(transform.anchor);
-            }
-            this.transform.setTransform(transformProps);
+            this.transform.fromData(transform);
         }
         this.transform.name = this.name;
         this.transform.engine = this.engine;
@@ -30968,7 +31039,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$1 = "2.6.0-alpha.0";
+var version$1 = "2.6.0-alpha.1";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -34218,7 +34289,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version = "2.6.0-alpha.0";
+var version = "2.6.0-alpha.1";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -34290,6 +34361,7 @@ exports.InteractLoader = InteractLoader;
 exports.InteractMesh = InteractMesh;
 exports.InvalidIndex = InvalidIndex;
 exports.KTXTexture = KTXTexture;
+exports.LayerBlendNode = LayerBlendNode;
 exports.LineSegments = LineSegments;
 exports.LinearValue = LinearValue;
 exports.MaskProcessor = MaskProcessor;