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

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 { 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[];
     /**
      *  蒙版属性，传入表示需要作为蒙版/被遮挡/反向遮挡
      */
@@ -37,3 +42,46 @@ export interface ShapeRendererOptions {
     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;
+    opacity?: number;
+}
+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/package.json

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

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 = {}));