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

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

@@ -25,6 +25,7 @@ export interface SpriteContentOptions {
 }
 /**
  * 图层元素渲染属性
+ * @deprecated Please use SpriteComponentData instead
  */
 export interface SpriteContent {
     /**
@@ -78,4 +79,8 @@ export interface SpriteContent {
  * 图层组件属性
  */
 export interface SpriteComponentData extends ComponentData, SpriteContent {
+    /**
+     * 图层帧动画是否循环播放
+     */
+    loop?: boolean;
 }

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

@@ -1,7 +1,7 @@
 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';
+import type { FontStyle, TextAlignment, TextBaseline, TextOverflow, TextWeight, TextSizeMode } from '../text';
 import type { ComponentData } from '../components';
 /**
  * 文本元素
@@ -38,6 +38,26 @@ export interface TextContentOptions extends BaseTextContentOptions {
      * @default false
      */
     autoWidth?: boolean;
+    /**
+     * 尺寸模式
+     * @default TextSizeMode.autoWidth
+     */
+    sizeMode?: TextSizeMode;
+    /**
+     * 文本框宽度，用来排版和控制文本溢出行为
+     * @default undefined
+     */
+    maxTextWidth?: number;
+    /**
+     * 文本框高度，用来排版和控制文本溢出行为
+     * @default undefined
+     */
+    maxTextHeight?: number;
+    /**
+     * 是否开启自动换行
+     * @default false
+     */
+    wrapEnabled?: boolean;
 }
 export interface BaseTextContentOptions {
     /**

package/es/shape/index.d.ts

@@ -3,7 +3,6 @@ export * from './ellipse-data';
 export * from './polygon-data';
 export * from './rectangle-data';
 export * from './shape-component-data';
-export * from './shape-fill-param';
 export * from './shape-primitive-type';
 export * from './shape-stroke-param';
 export * from './star-data';

package/es/shape/index.js

@@ -3,7 +3,6 @@ export * from './ellipse-data';
 export * from './polygon-data';
 export * from './rectangle-data';
 export * from './shape-component-data';
-export * from './shape-fill-param';
 export * from './shape-primitive-type';
 export * from './shape-stroke-param';
 export * from './star-data';

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

@@ -1,9 +1,11 @@
-import type { RenderMode, SideMode, BlendingMode } from '../type';
+import type { 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';
-import type { ShapeStrokeParam } from './shape-stroke-param';
+import type { LineCap, LineJoin } from './shape-stroke-param';
+import type { Vector2Data } from '../math/vector-data';
+import type { GradientColor } from '../number-expression';
+import type { ColorData } from '../math/color-data';
 /**
  * 矢量图形组件
  */
@@ -12,14 +14,17 @@ export interface ShapeComponentData extends ComponentData {
      * 矢量类型
      */
     type: ShapePrimitiveType;
+    strokeWidth?: number;
+    strokeCap?: LineCap;
+    strokeJoin?: LineJoin;
     /**
      * 描边属性
      */
-    stroke?: ShapeStrokeParam;
+    strokes: PaintData[];
     /**
      * 填充属性
      */
-    fill?: ShapeFillParam;
+    fills: PaintData[];
     /**
      *  蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
@@ -30,10 +35,58 @@ export interface ShapeComponentData extends ComponentData {
     renderer?: ShapeRendererOptions;
 }
 export interface ShapeRendererOptions {
-    renderMode?: RenderMode;
     side?: SideMode;
     occlusion?: boolean;
     transparentOcclusion?: boolean;
     blending?: BlendingMode;
     texture?: DataPath;
 }
+export type PaintData = SolidPaintData | GradientPaintData | TexturePaintData;
+export declare enum FillType {
+    Solid = 0,
+    GradientLinear = 1,
+    GradientRadial = 2,
+    GradientAngular = 3,
+    Texture = 4
+}
+export interface SolidPaintData {
+    type: FillType.Solid;
+    /**
+     * 填充颜色
+     */
+    color: ColorData;
+}
+export interface GradientPaintData {
+    type: FillType.GradientLinear | FillType.GradientAngular | FillType.GradientRadial;
+    /**
+     * 渐变颜色
+     */
+    gradientStops: GradientColor;
+    /**
+     * 渐变起点
+     */
+    startPoint: Vector2Data;
+    /**
+     * 渐变终点
+     */
+    endPoint: Vector2Data;
+}
+export interface TexturePaintData {
+    type: FillType.Texture;
+    texture: DataPath;
+    scaleMode: TexturePaintScaleMode;
+    scalingFactor?: number;
+    textureTransform?: TextureTransformData;
+    opacity?: number;
+}
+export interface TextureTransformData {
+    offset?: Vector2Data;
+    rotation?: number;
+    scale?: Vector2Data;
+}
+export declare enum TexturePaintScaleMode {
+    Fill = 0,
+    Fit = 1,
+    Crop = 2,
+    Tile = 3
+}

package/es/shape/shape-component-data.js

@@ -1 +1,15 @@
-export {};
+export var FillType;
+(function (FillType) {
+    FillType[FillType["Solid"] = 0] = "Solid";
+    FillType[FillType["GradientLinear"] = 1] = "GradientLinear";
+    FillType[FillType["GradientRadial"] = 2] = "GradientRadial";
+    FillType[FillType["GradientAngular"] = 3] = "GradientAngular";
+    FillType[FillType["Texture"] = 4] = "Texture";
+})(FillType || (FillType = {}));
+export var TexturePaintScaleMode;
+(function (TexturePaintScaleMode) {
+    TexturePaintScaleMode[TexturePaintScaleMode["Fill"] = 0] = "Fill";
+    TexturePaintScaleMode[TexturePaintScaleMode["Fit"] = 1] = "Fit";
+    TexturePaintScaleMode[TexturePaintScaleMode["Crop"] = 2] = "Crop";
+    TexturePaintScaleMode[TexturePaintScaleMode["Tile"] = 3] = "Tile";
+})(TexturePaintScaleMode || (TexturePaintScaleMode = {}));

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

@@ -1,4 +1,3 @@
-import type { ColorData } from '../math/color-data';
 export declare enum LineCap {
     /** 默认值。向线条的每个末端添加平直的边缘 */
     Butt = 0,
@@ -15,24 +14,3 @@ export declare enum LineJoin {
     /** 创建尖角 */
     Miter = 2
 }
-/**
- * 矢量描边参数
- */
-export interface ShapeStrokeParam {
-    /**
-     * 线宽
-     */
-    width: number;
-    /**
-     * 线颜色
-     */
-    color: ColorData;
-    /**
-     * 线段端点的样式
-     */
-    cap: LineCap;
-    /**
-     * 线段连接处的样式
-     */
-    join: LineJoin;
-}

package/es/text.d.ts

@@ -52,17 +52,35 @@ export interface FontBase {
 }
 export declare enum TextOverflow {
     /**
-     * display 模式下，会显示所有文本，文本大小会根据边界框调整。
+     * visible 模式下，文本内容超出边界框时，会继续显示内容，不进行裁剪或缩放。
      */
-    display = 0,
+    visible = 0,
+    /**
+     * display 模式下，会显示所有文本，文本字号大小会根据边界框调整。
+     */
+    display = 1,
     /**
      * clip 模式下，当文本内容超出边界框时，多余的会被截断。
      */
-    clip = 1,
+    clip = 2,
     /**
      * ellipsis 模式下，会使用（...）来代替超出边界框的内容。
      */
-    ellipsis = 2
+    ellipsis = 3
+}
+export declare enum TextSizeMode {
+    /**
+     * 自适应宽度
+     */
+    autoWidth = 0,
+    /**
+     * 自适应高度
+     */
+    autoHeight = 1,
+    /**
+     * 固定宽高
+     */
+    fixed = 2
 }
 export declare enum TextBaseline {
     /**

package/es/text.js

@@ -1,18 +1,37 @@
 export var TextOverflow;
 (function (TextOverflow) {
     /**
-     * display 模式下，会显示所有文本，文本大小会根据边界框调整。
+     * visible 模式下，文本内容超出边界框时，会继续显示内容，不进行裁剪或缩放。
      */
-    TextOverflow[TextOverflow["display"] = 0] = "display";
+    TextOverflow[TextOverflow["visible"] = 0] = "visible";
+    /**
+     * display 模式下，会显示所有文本，文本字号大小会根据边界框调整。
+     */
+    TextOverflow[TextOverflow["display"] = 1] = "display";
     /**
      * clip 模式下，当文本内容超出边界框时，多余的会被截断。
      */
-    TextOverflow[TextOverflow["clip"] = 1] = "clip";
+    TextOverflow[TextOverflow["clip"] = 2] = "clip";
     /**
      * ellipsis 模式下，会使用（...）来代替超出边界框的内容。
      */
-    TextOverflow[TextOverflow["ellipsis"] = 2] = "ellipsis";
+    TextOverflow[TextOverflow["ellipsis"] = 3] = "ellipsis";
 })(TextOverflow || (TextOverflow = {}));
+export var TextSizeMode;
+(function (TextSizeMode) {
+    /**
+     * 自适应宽度
+     */
+    TextSizeMode[TextSizeMode["autoWidth"] = 0] = "autoWidth";
+    /**
+     * 自适应高度
+     */
+    TextSizeMode[TextSizeMode["autoHeight"] = 1] = "autoHeight";
+    /**
+     * 固定宽高
+     */
+    TextSizeMode[TextSizeMode["fixed"] = 2] = "fixed";
+})(TextSizeMode || (TextSizeMode = {}));
 export var TextBaseline;
 (function (TextBaseline) {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-specification",
-  "version": "2.6.0-alpha.1",
+  "version": "2.6.0",
   "description": "Galacean Effects JSON Specification",
   "module": "./es/index.js",
   "main": "./es/index.js",
@@ -15,17 +15,6 @@
       "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"
   ],
@@ -48,5 +37,14 @@
   "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/**"
   }
-}
+}

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

@@ -1,45 +0,0 @@
-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
-}
-/**
- * 矢量填充参数
- */
-export interface ShapeFillParam {
-    /**
-     * 填充颜色
-     */
-    color: ColorData;
-    /**
-     * 填充类型
-     */
-    fillType?: FillType;
-    /**
-     * 渐变颜色
-     */
-    gradient?: GradientColor;
-    /**
-     * 渐变起点
-     */
-    startPoint?: Vector2Data;
-    /**
-     * 渐变终点
-     */
-    endPoint?: Vector2Data;
-}

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

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