@galacean/effects-specification 2.0.0-alpha.13 → 2.0.0-alpha.15

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

@@ -1,8 +1,8 @@
 import type { EffectsObjectData } from './components';
-import type { FixedNumberExpression, FixedVec3Expression } from './number-expression';
+import type { FixedNumberExpression, FixedVec3Expression, FixedQuatExpression } from './number-expression';
 export interface AnimationClipData extends EffectsObjectData {
     positionCurves: PositionCurveData[];
-    eulerCurves: EulerCurveData[];
+    rotationCurves: RotationCurveData[];
     scaleCurves: ScaleCurveData[];
     floatCurves: FloatCurveData[];
 }
@@ -10,9 +10,9 @@ export interface PositionCurveData {
     path: string;
     keyFrames: FixedVec3Expression;
 }
-export interface EulerCurveData {
+export interface RotationCurveData {
     path: string;
-    keyFrames: FixedVec3Expression;
+    keyFrames: FixedQuatExpression;
 }
 export interface ScaleCurveData {
     path: string;

package/es/components.d.ts

@@ -12,12 +12,18 @@ export declare enum DataType {
     Texture = "Texture",
     AnimationClip = "AnimationClip",
     TextComponent = "TextComponent",
+    TrackAsset = "TrackAsset",
+    TimelineAsset = "TimelineAsset",
+    TransformPlayableAsset = "TransformPlayableAsset",
+    SpriteColorPlayableAsset = "SpriteColorPlayableAsset",
     MeshComponent = "MeshComponent",
     SkyboxComponent = "SkyboxComponent",
     LightComponent = "LightComponent",
     CameraComponent = "CameraComponent",
     ModelPluginComponent = "ModelPluginComponent",
-    TreeComponent = "TreeComponent"
+    TreeComponent = "TreeComponent",
+    AnimationComponent = "AnimationComponent",
+    TimelineClip = "TimelineClip"
 }
 export interface DataPath {
     id: string;
@@ -62,7 +68,7 @@ export interface MaterialData extends EffectsObjectData {
 }
 export interface GeometryData extends EffectsObjectData {
     vertexData: VertexData;
-    indexFormat: number;
+    indexFormat: IndexFormatType;
     indexOffset: number;
     subMeshes: SubMesh[];
     /**
@@ -81,7 +87,7 @@ export interface GeometryData extends EffectsObjectData {
     rootBoneName?: string;
     inverseBindMatrices?: number[];
 }
-interface SubMesh {
+export interface SubMesh {
     offset: number;
     indexCount?: number;
     vertexCount: number;
@@ -121,15 +127,20 @@ export interface VertexData {
     channels: VertexChannel[];
 }
 export declare enum VertexFormatType {
-    Float32 = 0,
-    Int16 = 1,
+    Float16 = 0,
+    Float32 = 1,
     Int8 = 2,
-    UInt16 = 3,
-    UInt8 = 4
+    Int16 = 3,
+    Int32 = 4,
+    UInt8 = 5,
+    UInt16 = 6,
+    UInt32 = 7
 }
 export declare enum IndexFormatType {
-    UInt16 = 0,
-    UInt32 = 1
+    None = -1,
+    UInt8 = 0,
+    UInt16 = 1,
+    UInt32 = 2
 }
 export interface VertexChannel {
     semantic: string;
@@ -182,4 +193,3 @@ export interface FileSummary {
     guid: string;
     assetType: string;
 }
-export {};

package/es/components.js

@@ -12,6 +12,10 @@ export var DataType;
     DataType["Texture"] = "Texture";
     DataType["AnimationClip"] = "AnimationClip";
     DataType["TextComponent"] = "TextComponent";
+    DataType["TrackAsset"] = "TrackAsset";
+    DataType["TimelineAsset"] = "TimelineAsset";
+    DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
+    DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
     // FIXME: 先完成ECS的场景转换，后面移到spec中
     DataType["MeshComponent"] = "MeshComponent";
     DataType["SkyboxComponent"] = "SkyboxComponent";
@@ -19,6 +23,9 @@ export var DataType;
     DataType["CameraComponent"] = "CameraComponent";
     DataType["ModelPluginComponent"] = "ModelPluginComponent";
     DataType["TreeComponent"] = "TreeComponent";
+    DataType["AnimationComponent"] = "AnimationComponent";
+    // Non-EffectObject
+    DataType["TimelineClip"] = "TimelineClip";
 })(DataType || (DataType = {}));
 export var GeometryType;
 (function (GeometryType) {
@@ -53,16 +60,21 @@ export var GeometryType;
 })(GeometryType || (GeometryType = {}));
 export var VertexFormatType;
 (function (VertexFormatType) {
-    VertexFormatType[VertexFormatType["Float32"] = 0] = "Float32";
-    VertexFormatType[VertexFormatType["Int16"] = 1] = "Int16";
+    VertexFormatType[VertexFormatType["Float16"] = 0] = "Float16";
+    VertexFormatType[VertexFormatType["Float32"] = 1] = "Float32";
     VertexFormatType[VertexFormatType["Int8"] = 2] = "Int8";
-    VertexFormatType[VertexFormatType["UInt16"] = 3] = "UInt16";
-    VertexFormatType[VertexFormatType["UInt8"] = 4] = "UInt8";
+    VertexFormatType[VertexFormatType["Int16"] = 3] = "Int16";
+    VertexFormatType[VertexFormatType["Int32"] = 4] = "Int32";
+    VertexFormatType[VertexFormatType["UInt8"] = 5] = "UInt8";
+    VertexFormatType[VertexFormatType["UInt16"] = 6] = "UInt16";
+    VertexFormatType[VertexFormatType["UInt32"] = 7] = "UInt32";
 })(VertexFormatType || (VertexFormatType = {}));
 export var IndexFormatType;
 (function (IndexFormatType) {
-    IndexFormatType[IndexFormatType["UInt16"] = 0] = "UInt16";
-    IndexFormatType[IndexFormatType["UInt32"] = 1] = "UInt32";
+    IndexFormatType[IndexFormatType["None"] = -1] = "None";
+    IndexFormatType[IndexFormatType["UInt8"] = 0] = "UInt8";
+    IndexFormatType[IndexFormatType["UInt16"] = 1] = "UInt16";
+    IndexFormatType[IndexFormatType["UInt32"] = 2] = "UInt32";
 })(IndexFormatType || (IndexFormatType = {}));
 // BINORMAL[n]	Binormal	float4
 // BLENDINDICES[n]	混合索引	uint

package/es/composition.d.ts

@@ -1,5 +1,5 @@
-import type { Item } from './item';
 import type { DataPath } from './components';
+import type { Item } from './item';
 export declare enum CameraClipMode {
     /**
      * 剪裁上下
@@ -157,4 +157,22 @@ export interface CompositionData {
      * 降级图
      */
     fallbackImage?: string;
+    /**
+     * 时间轴资产（TimelineAssetData）
+     */
+    timelineAsset: DataPath;
+    /**
+     * 轨道的场景绑定
+     */
+    sceneBindings: SceneBindingData[];
+}
+export interface SceneBindingData {
+    /**
+     * 绑定的轨道资产（TrackAssetData）
+     */
+    key: DataPath;
+    /**
+     * 被绑定的场景对象（VFXItemData）
+     */
+    value: DataPath;
 }

package/es/index.d.ts

@@ -25,3 +25,4 @@ export * from './text';
 export * from './components';
 export * from './vfx-item-data';
 export * from './buitin-object-guid';
+export * from './timeline';

package/es/index.js

@@ -25,3 +25,4 @@ export * from './text';
 export * from './components';
 export * from './vfx-item-data';
 export * from './buitin-object-guid';
+export * from './timeline';

package/es/item/model/tree.d.ts

@@ -85,3 +85,13 @@ export interface ModelAnimationComponentData extends ComponentData {
      */
     animations: ModelAnimationData[];
 }
+export interface AnimationComponentData extends ComponentData {
+    /**
+     * 默认动画索引，-1表示不播放动画
+     */
+    animation?: number;
+    /**
+     * glTF中所有的动画数据
+     */
+    animationClips: DataPath[];
+}

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

@@ -1,7 +1,6 @@
-import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, ItemType } from '../type';
 import type { RGBAColorValue } from '../number-expression';
+import type { ColorOverLifetime, ItemType, PositionOverLifetime, RotationOverLifetime, SizeOverLifetime } from '../type';
 import type { BaseItem } from './base-item';
-import type { ComponentData, DataPath, EffectsObjectData } from '../components';
 /**
  * 空节点元素
  */
@@ -45,50 +44,3 @@ export interface NullContent {
      */
     colorOverLifetime?: ColorOverLifetime;
 }
-export interface TimelineComponentData extends ComponentData {
-    /**
-     * 轨道数据
-     */
-    tracks: TrackAssetData[];
-}
-export interface PlayableAssetData {
-    dataType: string;
-}
-export interface TrackAssetData extends PlayableAssetData {
-    clips: TimelineClipData[];
-}
-export interface TimelineClipData {
-    start: number;
-    duration: number;
-    clipAsset: DataPath;
-}
-export interface TransformAnimationPlayableAssetData extends PlayableAssetData {
-    animationClip: DataPath;
-}
-export interface SpriteColorAnimationPlayableAssetData extends PlayableAssetData {
-    animationClip: DataPath;
-}
-export interface TransformAnimationClipData extends EffectsObjectData {
-    /**
-     * 空节点元素大小变化属性
-     */
-    sizeOverLifetime?: SizeOverLifetime;
-    /**
-     * 空节点元素旋转变化属性
-     */
-    rotationOverLifetime?: RotationOverLifetime;
-    /**
-     * 空节点元素位置变化属性
-     */
-    positionOverLifetime?: PositionOverLifetime;
-}
-export interface SpriteColorAnimationClipData extends EffectsObjectData {
-    /**
-     * 空节点元素色彩变化属性
-     */
-    colorOverLifetime?: ColorOverLifetime;
-    /**
-     * 图层初始颜色
-     */
-    startColor?: RGBAColorValue;
-}

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

@@ -68,6 +68,13 @@ export interface PluginSpineOption {
      * 动画播放的速度
      */
     speed?: number;
+    /**
+     * 使用的默认大小计算规则
+     * 0 ：除以包围盒大小
+     * 1 : 相机逆投影 + 固定画布大小
+     * @since 1.3.0
+     */
+    resizeRule: number;
 }
 /**
  * spine资源信息

package/es/number-expression.d.ts

@@ -68,7 +68,11 @@ export declare enum ValueType {
     /**
      * 贝塞尔曲线路径
      */
-    BEZIER_CURVE_PATH = 22
+    BEZIER_CURVE_PATH = 22,
+    /**
+     * 贝塞尔曲线四元数
+     */
+    BEZIER_CURVE_QUAT = 23
 }
 export type vec2 = [x: number, y: number];
 export type vec3 = [x: number, y: number, z: number];
@@ -109,6 +113,7 @@ export type FunctionExpression = LineValue | CurveValue | BezierValue;
 export type FixedNumberExpression = ConstantNumber | LineValue | CurveValue | BezierValue;
 export type NumberExpression = FixedNumberExpression | RandomValue;
 export type FixedVec3Expression = ConstantVec3 | BezierPath | LinearPath | BezierCurvePath;
+export type FixedQuatExpression = BezierCurveQuat;
 /**
  * 常数数值
  * [0,5]
@@ -246,10 +251,18 @@ export type BezierValue = [type: ValueType.BEZIER_CURVE, value: BezierKeyframeVa
  * 贝塞尔曲线路径关键帧值
  */
 export type BezierCurvePathValue = [easing: BezierKeyframeValue[], points: vec3[], controlePoints: vec3[]];
+/**
+ * 贝塞尔曲线路径关键帧值
+ */
+export type BezierCurveQuatValue = [easing: BezierKeyframeValue[], points: vec4[], controlePoints: vec4[]];
 /**
  * 贝塞尔曲线路径关键帧
  */
 export type BezierCurvePath = [type: ValueType.BEZIER_CURVE_PATH, value: BezierCurvePathValue];
+/**
+ * 贝塞尔曲线路径关键帧
+ */
+export type BezierCurveQuat = [type: ValueType.BEZIER_CURVE_QUAT, value: BezierCurveQuatValue];
 /*********************************************/
 /*********************************************/
 export type ColorExpression = RGBAColor | GradientColor | RGBAColors;

package/es/number-expression.js

@@ -71,6 +71,10 @@ export var ValueType;
      * 贝塞尔曲线路径
      */
     ValueType[ValueType["BEZIER_CURVE_PATH"] = 22] = "BEZIER_CURVE_PATH";
+    /**
+     * 贝塞尔曲线四元数
+     */
+    ValueType[ValueType["BEZIER_CURVE_QUAT"] = 23] = "BEZIER_CURVE_QUAT";
 })(ValueType || (ValueType = {}));
 /**
  * 关键帧类型

package/es/scene.d.ts

@@ -6,6 +6,7 @@ import type { FontBase, FontDefine } from './text';
 import type { BinaryFile } from './binary';
 import type { ComponentData, GeometryData, MaterialData, ShaderData } from './components';
 import type { VFXItemData } from './vfx-item-data';
+import type { AnimationClipData } from './animation-clip-data';
 /**
  * runtime 2.0 之前的场景信息
  * 素材信息存放于统一数据结构中
@@ -188,4 +189,8 @@ export interface JSONScene {
      * 几何体数据
      */
     geometries: GeometryData[];
+    /**
+     * 动画数据
+     */
+    animations: AnimationClipData[];
 }

package/es/timeline/index.d.ts

@@ -0,0 +1,5 @@
+export * from './track/track-asset-data';
+export * from './sprite-color-playable-asset-data';
+export * from './timeline-asset-data';
+export * from './timeline-clip-data';
+export * from './transform-playable-asset-data';

package/es/timeline/index.js

@@ -0,0 +1,5 @@
+export * from './track/track-asset-data';
+export * from './sprite-color-playable-asset-data';
+export * from './timeline-asset-data';
+export * from './timeline-clip-data';
+export * from './transform-playable-asset-data';

package/es/timeline/sprite-color-playable-asset-data.d.ts

@@ -0,0 +1,7 @@
+import type { EffectsObjectData } from '../components';
+import type { RGBAColorValue } from '../number-expression';
+import type { ColorOverLifetime } from '../type';
+export interface SpriteColorPlayableAssetData extends EffectsObjectData {
+    colorOverLifetime?: ColorOverLifetime;
+    startColor?: RGBAColorValue;
+}

package/es/timeline/sprite-color-playable-asset-data.js

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

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

@@ -0,0 +1,7 @@
+import type { EffectsObjectData, DataPath } from '../components';
+export interface TimelineAssetData extends EffectsObjectData {
+    /**
+     * 轨道数据（TrackAssetData）
+     */
+    tracks: DataPath[];
+}

package/es/timeline/timeline-asset-data.js

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

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

@@ -0,0 +1,9 @@
+import type { DataPath } from '../components';
+export interface TimelineClipData {
+    start?: number;
+    duration?: number;
+    /**
+       * 可播放资产（PlayableAssetData）
+       */
+    asset: DataPath;
+}

package/es/timeline/timeline-clip-data.js

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

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

@@ -0,0 +1,9 @@
+import type { DataPath, EffectsObjectData } from '../../components';
+import type { TimelineClipData } from '../timeline-clip-data';
+export interface TrackAssetData extends EffectsObjectData {
+    /**
+     * 子轨道数据（TrackAssetData）
+     */
+    children: DataPath[];
+    clips: TimelineClipData;
+}

package/es/timeline/track/track-asset-data.js

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

package/es/timeline/transform-playable-asset-data.d.ts

@@ -0,0 +1,16 @@
+import type { EffectsObjectData } from '../components';
+import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime } from '../type';
+export interface TransformPlayableAssetData extends EffectsObjectData {
+    /**
+     * 元素大小变化属性
+     */
+    sizeOverLifetime?: SizeOverLifetime;
+    /**
+     * 元素旋转变化属性
+     */
+    rotationOverLifetime?: RotationOverLifetime;
+    /**
+     * 元素位置变化属性
+     */
+    positionOverLifetime?: PositionOverLifetime;
+}

package/es/timeline/transform-playable-asset-data.js

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

package/es/type.d.ts

@@ -539,7 +539,11 @@ export declare enum ItemType {
     /**
      * 特效元素
      */
-    effect = "effect"
+    effect = "effect",
+    /**
+     * 节点元素
+     */
+    node = "node"
 }
 /**
  * 渲染模式

package/es/type.js

@@ -260,6 +260,10 @@ export var ItemType;
      * 特效元素
      */
     ItemType["effect"] = "effect";
+    /**
+     * 节点元素
+     */
+    ItemType["node"] = "node";
 })(ItemType || (ItemType = {}));
 /**
  * 渲染模式

package/package.json

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