@leafer/path 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/path",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "@leafer/path",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.5",
-    "@leafer/debug": "1.0.5"
+    "@leafer/math": "1.0.7",
+    "@leafer/debug": "1.0.7"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.5"
+    "@leafer/interface": "1.0.7"
   }
 }

package/src/BezierHelper.ts

@@ -8,13 +8,16 @@ import { PathHelper } from './PathHelper'
 
 const { sin, cos, atan2, ceil, abs, PI, sqrt, pow } = Math
 const { setPoint, addPoint } = TwoPointBoundsHelper
-const { set } = PointHelper
+const { set, toNumberPoints } = PointHelper
 const { M, L, C, Q, Z } = PathCommandMap
 const tempPoint = {} as IPointData
 
 export const BezierHelper = {
 
-    points(data: IPathCommandData, points: number[], curve?: boolean | number, close?: boolean): void {
+    points(data: IPathCommandData, originPoints: number[] | IPointData[], curve?: boolean | number, close?: boolean): void {
+
+        let points = toNumberPoints(originPoints)
+
         data.push(M, points[0], points[1])
 
         if (curve && points.length > 5) {

package/src/PathCommandDataHelper.ts

@@ -99,7 +99,7 @@ export const PathCommandDataHelper = {
         arc(data, x, y, radius, startAngle, endAngle, anticlockwise)
     },
 
-    drawPoints(data: IPathCommandData, points: number[], curve?: boolean | number, close?: boolean): void {
+    drawPoints(data: IPathCommandData, points: number[] | IPointData[], curve?: boolean | number, close?: boolean): void {
         BezierHelper.points(data, points, curve, close)
     }
 

package/src/PathConvert.ts

@@ -1,4 +1,4 @@
-import { IPathCommandData, IPointData } from '@leafer/interface'
+import { IPathCommandData, IPathCommandObject, IPointData } from '@leafer/interface'
 import { MathHelper, StringNumberMap } from '@leafer/math'
 import { Debug } from '@leafer/debug'
 
@@ -303,6 +303,20 @@ export const PathConvert = {
 
     },
 
+    objectToCanvasData(list: IPathCommandObject[]): IPathCommandData {
+        const data: IPathCommandData = []
+        list.forEach(item => {
+            switch (item.name) {
+                case 'M': data.push(M, item.x, item.y); break
+                case 'L': data.push(L, item.x, item.y); break
+                case 'C': data.push(C, item.x1, item.y1, item.x2, item.y2, item.x, item.y); break
+                case 'Q': data.push(Q, item.x1, item.y1, item.x, item.y); break
+                case 'Z': data.push(Z)
+            }
+        })
+        return data
+    },
+
     copyData(data: IPathCommandData, old: IPathCommandData, index: number, count: number): void {
         for (let i = index, end = index + count; i < end; i++) {
             data.push(old[i])

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPathCreator, IPathCommandData, IPathString, IPathDrawer, IBoundsData, ITwoPointBoundsData, IPointData, INumberMap, IStringMap } from '@leafer/interface';
+import { IPathCreator, IPathCommandData, IPathCommandObject, IPathString, IPointData, IPathDrawer, IBoundsData, ITwoPointBoundsData, INumberMap, IStringMap } from '@leafer/interface';
 
 declare const PathHelper: {
     creator: IPathCreator;
@@ -17,6 +17,7 @@ declare const PathConvert: {
     stringify(data: IPathCommandData, floatLength?: number): string;
     parse(pathString: string, curveMode?: boolean): IPathCommandData;
     toCanvasData(old: IPathCommandData, curveMode?: boolean): IPathCommandData;
+    objectToCanvasData(list: IPathCommandObject[]): IPathCommandData;
     copyData(data: IPathCommandData, old: IPathCommandData, index: number, count: number): void;
     pushData(data: IPathCommandData, strNum: string | number): void;
 };
@@ -59,7 +60,7 @@ declare const PathCommandDataHelper: {
     arcTo(data: IPathCommandData, x1: number, y1: number, x2: number, y2: number, radius: number, lastX?: number, lastY?: number): void;
     drawEllipse(data: IPathCommandData, x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void;
     drawArc(data: IPathCommandData, x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void;
-    drawPoints(data: IPathCommandData, points: number[], curve?: boolean | number, close?: boolean): void;
+    drawPoints(data: IPathCommandData, points: number[] | IPointData[], curve?: boolean | number, close?: boolean): void;
 };
 
 declare const PathDrawer: {
@@ -76,7 +77,7 @@ declare const PathCorner: {
 };
 
 declare const BezierHelper: {
-    points(data: IPathCommandData, points: number[], curve?: boolean | number, close?: boolean): void;
+    points(data: IPathCommandData, originPoints: number[] | IPointData[], curve?: boolean | number, close?: boolean): void;
     rect(data: IPathCommandData, x: number, y: number, width: number, height: number): void;
     roundRect(data: IPathCommandData, x: number, y: number, width: number, height: number, radius: number | number[]): void;
     arcTo(data: IPathCommandData | null | void, fromX: number, fromY: number, x1: number, y1: number, toX: number, toY: number, radius: number, setPointBounds?: ITwoPointBoundsData, setEndPoint?: IPointData, setStartPoint?: IPointData): void;