@galacean/effects-specification 2.3.1 → 2.5.0-alpha.0

package/es/animation-graph/animation-graph-asset-data.d.ts

@@ -0,0 +1,12 @@
+import type { EffectsObjectData } from '../effects-object-data';
+import type { DataPath } from '../components/component-data';
+import type { GraphNodeData } from './graph-node-datas';
+export interface GraphDataSetData {
+    resources: DataPath[];
+}
+export interface AnimationGraphAssetData extends EffectsObjectData {
+    nodeDatas: GraphNodeData[];
+    graphDataSet: GraphDataSetData;
+    rootNodeIndex: number;
+    controlParameterIDs: string[];
+}

package/es/animation-graph/animation-graph-asset-data.js

@@ -0,0 +1 @@
+export {};

package/es/animation-graph/animator-data.d.ts

@@ -0,0 +1,4 @@
+import type { ComponentData, DataPath } from '../components/component-data';
+export interface AnimatorData extends ComponentData {
+    graphAsset: DataPath;
+}

package/es/animation-graph/animator-data.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,112 @@
+export declare enum NodeDataType {
+    AnimationClipNodeData = "AnimationClipNodeData",
+    BlendNodeData = "BlendNodeData",
+    ApplyAdditiveNodeData = "ApplyAdditiveNodeData",
+    StateMachineNodeData = "StateMachineNodeData",
+    TransitionNodeData = "TransitionNodeData",
+    StateNodeData = "StateNodeData",
+    ConstFloatNodeData = "ConstFloatNodeData",
+    ConstBoolNodeData = "ConstBoolNodeData",
+    ControlParameterBoolNodeData = "ControlParameterBoolNodeData",
+    ControlParameterFloatNodeData = "ControlParameterFloatNodeData",
+    ControlParameterTriggerNodeData = "ControlParameterTriggerNodeData",
+    NotNodeData = "NotNodeData",
+    AndNodeData = "AndNodeData",
+    OrNodeData = "OrNodeData",
+    EqualNodeData = "EqualNodeData",
+    GreaterNodeData = "GreaterNodeData",
+    LessNodeData = "LessNodeData"
+}
+export interface GraphNodeData {
+    type: string;
+    index: number;
+}
+export interface AnimationClipNodeData extends GraphNodeData {
+    type: NodeDataType.AnimationClipNodeData;
+    dataSlotIndex: number;
+    playRate?: number;
+    loopAnimation?: boolean;
+}
+export interface EqualNodeData extends GraphNodeData {
+    type: NodeDataType.EqualNodeData;
+    inputValueNodeIndex: number;
+    comparandValueNodeIndex: number;
+}
+export interface BlendNodeData extends GraphNodeData {
+    type: NodeDataType.BlendNodeData;
+    sourceNodeIndex0: number;
+    sourceNodeIndex1: number;
+    inputParameterValueNodeIndex: number;
+}
+export interface ApplyAdditiveNodeData extends GraphNodeData {
+    type: NodeDataType.ApplyAdditiveNodeData;
+    baseNodeIndex: number;
+    additiveNodeIndex: number;
+    inputParameterValueNodeIndex: number;
+}
+export interface AndNodeData extends GraphNodeData {
+    type: NodeDataType.AndNodeData;
+    conditionNodeIndices: number[];
+}
+export interface OrNodeAssetData extends GraphNodeData {
+    type: NodeDataType.OrNodeData;
+    conditionNodeIndices: number[];
+}
+export interface NotNodeAssetData extends GraphNodeData {
+    type: NodeDataType.NotNodeData;
+    inputValueNodeIndex: number;
+}
+export interface ConstFloatNodeData extends GraphNodeData {
+    type: NodeDataType.ConstFloatNodeData;
+    value: number;
+}
+export interface ConstBoolNodeData extends GraphNodeData {
+    type: NodeDataType.ConstBoolNodeData;
+    value: boolean;
+}
+export interface ControlParameterFloatNodeData extends GraphNodeData {
+    type: NodeDataType.ControlParameterFloatNodeData;
+    value: number;
+}
+export interface ControlParameterBoolNodeData extends GraphNodeData {
+    type: NodeDataType.ControlParameterBoolNodeData;
+    value: boolean;
+}
+export interface ControlParameterTriggerNodeData extends GraphNodeData {
+    type: NodeDataType.ControlParameterTriggerNodeData;
+}
+export interface FloatComparisonNodeData extends GraphNodeData {
+    inputValueNodeIndex: number;
+    comparandValueNodeIndex: number;
+}
+export interface LessNodeData extends FloatComparisonNodeData {
+    type: NodeDataType.LessNodeData;
+}
+export interface GreaterNodeData extends FloatComparisonNodeData {
+    type: NodeDataType.EqualNodeData;
+}
+export interface StateMachineNodeData extends GraphNodeData {
+    type: NodeDataType.StateMachineNodeData;
+    stateDatas: StateData[];
+    defaultStateIndex: number;
+}
+export interface TransitionData {
+    targetStateIndex: number;
+    conditionNodeIndex: number;
+    transitionNodeIndex: number;
+}
+export interface StateData {
+    stateNodeIndex: number;
+    transitionDatas: TransitionData[];
+}
+export interface StateNodeData extends GraphNodeData {
+    type: NodeDataType.StateNodeData;
+    childNodeIndex: number;
+}
+export interface TransitionNodeData extends GraphNodeData {
+    type: NodeDataType.TransitionNodeData;
+    duration: number;
+    hasExitTime: boolean;
+    exitTime: number;
+    targetStateNodeIndex: number;
+}

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

@@ -0,0 +1,20 @@
+export var NodeDataType;
+(function (NodeDataType) {
+    NodeDataType["AnimationClipNodeData"] = "AnimationClipNodeData";
+    NodeDataType["BlendNodeData"] = "BlendNodeData";
+    NodeDataType["ApplyAdditiveNodeData"] = "ApplyAdditiveNodeData";
+    NodeDataType["StateMachineNodeData"] = "StateMachineNodeData";
+    NodeDataType["TransitionNodeData"] = "TransitionNodeData";
+    NodeDataType["StateNodeData"] = "StateNodeData";
+    NodeDataType["ConstFloatNodeData"] = "ConstFloatNodeData";
+    NodeDataType["ConstBoolNodeData"] = "ConstBoolNodeData";
+    NodeDataType["ControlParameterBoolNodeData"] = "ControlParameterBoolNodeData";
+    NodeDataType["ControlParameterFloatNodeData"] = "ControlParameterFloatNodeData";
+    NodeDataType["ControlParameterTriggerNodeData"] = "ControlParameterTriggerNodeData";
+    NodeDataType["NotNodeData"] = "NotNodeData";
+    NodeDataType["AndNodeData"] = "AndNodeData";
+    NodeDataType["OrNodeData"] = "OrNodeData";
+    NodeDataType["EqualNodeData"] = "EqualNodeData";
+    NodeDataType["GreaterNodeData"] = "GreaterNodeData";
+    NodeDataType["LessNodeData"] = "LessNodeData";
+})(NodeDataType || (NodeDataType = {}));

package/es/animation-graph/index.d.ts

@@ -0,0 +1,3 @@
+export * from './animator-data';
+export * from './graph-node-datas';
+export * from './animation-graph-asset-data';

package/es/animation-graph/index.js

@@ -0,0 +1,3 @@
+export * from './animator-data';
+export * from './graph-node-datas';
+export * from './animation-graph-asset-data';

package/es/data-type.d.ts

@@ -46,5 +46,7 @@ export declare enum DataType {
     PostProcessVolume = "PostProcessVolume",
     EffectComponent = "EffectComponent",
     TextComponent = "TextComponent",
+    AnimationGraphAsset = "AnimationGraphAsset",
+    Animator = "Animator",
     TimelineClip = "TimelineClip"
 }

package/es/data-type.js

@@ -50,6 +50,8 @@ export var DataType;
     DataType["PostProcessVolume"] = "PostProcessVolume";
     DataType["EffectComponent"] = "EffectComponent";
     DataType["TextComponent"] = "TextComponent";
+    DataType["AnimationGraphAsset"] = "AnimationGraphAsset";
+    DataType["Animator"] = "Animator";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";
 })(DataType || (DataType = {}));

package/es/index.d.ts

@@ -30,6 +30,7 @@ export * from './text';
 export * from './components';
 export * from './buitin-object-guid';
 export * from './shape';
+export * from './animation-graph';
 export * from './timeline';
 export * from './assets';
 export * from './render-settings';
@@ -40,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_3'];
+export declare const LATEST_VERSION = JSONSceneVersion['3_4'];

package/es/index.js

@@ -30,6 +30,7 @@ export * from './text';
 export * from './components';
 export * from './buitin-object-guid';
 export * from './shape';
+export * from './animation-graph';
 export * from './timeline';
 export * from './assets';
 export * from './render-settings';

package/es/item/base-item.d.ts

@@ -2,7 +2,7 @@ import type { BinaryEnv } from '../binary';
 import type { DataPath } from '../components';
 import type { Vector2Data, Vector3Data } from '../math';
 import type { vec3, vec4 } from '../number-expression';
-import type { ItemType, ObscuredMode, RenderLevel } from '../type';
+import type { ItemType, RenderLevel } from '../type';
 import type { CameraContent } from './camera-item';
 import type { CompositionContent } from './composition-item';
 import type { EffectContent } from './effect-item';
@@ -37,23 +37,25 @@ export declare enum EndBehavior {
     freeze = 4
 }
 /**
- * 元素被遮挡/反向遮挡，需要时传入
- */
-export interface ObscuredOptions {
-    mode: ObscuredMode;
-    /**
-     * 指向作为蒙版的组件
-     */
-    ref: DataPath;
-}
-/**
- * 元素的蒙版行为
+ * 元素的蒙版选项
  */
 export interface MaskOptions {
     /**
      * 是否作为蒙版
      */
-    mask?: boolean;
+    isMask?: boolean;
+    /**
+     * 是否反转
+     */
+    inverted?: boolean;
+    /**
+     * 是否开启图片透明蒙版
+     */
+    alphaMaskEnabled?: boolean;
+    /**
+     * 指向作为蒙版的组件
+     */
+    reference: DataPath;
 }
 export interface BaseItem {
     /**

package/es/item/effect-item.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentData, DataPath } from '../components';
 import type { ItemType, PositionOverLifetime, RotationOverLifetime, SizeOverLifetime } from '../type';
-import type { BaseItem, EndBehavior, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 /**
  * 特效元素
  */
@@ -41,5 +41,5 @@ export interface EffectComponentData extends ComponentData {
     /**
      * 特效元素蒙版属性，传入表示需要被遮挡/反向遮挡
      */
-    mask?: ObscuredOptions;
+    mask?: MaskOptions;
 }

package/es/item/particle-item.d.ts

@@ -1,6 +1,6 @@
 import type { ItemType, RendererOptions, TextureSheetAnimation, BlendingMode, SplitParameter, ObscuredMode } from '../type';
 import type { FixedNumberExpression, NumberExpression, GradientColor, vec3, FixedVec3Expression, ColorExpression, FunctionExpression } from '../number-expression';
-import type { BaseItem, EndBehavior, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { ParticleShape } from './particle-shape';
 import type { ComponentData, DataPath } from '../components';
 /**
@@ -280,7 +280,7 @@ export interface ParticleContent {
     /**
      * 粒子元素蒙版属性，传入表示需要被遮挡/反向遮挡
      */
-    mask?: ObscuredOptions;
+    mask?: MaskOptions;
     /**
      * 粒子元素发射器形状属性
      */

package/es/item/rich-text-item.d.ts

@@ -1,4 +1,4 @@
-import type { BaseItem, EndBehavior, MaskOptions, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { ItemType } from '../type';
 import type { BaseTextContentOptions, TextComponentData, TextContent } from './text-item';
 import type { vec2 } from '../number-expression';
@@ -45,5 +45,5 @@ export interface RichTextComponentData extends Omit<TextComponentData, 'options'
     /**
      * 富文本元素蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
-    mask?: MaskOptions | ObscuredOptions;
+    mask?: MaskOptions;
 }

package/es/item/spine-item.d.ts

@@ -2,7 +2,7 @@ import type { BinaryPointer } from '../binary';
 import type { ComponentData, DataPath } from '../components';
 import type { DataType } from '../data-type';
 import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, RendererOptions, ItemType, RenderMode } from '../type';
-import type { BaseItem, EndBehavior, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 /**
  * 插件元素
  */
@@ -125,5 +125,5 @@ export interface SpineComponent extends ComponentData {
     /**
      * Spine 元素蒙版属性，传入表示需要被遮挡/反向遮挡
      */
-    mask?: ObscuredOptions;
+    mask?: MaskOptions;
 }

package/es/item/sprite-item.d.ts

@@ -1,4 +1,4 @@
-import type { BaseItem, EndBehavior, MaskOptions, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, ItemType, TextureSheetAnimation, RendererOptions, SplitParameter, InteractBehavior } from '../type';
 import type { RGBAColorValue } from '../number-expression';
 import type { ComponentData } from '../components';
@@ -43,7 +43,7 @@ export interface SpriteContent {
     /**
      * 图层元素蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
-    mask?: MaskOptions | ObscuredOptions;
+    mask?: MaskOptions;
     /**
      * 图层元素大小变化属性
      */

package/es/item/text-item.d.ts

@@ -1,4 +1,4 @@
-import type { BaseItem, EndBehavior, MaskOptions, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, ItemType, TextureSheetAnimation, RendererOptions, InteractBehavior } from '../type';
 import type { RGBAColorValue } from '../number-expression';
 import type { FontStyle, TextAlignment, TextBaseline, TextOverflow, TextWeight } from '../text';
@@ -146,7 +146,7 @@ export interface TextContent {
     /**
      * 文本元素蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
-    mask?: MaskOptions | ObscuredOptions;
+    mask?: MaskOptions;
     /**
      * 文本元素大小变化属性
      */

package/es/item/video-item.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentData, DataPath } from '../components';
 import type { RGBAColorValue } from '../number-expression';
 import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, InteractBehavior, RendererOptions, ItemType } from '../type';
-import type { BaseItem, EndBehavior, ObscuredOptions } from './base-item';
+import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 /**
  * 视频元素
  */
@@ -62,7 +62,7 @@ export interface VideoComponentData extends ComponentData {
     /**
      * 视频元素蒙版属性，传入表示需要被遮挡/反向遮挡
      */
-    mask?: ObscuredOptions;
+    mask?: MaskOptions;
     /**
      * 视频元素大小变化属性
      */

package/es/scene.d.ts

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

package/es/scene.js

@@ -18,5 +18,6 @@ export var JSONSceneVersion;
     JSONSceneVersion["3_1"] = "3.1";
     JSONSceneVersion["3_2"] = "3.2";
     JSONSceneVersion["3_3"] = "3.3";
-    JSONSceneVersion["LATEST"] = "3.3";
+    JSONSceneVersion["3_4"] = "3.4";
+    JSONSceneVersion["LATEST"] = "3.4";
 })(JSONSceneVersion || (JSONSceneVersion = {}));

package/es/shape/shape-component-data.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentData } from '../components/component-data';
-import type { MaskOptions, ObscuredOptions } from '../item/base-item';
+import type { MaskOptions } from '../item/base-item';
 import type { ShapeFillParam } from './shape-fill-param';
 import type { ShapePrimitiveType } from './shape-primitive-type';
 import type { ShapeStrokeParam } from './shape-stroke-param';
@@ -22,5 +22,5 @@ export interface ShapeComponentData extends ComponentData {
     /**
      *  蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
-    mask?: MaskOptions | ObscuredOptions;
+    mask?: MaskOptions;
 }

package/es/type.d.ts

@@ -1,5 +1,5 @@
 import type { DataPath } from './components';
-import type { ObscuredOptions, MaskOptions } from './item/base-item';
+import type { MaskOptions } from './item/base-item';
 import type { FixedVec3Expression, vec2, vec3, GradientColor, ShapePoints, ShapeSplits, FixedNumberExpression } from './number-expression';
 /**
  * 播放器版本
@@ -457,7 +457,7 @@ export interface RendererOptions {
     /**
      * 蒙版属性
      */
-    mask?: MaskOptions | ObscuredOptions;
+    mask?: MaskOptions;
 }
 /**
  * 元素类型

package/package.json

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