@galacean/effects-specification 2.1.0 → 2.2.0-alpha.1

package/es/constants.d.ts

@@ -30,5 +30,11 @@ export declare const END_BEHAVIOR_RESTART = 5;
 export declare const END_BEHAVIOR_DESTROY_CHILDREN = 6;
 export declare const CAMERA_CLIP_MODE_VERTICAL = 1;
 export declare const CAMERA_CLIP_MODE_NORMAL = 0;
+/**
+ * 消息开始
+ */
 export declare const MESSAGE_ITEM_PHRASE_BEGIN = 2;
+/**
+ * 消息结束
+ */
 export declare const MESSAGE_ITEM_PHRASE_END = 1;

package/es/constants.js

@@ -30,5 +30,11 @@ export const END_BEHAVIOR_RESTART = 5;
 export const END_BEHAVIOR_DESTROY_CHILDREN = 6;
 export const CAMERA_CLIP_MODE_VERTICAL = 1;
 export const CAMERA_CLIP_MODE_NORMAL = 0;
+/**
+ * 消息开始
+ */
 export const MESSAGE_ITEM_PHRASE_BEGIN = 2;
+/**
+ * 消息结束
+ */
 export const MESSAGE_ITEM_PHRASE_END = 1;

package/es/curve-data/index.d.ts

@@ -1,2 +1,2 @@
 export * from './color-curve-data';
-export * from './vector4-curve-data';
+export * from './vector-curve-datas';

package/es/curve-data/index.js

@@ -1,2 +1,2 @@
 export * from './color-curve-data';
-export * from './vector4-curve-data';
+export * from './vector-curve-datas';

package/es/curve-data/{vector4-curve-data.d.ts → vector-curve-datas.d.ts}

@@ -5,3 +5,12 @@ export type Vector4CurveData = [
     z: BezierValue,
     w: BezierValue
 ];
+export type Vector3CurveData = [
+    x: BezierValue,
+    y: BezierValue,
+    z: BezierValue
+];
+export type Vector2CurveData = [
+    x: BezierValue,
+    y: BezierValue
+];

package/es/data-type.d.ts

@@ -1,18 +1,11 @@
 export declare enum DataType {
     VFXItemData = "VFXItemData",
-    EffectComponent = "EffectComponent",
     Material = "Material",
     Shader = "Shader",
-    SpriteComponent = "SpriteComponent",
-    ParticleSystem = "ParticleSystem",
-    InteractComponent = "InteractComponent",
-    CameraController = "CameraController",
-    PostProcessVolume = "PostProcessVolume",
     Geometry = "Geometry",
     Texture = "Texture",
     Image = "Image",
     AnimationClip = "AnimationClip",
-    TextComponent = "TextComponent",
     BinaryAsset = "BinaryAsset",
     TrackAsset = "TrackAsset",
     TimelineAsset = "TimelineAsset",
@@ -23,6 +16,7 @@ export declare enum DataType {
     SubCompositionTrack = "SubCompositionTrack",
     FloatPropertyTrack = "FloatPropertyTrack",
     ColorPropertyTrack = "ColorPropertyTrack",
+    Vector2PropertyTrack = "Vector2PropertyTrack",
     Vector4PropertyTrack = "Vector4PropertyTrack",
     TransformPlayableAsset = "TransformPlayableAsset",
     SpriteColorPlayableAsset = "SpriteColorPlayableAsset",
@@ -30,6 +24,8 @@ export declare enum DataType {
     SubCompositionPlayableAsset = "SubCompositionPlayableAsset",
     FloatPropertyPlayableAsset = "FloatPropertyPlayableAsset",
     ColorPropertyPlayableAsset = "ColorPropertyPlayableAsset",
+    Vector2PropertyPlayableAsset = "Vector2PropertyPlayableAsset",
+    Vector4PropertyPlayableAsset = "Vector4PropertyPlayableAsset",
     MeshComponent = "MeshComponent",
     SkyboxComponent = "SkyboxComponent",
     LightComponent = "LightComponent",
@@ -43,5 +39,12 @@ export declare enum DataType {
     RichTextComponent = "RichTextComponent",
     OrientationComponent = "OrientationComponent",
     ShapeComponent = "ShapeComponent",
+    SpriteComponent = "SpriteComponent",
+    ParticleSystem = "ParticleSystem",
+    InteractComponent = "InteractComponent",
+    CameraController = "CameraController",
+    PostProcessVolume = "PostProcessVolume",
+    EffectComponent = "EffectComponent",
+    TextComponent = "TextComponent",
     TimelineClip = "TimelineClip"
 }

package/es/data-type.js

@@ -1,19 +1,13 @@
 export var DataType;
 (function (DataType) {
     DataType["VFXItemData"] = "VFXItemData";
-    DataType["EffectComponent"] = "EffectComponent";
+    // Assets
     DataType["Material"] = "Material";
     DataType["Shader"] = "Shader";
-    DataType["SpriteComponent"] = "SpriteComponent";
-    DataType["ParticleSystem"] = "ParticleSystem";
-    DataType["InteractComponent"] = "InteractComponent";
-    DataType["CameraController"] = "CameraController";
-    DataType["PostProcessVolume"] = "PostProcessVolume";
     DataType["Geometry"] = "Geometry";
     DataType["Texture"] = "Texture";
     DataType["Image"] = "Image";
     DataType["AnimationClip"] = "AnimationClip";
-    DataType["TextComponent"] = "TextComponent";
     DataType["BinaryAsset"] = "BinaryAsset";
     // Timeline
     DataType["TrackAsset"] = "TrackAsset";
@@ -25,6 +19,7 @@ export var DataType;
     DataType["SubCompositionTrack"] = "SubCompositionTrack";
     DataType["FloatPropertyTrack"] = "FloatPropertyTrack";
     DataType["ColorPropertyTrack"] = "ColorPropertyTrack";
+    DataType["Vector2PropertyTrack"] = "Vector2PropertyTrack";
     DataType["Vector4PropertyTrack"] = "Vector4PropertyTrack";
     DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
     DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
@@ -32,6 +27,9 @@ export var DataType;
     DataType["SubCompositionPlayableAsset"] = "SubCompositionPlayableAsset";
     DataType["FloatPropertyPlayableAsset"] = "FloatPropertyPlayableAsset";
     DataType["ColorPropertyPlayableAsset"] = "ColorPropertyPlayableAsset";
+    DataType["Vector2PropertyPlayableAsset"] = "Vector2PropertyPlayableAsset";
+    DataType["Vector4PropertyPlayableAsset"] = "Vector4PropertyPlayableAsset";
+    // Components
     DataType["MeshComponent"] = "MeshComponent";
     DataType["SkyboxComponent"] = "SkyboxComponent";
     DataType["LightComponent"] = "LightComponent";
@@ -45,6 +43,13 @@ export var DataType;
     DataType["RichTextComponent"] = "RichTextComponent";
     DataType["OrientationComponent"] = "OrientationComponent";
     DataType["ShapeComponent"] = "ShapeComponent";
+    DataType["SpriteComponent"] = "SpriteComponent";
+    DataType["ParticleSystem"] = "ParticleSystem";
+    DataType["InteractComponent"] = "InteractComponent";
+    DataType["CameraController"] = "CameraController";
+    DataType["PostProcessVolume"] = "PostProcessVolume";
+    DataType["EffectComponent"] = "EffectComponent";
+    DataType["TextComponent"] = "TextComponent";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";
 })(DataType || (DataType = {}));

package/es/index.d.ts

@@ -1,3 +1,4 @@
+import { JSONSceneVersion } from './scene';
 export * from './type';
 export * from './composition';
 export * from './texture';
@@ -39,3 +40,4 @@ export * from './material-data';
 export * from './geometry-data';
 export * from './shader-data';
 export * from './effects-package-data';
+export declare const LATEST_VERSION = JSONSceneVersion['LATEST'];

package/es/index.js

@@ -1,3 +1,4 @@
+import { JSONSceneVersion } from './scene';
 export * from './type';
 export * from './composition';
 export * from './texture';
@@ -39,3 +40,4 @@ export * from './material-data';
 export * from './geometry-data';
 export * from './shader-data';
 export * from './effects-package-data';
+export const LATEST_VERSION = JSONSceneVersion.LATEST;

package/es/number-expression.d.ts

@@ -1,4 +1,4 @@
-import type { ColorCurveData, Vector4CurveData } from './curve-data';
+import type { ColorCurveData, Vector2CurveData, Vector4CurveData } from './curve-data';
 /*********************************************/
 /*********************************************/
 export declare enum ValueType {
@@ -81,7 +81,11 @@ export declare enum ValueType {
     /**
      * Vector4 曲线
      */
-    VECTOR4_CURVE = 25
+    VECTOR4_CURVE = 25,
+    /**
+     * Vector2 曲线
+     */
+    VECTOR2_CURVE = 26
 }
 export type vec2 = [x: number, y: number];
 export type vec3 = [x: number, y: number, z: number];
@@ -280,6 +284,10 @@ export type ColorCurveValue = [type: ValueType.COLOR_CURVE, value: ColorCurveDat
  * Vector4 贝塞尔曲线
  */
 export type Vector4CurveValue = [type: ValueType.VECTOR4_CURVE, value: Vector4CurveData];
+/**
+ * Vector2 贝塞尔曲线
+ */
+export type Vector2CurveValue = [type: ValueType.VECTOR2_CURVE, value: Vector2CurveData];
 /*********************************************/
 /*********************************************/
 export type ColorExpression = RGBAColor | GradientColor | RGBAColors;

package/es/number-expression.js

@@ -83,6 +83,10 @@ export var ValueType;
      * Vector4 曲线
      */
     ValueType[ValueType["VECTOR4_CURVE"] = 25] = "VECTOR4_CURVE";
+    /**
+     * Vector2 曲线
+     */
+    ValueType[ValueType["VECTOR2_CURVE"] = 26] = "VECTOR2_CURVE";
 })(ValueType || (ValueType = {}));
 /**
  * 关键帧类型

package/es/scene.d.ts

@@ -103,6 +103,10 @@ export interface JSONSceneLegacy {
  * 如果是内置模块，但是需要额外的代码引入，比如滤镜则会加入 requires 数组中
  */
 export type SceneRequire = 'filter';
+export declare enum JSONSceneVersion {
+    '3.0' = "3.0",
+    'LATEST' = "3.1"
+}
 /**
  * 场景信息
  * 素材信息存放于统一数据结构中
@@ -115,7 +119,7 @@ export interface JSONScene {
      * 3.0 EC 改造、移除滤镜元素
      * 3.1 音视频
      */
-    version: string;
+    version: JSONSceneVersion;
     /**
      * 播放器版本信息
      */

package/es/scene.js

@@ -1 +1,5 @@
-export {};
+export var JSONSceneVersion;
+(function (JSONSceneVersion) {
+    JSONSceneVersion["3.0"] = "3.0";
+    JSONSceneVersion["LATEST"] = "3.1";
+})(JSONSceneVersion || (JSONSceneVersion = {}));

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

@@ -3,7 +3,6 @@ import type { Vector2Data } from '../math';
 import type { ShapeComponentData } from './shape-component-data';
 import type { ShapeFillParam } from './shape-fill-param';
 import type { ShapePrimitiveType } from './shape-primitive-type';
-import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 自定义形状点
  */
@@ -37,10 +36,6 @@ export interface CustomShape {
      * 填充属性
      */
     fill?: ShapeFillParam;
-    /**
-     * 描边属性
-     */
-    stroke?: ShapeStrokeParam;
     /**
      * 空间变换
      */

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

@@ -2,7 +2,6 @@ import type { TransformData } from '../item/base-item';
 import type { ShapeComponentData } from './shape-component-data';
 import type { ShapeFillParam } from './shape-fill-param';
 import type { ShapePrimitiveType } from './shape-primitive-type';
-import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 椭圆组件参数
  */
@@ -22,10 +21,6 @@ export interface EllipseData extends ShapeComponentData {
      * 填充属性
      */
     fill?: ShapeFillParam;
-    /**
-     * 描边属性
-     */
-    stroke?: ShapeStrokeParam;
     /**
      * 空间变换
      */

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

@@ -1,7 +1,6 @@
 import type { TransformData } from '../item/base-item';
 import type { ShapeComponentData } from './shape-component-data';
 import type { ShapeFillParam } from './shape-fill-param';
-import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 多边形参数
  */
@@ -22,10 +21,6 @@ export interface PolygonData extends ShapeComponentData {
      * 填充属性
      */
     fill?: ShapeFillParam;
-    /**
-     * 描边属性
-     */
-    stroke?: ShapeStrokeParam;
     /**
      * 空间变换
      */

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

@@ -1,7 +1,6 @@
 import type { TransformData } from '../item/base-item';
 import type { ShapeComponentData } from './shape-component-data';
 import type { ShapeFillParam } from './shape-fill-param';
-import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 矩形参数
  */
@@ -22,10 +21,6 @@ export interface RectangleData extends ShapeComponentData {
      * 填充属性
      */
     fill?: ShapeFillParam;
-    /**
-     * 描边属性
-     */
-    stroke?: ShapeStrokeParam;
     /**
      * 空间变换
      */

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

@@ -1,5 +1,6 @@
 import type { ComponentData } from '../components/component-data';
 import type { ShapePrimitiveType } from './shape-primitive-type';
+import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 矢量图形组件
  */
@@ -8,4 +9,8 @@ export interface ShapeComponentData extends ComponentData {
      * 矢量类型
      */
     type: ShapePrimitiveType;
+    /**
+     * 描边属性
+     */
+    stroke?: ShapeStrokeParam;
 }

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

@@ -1,7 +1,6 @@
 import type { TransformData } from '../item/base-item';
 import type { ShapeComponentData } from './shape-component-data';
 import type { ShapeFillParam } from './shape-fill-param';
-import type { ShapeStrokeParam } from './shape-stroke-param';
 /**
  * 星形参数
  */
@@ -30,10 +29,6 @@ export interface StarData extends ShapeComponentData {
      * 填充属性
      */
     fill?: ShapeFillParam;
-    /**
-     * 描边属性
-     */
-    stroke?: ShapeStrokeParam;
     /**
      * 空间变换
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-specification",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.1",
   "description": "Galacean Effects JSON Specification",
   "module": "./es/index.js",
   "main": "./es/index.js",
@@ -15,6 +15,17 @@
       "types": "./es/index.d.ts"
     }
   },
+  "scripts": {
+    "prebuild": "pnpm clean",
+    "build": "pnpm build:lib",
+    "build:lib": "tsc -b tsconfig.build.json",
+    "lint": "eslint src --ext .ts,.mjs",
+    "lint:fix": "eslint src --fix --quiet --ext .ts,.mjs",
+    "check:ts": "tsc -b tsconfig.check.json",
+    "clean": "rimraf es/**",
+    "prepare": "husky install",
+    "prepublishOnly": "npm run build"
+  },
   "browserslist": [
     "iOS 9"
   ],
@@ -37,14 +48,5 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
-  },
-  "scripts": {
-    "prebuild": "pnpm clean",
-    "build": "pnpm build:lib",
-    "build:lib": "tsc -b tsconfig.build.json",
-    "lint": "eslint src --ext .ts,.mjs",
-    "lint:fix": "eslint src --fix --quiet --ext .ts,.mjs",
-    "check:ts": "tsc -b tsconfig.check.json",
-    "clean": "rimraf es/**"
   }
-}
+}