@galacean/effects-specification 2.5.1 → 2.6.0-alpha.1

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

@@ -96,6 +96,7 @@ export interface GreaterNodeData extends FloatComparisonNodeData {
 }
 export interface StateMachineNodeData extends GraphNodeData {
     type: NodeDataType.StateMachineNodeData;
+    machineName: string;
     stateDatas: StateData[];
     defaultStateIndex: number;
 }
@@ -110,6 +111,7 @@ export interface StateData {
 }
 export interface StateNodeData extends GraphNodeData {
     type: NodeDataType.StateNodeData;
+    stateName: string;
     childNodeIndex: number;
 }
 export interface TransitionNodeData extends GraphNodeData {

package/es/components/ffd-data.d.ts

@@ -0,0 +1,9 @@
+import type { Vector3Data } from 'src/math';
+import type { ComponentData } from './component-data';
+export interface FFDComponentData extends ComponentData {
+    controlPoints: Vector3Data[];
+    boundMin: Vector3Data;
+    boundMax: Vector3Data;
+    rowNum: number;
+    colNum: number;
+}

package/es/components/ffd-data.js

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

package/es/components/index.d.ts

@@ -1,2 +1,3 @@
 export * from './component-data';
 export * from './post-process-volume-data';
+export * from './ffd-data';

package/es/components/index.js

@@ -1,2 +1,3 @@
 export * from './component-data';
 export * from './post-process-volume-data';
+export * from './ffd-data';

package/es/composition.d.ts

@@ -1,4 +1,5 @@
 import type { ComponentData, DataPath } from './components';
+import type { DataType } from './data-type';
 import type { Item } from './item';
 import type { EndBehavior } from './item/base-item';
 export declare enum CameraClipMode {
@@ -86,26 +87,21 @@ export interface Composition extends CompositionBase {
 }
 /**
  * 合成数据
- * @deprecated Please use CompositionBase instead
  */
 export interface CompositionData extends CompositionBase {
     /**
-     * 元素信息
-     */
-    items: DataPath[];
-    /**
-     * 时间轴资产（TimelineAssetData）
-     */
-    timelineAsset: DataPath;
-    /**
-     * 轨道的场景绑定
+     * @description 组件数据
      */
-    sceneBindings: SceneBindingData[];
+    components: DataPath[];
 }
 /**
  * 合成组件数据
  */
 export interface CompositionComponentData extends ComponentData {
+    /**
+     * @description 合成组件类型 - 固定为 CompositionComponent
+     */
+    dataType: DataType.CompositionComponent;
     /**
      * 元素信息
      */

package/es/data-type.d.ts

@@ -17,6 +17,7 @@ export declare enum DataType {
     FloatPropertyTrack = "FloatPropertyTrack",
     ColorPropertyTrack = "ColorPropertyTrack",
     Vector2PropertyTrack = "Vector2PropertyTrack",
+    Vector3PropertyTrack = "Vector3PropertyTrack",
     Vector4PropertyTrack = "Vector4PropertyTrack",
     TransformPlayableAsset = "TransformPlayableAsset",
     SpriteColorPlayableAsset = "SpriteColorPlayableAsset",
@@ -25,6 +26,7 @@ export declare enum DataType {
     FloatPropertyPlayableAsset = "FloatPropertyPlayableAsset",
     ColorPropertyPlayableAsset = "ColorPropertyPlayableAsset",
     Vector2PropertyPlayableAsset = "Vector2PropertyPlayableAsset",
+    Vector3PropertyPlayableAsset = "Vector3PropertyPlayableAsset",
     Vector4PropertyPlayableAsset = "Vector4PropertyPlayableAsset",
     MeshComponent = "MeshComponent",
     SkyboxComponent = "SkyboxComponent",
@@ -47,6 +49,8 @@ export declare enum DataType {
     EffectComponent = "EffectComponent",
     TextComponent = "TextComponent",
     AnimationGraphAsset = "AnimationGraphAsset",
+    CompositionComponent = "CompositionComponent",
+    FFDComponent = "FFDComponent",
     Animator = "Animator",
     TimelineClip = "TimelineClip"
 }

package/es/data-type.js

@@ -20,6 +20,7 @@ export var DataType;
     DataType["FloatPropertyTrack"] = "FloatPropertyTrack";
     DataType["ColorPropertyTrack"] = "ColorPropertyTrack";
     DataType["Vector2PropertyTrack"] = "Vector2PropertyTrack";
+    DataType["Vector3PropertyTrack"] = "Vector3PropertyTrack";
     DataType["Vector4PropertyTrack"] = "Vector4PropertyTrack";
     DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
     DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
@@ -28,6 +29,7 @@ export var DataType;
     DataType["FloatPropertyPlayableAsset"] = "FloatPropertyPlayableAsset";
     DataType["ColorPropertyPlayableAsset"] = "ColorPropertyPlayableAsset";
     DataType["Vector2PropertyPlayableAsset"] = "Vector2PropertyPlayableAsset";
+    DataType["Vector3PropertyPlayableAsset"] = "Vector3PropertyPlayableAsset";
     DataType["Vector4PropertyPlayableAsset"] = "Vector4PropertyPlayableAsset";
     // Components
     DataType["MeshComponent"] = "MeshComponent";
@@ -51,6 +53,8 @@ export var DataType;
     DataType["EffectComponent"] = "EffectComponent";
     DataType["TextComponent"] = "TextComponent";
     DataType["AnimationGraphAsset"] = "AnimationGraphAsset";
+    DataType["CompositionComponent"] = "CompositionComponent";
+    DataType["FFDComponent"] = "FFDComponent";
     DataType["Animator"] = "Animator";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";

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_5'];

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

@@ -45,6 +45,11 @@ export interface BaseTextContentOptions {
      * @default 0
      */
     letterSpace?: number;
+    /**
+     * 文本行间隔
+     * @default 0.571
+     */
+    lineGap?: number;
     /**
      * 文本内容
      */

package/es/scene.d.ts

@@ -33,7 +33,8 @@ export declare enum JSONSceneVersion {
     '3_2' = "3.2",// 矢量动画、透明视频、增加富文本属性
     '3_3' = "3.3",// 指向型蒙版、图片/文字蒙版
     '3_4' = "3.4",// 动画状态机
-    'LATEST' = "3.4"
+    '3_5' = "3.5",// 网格形状变化动画、矢量图形填充/描边渐变色
+    'LATEST' = "3.5"
 }
 /**
  * runtime 2.0 之前的场景信息
@@ -152,21 +153,9 @@ export interface JSONScene {
      * 贴图信息
      */
     images: ImageSource[];
-    /**
-     * 根据合成 ID，每个合成用到的 image 的数组索引
-     */
-    imgUsage?: Record<string, number[]>;
-    /**
-     * 根据合成 ID，每个合成用到的 bin 的数组索引
-     */
-    binUsage?: Record<string, number[]>;
-    /**
-     * 蒙版形状信息
-     */
-    shapes: ShapeGeometry[];
     /**
      * 插件类型信息
-     * 'model@1.0'
+     * 'model'
      */
     plugins: string[];
     /**

package/es/scene.js

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

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

@@ -1,4 +1,5 @@
-import type { ComponentData } from '../components/component-data';
+import type { RenderMode, SideMode, BlendingMode } from '../type';
+import type { ComponentData, DataPath } from '../components/component-data';
 import type { MaskOptions } from '../item/base-item';
 import type { ShapeFillParam } from './shape-fill-param';
 import type { ShapePrimitiveType } from './shape-primitive-type';
@@ -23,4 +24,16 @@ export interface ShapeComponentData extends ComponentData {
      *  蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
     mask?: MaskOptions;
+    /**
+     * 图形元素材质渲染属性
+     */
+    renderer?: ShapeRendererOptions;
+}
+export interface ShapeRendererOptions {
+    renderMode?: RenderMode;
+    side?: SideMode;
+    occlusion?: boolean;
+    transparentOcclusion?: boolean;
+    blending?: BlendingMode;
+    texture?: DataPath;
 }

package/es/shape/shape-fill-param.d.ts

@@ -1,4 +1,23 @@
+import type { Vector2Data } from '../math/vector-data';
 import type { ColorData } from '../math/color-data';
+import type { GradientColor } from '../number-expression';
+/**
+ * 填充类型
+ */
+export declare enum FillType {
+    /**
+     * 纯色
+     */
+    Solid = 0,
+    /**
+     * 线性渐变
+     */
+    LinearGradient = 1,
+    /**
+     * 径向渐变
+     */
+    RadialGradient = 2
+}
 /**
  * 矢量填充参数
  */
@@ -7,4 +26,20 @@ export interface ShapeFillParam {
      * 填充颜色
      */
     color: ColorData;
+    /**
+     * 填充类型
+     */
+    fillType?: FillType;
+    /**
+     * 渐变颜色
+     */
+    gradient?: GradientColor;
+    /**
+     * 渐变起点
+     */
+    startPoint?: Vector2Data;
+    /**
+     * 渐变终点
+     */
+    endPoint?: Vector2Data;
 }

package/es/shape/shape-fill-param.js

@@ -1 +1,18 @@
-export {};
+/**
+ * 填充类型
+ */
+export var FillType;
+(function (FillType) {
+    /**
+     * 纯色
+     */
+    FillType[FillType["Solid"] = 0] = "Solid";
+    /**
+     * 线性渐变
+     */
+    FillType[FillType["LinearGradient"] = 1] = "LinearGradient";
+    /**
+     * 径向渐变
+     */
+    FillType[FillType["RadialGradient"] = 2] = "RadialGradient";
+})(FillType || (FillType = {}));

package/es/texture.d.ts

@@ -1,4 +1,5 @@
 import type { BinaryPointer } from './binary';
+import type { DataPath } from './components';
 import type { DataType } from './data-type';
 export interface TextureFormatOptions {
     format?: GLenum;
@@ -30,7 +31,7 @@ export type SerializedTextureCubeMipmap = [
 export interface SerializedTexture2DImageSource extends TextureConfigOptionsBase, TextureFormatOptions {
     dataType: DataType.Texture;
     target?: WebGLRenderingContext['TEXTURE_2D'];
-    source: number;
+    source: number | DataPath;
 }
 export interface SerializedTexture2DMipmapSource extends TextureConfigOptionsBase, TextureFormatOptions {
     dataType: DataType.Texture;

package/es/timeline/index.d.ts

@@ -3,3 +3,4 @@ export * from './playables/sprite-color-playable-asset-data';
 export * from './timeline-asset-data';
 export * from './timeline-clip-data';
 export * from './playables/transform-playable-asset-data';
+export * from './playables/property-playable-asset-datas';

package/es/timeline/index.js

@@ -3,3 +3,4 @@ export * from './playables/sprite-color-playable-asset-data';
 export * from './timeline-asset-data';
 export * from './timeline-clip-data';
 export * from './playables/transform-playable-asset-data';
+export * from './playables/property-playable-asset-datas';

package/es/timeline/playables/property-playable-asset-datas.d.ts

@@ -0,0 +1,19 @@
+import type { BezierValue, ColorCurveValue, Vector2CurveValue, Vector4CurveValue } from '../../number-expression';
+import type { DataType } from '../../data-type';
+import type { EffectsObjectData } from '../../effects-object-data';
+export interface ColorPropertyPlayableAssetData extends EffectsObjectData {
+    dataType: DataType.ColorPropertyPlayableAsset;
+    curveData: ColorCurveValue;
+}
+export interface FloatPropertyPlayableAssetData extends EffectsObjectData {
+    dataType: DataType.FloatPropertyPlayableAsset;
+    curveData: BezierValue;
+}
+export interface Vector4PropertyPlayableAssetData extends EffectsObjectData {
+    dataType: DataType.Vector4PropertyPlayableAsset;
+    curveData: Vector4CurveValue;
+}
+export interface Vector2PropertyPlayableAssetData extends EffectsObjectData {
+    dataType: DataType.Vector2PropertyPlayableAsset;
+    curveData: Vector2CurveValue;
+}

package/es/timeline/playables/property-playable-asset-datas.js

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

package/es/timeline/track/track-asset-data.d.ts

@@ -6,5 +6,5 @@ export interface TrackAssetData extends EffectsObjectData {
      * 子轨道数据（TrackAssetData）
      */
     children: DataPath[];
-    clips: TimelineClipData;
+    clips: TimelineClipData[];
 }

package/package.json

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