@galacean/effects-specification 2.5.0-alpha.1 → 2.5.0-alpha.3

package/es/animation-clip-data.d.ts

@@ -1,29 +1,39 @@
-import type { ColorCurveData } from './curve-data';
 import type { EffectsObjectData } from './effects-object-data';
-import type { FixedNumberExpression, FixedVec3Expression, FixedQuatExpression } from './number-expression';
+import type { FixedNumberExpression, FixedVec3Expression, FixedQuatExpression, ColorCurveValue } from './number-expression';
 export interface AnimationClipData extends EffectsObjectData {
-    duration: number;
-    positionCurves: PositionCurveData[];
-    rotationCurves: RotationCurveData[];
-    scaleCurves: ScaleCurveData[];
-    floatCurves: FloatCurveData[];
-    colorCurves: ColorCurveData[];
+    duration?: number;
+    positionCurves?: PositionCurveData[];
+    rotationCurves?: QuaternionRotationCurveData[];
+    eulerCurves?: EulerRotationCurveData[];
+    scaleCurves?: ScaleCurveData[];
+    floatCurves?: AnimationCurveFloatData[];
+    colorCurves?: AnimationCurveColorData[];
 }
 export interface PositionCurveData {
     path: string;
     keyFrames: FixedVec3Expression;
 }
-export interface RotationCurveData {
+export interface QuaternionRotationCurveData {
     path: string;
     keyFrames: FixedQuatExpression;
 }
+export interface EulerRotationCurveData {
+    path: string;
+    keyFrames: FixedVec3Expression;
+}
 export interface ScaleCurveData {
     path: string;
     keyFrames: FixedVec3Expression;
 }
-export interface FloatCurveData {
+export interface AnimationCurveFloatData {
     path: string;
     property: string;
     className: string;
     keyFrames: FixedNumberExpression;
 }
+export interface AnimationCurveColorData {
+    path: string;
+    property: string;
+    className: string;
+    keyFrames: ColorCurveValue;
+}

package/es/animation-graph/graph-node-datas.d.ts

@@ -2,6 +2,7 @@ export declare enum NodeDataType {
     AnimationClipNodeData = "AnimationClipNodeData",
     BlendNodeData = "BlendNodeData",
     ApplyAdditiveNodeData = "ApplyAdditiveNodeData",
+    LayerBlendNodeData = "LayerBlendNodeData",
     StateMachineNodeData = "StateMachineNodeData",
     TransitionNodeData = "TransitionNodeData",
     StateNodeData = "StateNodeData",
@@ -44,6 +45,14 @@ export interface ApplyAdditiveNodeData extends GraphNodeData {
     additiveNodeIndex: number;
     inputParameterValueNodeIndex: number;
 }
+export interface LayerData {
+    inputNodeIndex?: number;
+    weightValueNodeIndex?: number;
+}
+export interface LayerBlendNodeData extends GraphNodeData {
+    baseNodeIndex?: number;
+    layerDatas?: LayerData[];
+}
 export interface AndNodeData extends GraphNodeData {
     type: NodeDataType.AndNodeData;
     conditionNodeIndices: number[];

package/es/animation-graph/graph-node-datas.js

@@ -3,6 +3,7 @@ export var NodeDataType;
     NodeDataType["AnimationClipNodeData"] = "AnimationClipNodeData";
     NodeDataType["BlendNodeData"] = "BlendNodeData";
     NodeDataType["ApplyAdditiveNodeData"] = "ApplyAdditiveNodeData";
+    NodeDataType["LayerBlendNodeData"] = "LayerBlendNodeData";
     NodeDataType["StateMachineNodeData"] = "StateMachineNodeData";
     NodeDataType["TransitionNodeData"] = "TransitionNodeData";
     NodeDataType["StateNodeData"] = "StateNodeData";

package/es/composition.d.ts

@@ -1,4 +1,4 @@
-import type { DataPath } from './components';
+import type { ComponentData, DataPath } from './components';
 import type { Item } from './item';
 import type { EndBehavior } from './item/base-item';
 export declare enum CameraClipMode {
@@ -86,6 +86,7 @@ export interface Composition extends CompositionBase {
 }
 /**
  * 合成数据
+ * @deprecated Please use CompositionBase instead
  */
 export interface CompositionData extends CompositionBase {
     /**
@@ -101,6 +102,23 @@ export interface CompositionData extends CompositionBase {
      */
     sceneBindings: SceneBindingData[];
 }
+/**
+ * 合成组件数据
+ */
+export interface CompositionComponentData extends ComponentData {
+    /**
+     * 元素信息
+     */
+    items: DataPath[];
+    /**
+     * 时间轴资产（TimelineAssetData）
+     */
+    timelineAsset: DataPath;
+    /**
+     * 轨道的场景绑定
+     */
+    sceneBindings: SceneBindingData[];
+}
 export interface SceneBindingData {
     /**
      * 绑定的轨道资产（TrackAssetData）

package/es/index.d.ts

@@ -41,4 +41,4 @@ export * from './material-data';
 export * from './geometry-data';
 export * from './shader-data';
 export * from './effects-package-data';
-export declare const LATEST_VERSION = JSONSceneVersion['3_4'];
+export declare const LATEST_VERSION = JSONSceneVersion['3_3'];

package/es/number-expression.d.ts

@@ -1,4 +1,4 @@
-import type { ColorCurveData, Vector2CurveData, Vector4CurveData } from './curve-data';
+import type { ColorCurveData, Vector2CurveData, Vector3CurveData, Vector4CurveData } from './curve-data';
 /*********************************************/
 /*********************************************/
 export declare enum ValueType {
@@ -85,7 +85,11 @@ export declare enum ValueType {
     /**
      * Vector2 曲线
      */
-    VECTOR2_CURVE = 26
+    VECTOR2_CURVE = 26,
+    /**
+     * Vector3 曲线
+     */
+    VECTOR3_CURVE = 27
 }
 export type vec2 = [x: number, y: number];
 export type vec3 = [x: number, y: number, z: number];
@@ -288,6 +292,10 @@ export type Vector4CurveValue = [type: ValueType.VECTOR4_CURVE, value: Vector4Cu
  * Vector2 贝塞尔曲线
  */
 export type Vector2CurveValue = [type: ValueType.VECTOR2_CURVE, value: Vector2CurveData];
+/**
+ * Vector3 贝塞尔曲线
+ */
+export type Vector3CurveValue = [type: ValueType.VECTOR3_CURVE, value: Vector3CurveData];
 /*********************************************/
 /*********************************************/
 export type ColorExpression = RGBAColor | GradientColor | RGBAColors;

package/es/number-expression.js

@@ -87,6 +87,10 @@ export var ValueType;
      * Vector2 曲线
      */
     ValueType[ValueType["VECTOR2_CURVE"] = 26] = "VECTOR2_CURVE";
+    /**
+     * Vector3 曲线
+     */
+    ValueType[ValueType["VECTOR3_CURVE"] = 27] = "VECTOR3_CURVE";
 })(ValueType || (ValueType = {}));
 /**
  * 关键帧类型

package/es/scene.d.ts

@@ -31,9 +31,8 @@ export declare enum JSONSceneVersion {
     '3_0' = "3.0",// EC 改造、移除滤镜元素
     '3_1' = "3.1",// 音视频
     '3_2' = "3.2",// 矢量动画、透明视频、增加富文本属性
-    '3_3' = "3.3",// 指向型蒙版、图片/文字蒙版
-    '3_4' = "3.4",// 动画状态机
-    'LATEST' = "3.4"
+    '3_3' = "3.3",// 指向型蒙版、图片蒙版
+    'LATEST' = "3.3"
 }
 /**
  * runtime 2.0 之前的场景信息

package/es/scene.js

@@ -18,6 +18,5 @@ export var JSONSceneVersion;
     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 = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-specification",
-  "version": "2.5.0-alpha.1",
+  "version": "2.5.0-alpha.3",
   "description": "Galacean Effects JSON Specification",
   "module": "./es/index.js",
   "main": "./es/index.js",