@leafer/path 1.12.1 → 1.12.2

package/package.json

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

package/src/BezierHelper.ts

@@ -23,7 +23,7 @@ export const BezierHelper = {
         if (curve && points.length > 5) {
 
             let aX: number, aY: number, bX: number, bY: number, cX: number, cY: number, c1X: number, c1Y: number, c2X: number, c2Y: number
-            let ba: number, cb: number, d: number, len = points.length
+            let baX: number, baY: number, ba: number, cb: number, d: number, len = points.length
             const t = curve === true ? 0.5 : curve as number
 
             if (close) {
@@ -41,7 +41,10 @@ export const BezierHelper = {
                 cX = points[i + 2]
                 cY = points[i + 3]
 
-                ba = sqrt(pow(bX - aX, 2) + pow(bY - aY, 2))
+                baX = bX - aX
+                baY = bY - aY
+
+                ba = sqrt(pow(baX, 2) + pow(baY, 2))
                 cb = sqrt(pow(cX - bX, 2) + pow(cY - bY, 2))
 
                 if (!ba && !cb) continue
@@ -59,7 +62,7 @@ export const BezierHelper = {
                 if (i === 2) {
                     if (!close) data.push(Q, c1X, c1Y, bX, bY)
                 } else {
-                    data.push(C, c2X, c2Y, c1X, c1Y, bX, bY)
+                    if (baX || baY) data.push(C, c2X, c2Y, c1X, c1Y, bX, bY) // 当前点与上一个点距离为0时，需要过滤
                 }
 
                 c2X = bX + cb * cX

package/src/PathCommandDataHelper.ts

@@ -59,6 +59,7 @@ export const PathCommandDataHelper = {
     },
 
     ellipse(data: IPathCommandData, x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void {
+        if (radiusX === radiusY) return arc(data, x, y, radiusX, startAngle, endAngle, anticlockwise)
         if (isNull(rotation)) {
             data.push(F, x, y, radiusX, radiusY)
         } else {
@@ -72,6 +73,7 @@ export const PathCommandDataHelper = {
         if (isNull(startAngle)) {
             data.push(P, x, y, radius)
         } else {
+            if (isNull(startAngle)) startAngle = 0
             if (isNull(endAngle)) endAngle = 360
             data.push(O, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0)
         }

package/src/PathCorner.ts

@@ -1,5 +1,6 @@
 import { IPathCommandData } from '@leafer/interface'
 import { PointHelper } from '@leafer/math'
+import { isArray } from '@leafer/data'
 
 import { PathCommandMap as Command, PathNumberCommandLengthMap } from './PathCommandMap'
 import { PathCommandDataHelper } from './PathCommandDataHelper'
@@ -15,6 +16,7 @@ export const PathCorner = {
 
         let command: number, lastCommand: number, commandLen
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0
+        if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0
 
         const len = data.length
         const smooth: IPathCommandData = []