@galacean/effects-specification 2.0.0-alpha.10 → 2.0.0-alpha.12

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

@@ -0,0 +1,26 @@
+import type { EffectsObjectData } from './components';
+import type { FixedNumberExpression, FixedVec3Expression } from './number-expression';
+export interface AnimationClipData extends EffectsObjectData {
+    positionCurves: PositionCurveData[];
+    eulerCurves: EulerCurveData[];
+    scaleCurves: ScaleCurveData[];
+    floatCurves: FloatCurveData[];
+}
+export interface PositionCurveData {
+    path: string[];
+    keyFrames: FixedVec3Expression;
+}
+export interface EulerCurveData {
+    path: string[];
+    keyFrames: FixedVec3Expression;
+}
+export interface ScaleCurveData {
+    path: string[];
+    keyFrames: FixedVec3Expression;
+}
+export interface FloatCurveData {
+    path: string[];
+    property: string[];
+    className: string;
+    keyFrames: FixedNumberExpression;
+}

package/es/animation-clip-data.js

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

package/es/components.d.ts

@@ -10,6 +10,7 @@ export declare enum DataType {
     CameraController = "CameraController",
     Geometry = "Geometry",
     Texture = "Texture",
+    AnimationClip = "AnimationClip",
     TextComponent = "TextComponent",
     MeshComponent = "MeshComponent",
     SkyboxComponent = "SkyboxComponent",
@@ -63,6 +64,7 @@ export interface GeometryData extends EffectsObjectData {
     vertexData: VertexData;
     indexFormat: number;
     indexOffset: number;
+    subMeshes: SubMesh[];
     /**
      * 模型绘制模式，默认为 GeometryType.TRIANGLES（三角形）
      * @default GeometryType.TRIANGLES
@@ -72,6 +74,16 @@ export interface GeometryData extends EffectsObjectData {
      * 存放 position, uv, normal, indices 的打包数据
      */
     buffer: string;
+    /**
+     * 所有的骨骼名称
+     */
+    boneNames?: string[];
+    rootBoneName?: string;
+    inverseBindMatrices?: number[];
+}
+interface SubMesh {
+    offset: number;
+    count: number;
 }
 export declare enum GeometryType {
     /**
@@ -107,10 +119,49 @@ export interface VertexData {
     vertexCount: number;
     channels: VertexChannel[];
 }
+export declare enum VertexFormatType {
+    Float32 = 0,
+    Int16 = 1,
+    Int8 = 2,
+    UInt16 = 3,
+    UInt8 = 4
+}
+export declare enum IndexFormatType {
+    UInt16 = 0,
+    UInt32 = 1
+}
 export interface VertexChannel {
+    semantic: string;
     offset: number;
-    format: number;
+    format: VertexFormatType;
     dimension: number;
+    normalize?: boolean;
+}
+export declare enum VertexBufferSemantic {
+    Position = "POSITION",
+    Uv = "TEXCOORD0",
+    Uv2 = "TEXCOORD1",
+    Normal = "NORMAL",
+    Tangent = "TANGENT",
+    Color = "COLOR",
+    Joints = "JOINTS",
+    Weights = "WEIGHTS",
+    PositionBS0 = "POSITION_BS0",
+    PositionBS1 = "POSITION_BS1",
+    PositionBS2 = "POSITION_BS2",
+    PositionBS3 = "POSITION_BS3",
+    PositionBS4 = "POSITION_BS4",
+    PositionBS5 = "POSITION_BS5",
+    PositionBS6 = "POSITION_BS6",
+    PositionBS7 = "POSITION_BS7",
+    NormalBS0 = "NORMAL_BS0",
+    NormalBS1 = "NORMAL_BS1",
+    NormalBS2 = "NORMAL_BS2",
+    NormalBS3 = "NORMAL_BS3",
+    TangentBS0 = "TANGENT_BS0",
+    TangentBS1 = "TANGENT_BS1",
+    TangentBS2 = "TANGENT_BS2",
+    TangentBS3 = "TANGENT_BS3"
 }
 export interface ShaderData extends EffectsObjectData {
     vertex: string;
@@ -130,3 +181,4 @@ export interface FileSummary {
     guid: string;
     assetType: string;
 }
+export {};

package/es/components.js

@@ -10,6 +10,7 @@ export var DataType;
     DataType["CameraController"] = "CameraController";
     DataType["Geometry"] = "Geometry";
     DataType["Texture"] = "Texture";
+    DataType["AnimationClip"] = "AnimationClip";
     DataType["TextComponent"] = "TextComponent";
     // FIXME: 先完成ECS的场景转换，后面移到spec中
     DataType["MeshComponent"] = "MeshComponent";
@@ -50,3 +51,57 @@ export var GeometryType;
      */
     GeometryType[GeometryType["TRIANGLE_FAN"] = 6] = "TRIANGLE_FAN";
 })(GeometryType || (GeometryType = {}));
+export var VertexFormatType;
+(function (VertexFormatType) {
+    VertexFormatType[VertexFormatType["Float32"] = 0] = "Float32";
+    VertexFormatType[VertexFormatType["Int16"] = 1] = "Int16";
+    VertexFormatType[VertexFormatType["Int8"] = 2] = "Int8";
+    VertexFormatType[VertexFormatType["UInt16"] = 3] = "UInt16";
+    VertexFormatType[VertexFormatType["UInt8"] = 4] = "UInt8";
+})(VertexFormatType || (VertexFormatType = {}));
+export var IndexFormatType;
+(function (IndexFormatType) {
+    IndexFormatType[IndexFormatType["UInt16"] = 0] = "UInt16";
+    IndexFormatType[IndexFormatType["UInt32"] = 1] = "UInt32";
+})(IndexFormatType || (IndexFormatType = {}));
+// BINORMAL[n]	Binormal	float4
+// BLENDINDICES[n]	混合索引	uint
+// BLENDWEIGHT[n]	混合权重	FLOAT
+// COLOR[n]	漫射和反射颜色	float4
+// NORMAL[n]	法向矢量	float4
+// POSITION[n]	对象空间中的顶点位置。	float4
+// POSITIONT	变换的顶点位置。	float4
+// PSIZE[n]	点大小	FLOAT
+// TANGENT[n]	正切	float4
+// TEXCOORD[n]	纹理坐标	float4
+// POSITION_BS[n]	Blend Shape 空间中的顶点位置	float4
+// NORMAL_BS[n]	Blend Shape 空间中的法向矢量	float4
+// TANGENT_BS[n]	Blend Shape 空间中的正切矢量	float4
+export var VertexBufferSemantic;
+(function (VertexBufferSemantic) {
+    VertexBufferSemantic["Position"] = "POSITION";
+    VertexBufferSemantic["Uv"] = "TEXCOORD0";
+    VertexBufferSemantic["Uv2"] = "TEXCOORD1";
+    VertexBufferSemantic["Normal"] = "NORMAL";
+    VertexBufferSemantic["Tangent"] = "TANGENT";
+    VertexBufferSemantic["Color"] = "COLOR";
+    VertexBufferSemantic["Joints"] = "JOINTS";
+    VertexBufferSemantic["Weights"] = "WEIGHTS";
+    //
+    VertexBufferSemantic["PositionBS0"] = "POSITION_BS0";
+    VertexBufferSemantic["PositionBS1"] = "POSITION_BS1";
+    VertexBufferSemantic["PositionBS2"] = "POSITION_BS2";
+    VertexBufferSemantic["PositionBS3"] = "POSITION_BS3";
+    VertexBufferSemantic["PositionBS4"] = "POSITION_BS4";
+    VertexBufferSemantic["PositionBS5"] = "POSITION_BS5";
+    VertexBufferSemantic["PositionBS6"] = "POSITION_BS6";
+    VertexBufferSemantic["PositionBS7"] = "POSITION_BS7";
+    VertexBufferSemantic["NormalBS0"] = "NORMAL_BS0";
+    VertexBufferSemantic["NormalBS1"] = "NORMAL_BS1";
+    VertexBufferSemantic["NormalBS2"] = "NORMAL_BS2";
+    VertexBufferSemantic["NormalBS3"] = "NORMAL_BS3";
+    VertexBufferSemantic["TangentBS0"] = "TANGENT_BS0";
+    VertexBufferSemantic["TangentBS1"] = "TANGENT_BS1";
+    VertexBufferSemantic["TangentBS2"] = "TANGENT_BS2";
+    VertexBufferSemantic["TangentBS3"] = "TANGENT_BS3";
+})(VertexBufferSemantic || (VertexBufferSemantic = {}));

package/es/index.d.ts

@@ -19,6 +19,7 @@ export * from './item/effect-item';
 export * from './item/text-item';
 export * from './item/model';
 export * from './vfx-item-data';
+export * from './animation-clip-data';
 export * from './binary';
 export * from './text';
 export * from './components';

package/es/index.js

@@ -19,6 +19,7 @@ export * from './item/effect-item';
 export * from './item/text-item';
 export * from './item/model';
 export * from './vfx-item-data';
+export * from './animation-clip-data';
 export * from './binary';
 export * from './text';
 export * from './components';

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

@@ -84,13 +84,14 @@ export interface MorphData {
 export interface ModelMeshComponentData extends ComponentData {
     hide?: boolean;
     /**
-     * 蒙皮数据
+     * 骨骼根节点
      */
-    skin?: SkinData;
+    rootBone?: DataPath;
     /**
      * Morph数据
      */
     morph?: MorphData;
-    primitives: PrimitiveData[];
+    geometry: DataPath;
+    materials: DataPath[];
     interaction?: ModelItemBounding;
 }

package/es/type.d.ts

@@ -657,3 +657,12 @@ export interface ShapeGeometry {
      */
     s: ShapeSplits;
 }
+export declare enum RenderType {
+    Opaque = "Opaque",
+    Transparent = "Transparent"
+}
+export declare enum RenderFace {
+    Both = "Both",
+    Back = "Back",
+    Front = "Front"
+}

package/es/type.js

@@ -325,3 +325,14 @@ export var ParticleOrigin;
      */
     ParticleOrigin[ParticleOrigin["PARTICLE_ORIGIN_RIGHT_BOTTOM"] = 8] = "PARTICLE_ORIGIN_RIGHT_BOTTOM";
 })(ParticleOrigin || (ParticleOrigin = {}));
+export var RenderType;
+(function (RenderType) {
+    RenderType["Opaque"] = "Opaque";
+    RenderType["Transparent"] = "Transparent";
+})(RenderType || (RenderType = {}));
+export var RenderFace;
+(function (RenderFace) {
+    RenderFace["Both"] = "Both";
+    RenderFace["Back"] = "Back";
+    RenderFace["Front"] = "Front";
+})(RenderFace || (RenderFace = {}));

package/package.json

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