@leafer/path 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/EllipseHelper.ts

@@ -1,9 +1,11 @@
 import { IPathCommandData } from '@leafer/interface'
 import { OneRadian, PI2 } from '@leafer/math'
+import { Platform } from '@leafer/platform'
 
 import { PathCommandMap } from './PathCommandMap'
 import { BezierHelper } from './BezierHelper'
 
+
 const { sin, cos, sqrt, atan2 } = Math
 const { ellipse } = BezierHelper
 
@@ -56,7 +58,7 @@ export const EllipseHelper = {
 
         const anticlockwise = totalRadian < 0 ? 1 : 0
 
-        if (curveMode) {
+        if (curveMode || Platform.ellipseToCurve) {
             ellipse(data, centerX, centerY, radiusX, radiusY, rotation, startRadian / OneRadian, endRadian / OneRadian, anticlockwise as unknown as boolean)
         } else {
             if (radiusX === radiusY && !rotation) {

package/src/PathCorner.ts

@@ -1,10 +1,67 @@
 import { IPathCommandData } from '@leafer/interface'
+import { PathCommandMap as Command } from './PathCommandMap'
 
 
+const { M, L, C, Z, U } = Command
+
 export const PathCorner = {
 
-    smooth(data: IPathCommandData, _cornerRadius: number, _cornerSmoothing?: number): IPathCommandData {
-        return data
+    smooth(data: IPathCommandData, cornerRadius: number, _cornerSmoothing?: number): IPathCommandData {
+        let command: number
+        let i: number = 0, x: number = 0, y: number = 0, startX: number, startY = 0, centerX: number = 0, centerY: number = 0
+
+        const len = data.length
+        const smooth: IPathCommandData = []
+
+        while (i < len) {
+            command = data[i]
+            switch (command) {
+                case M:  //moveto(x, y)
+                    startX = data[i + 1]
+                    startY = data[i + 2]
+                    i += 3
+                    if (data[i] === L) { // next lineTo
+                        centerX = startX + (data[i + 1] - startX) / 2
+                        centerY = startY + (data[i + 2] - startY) / 2
+                        smooth.push(M, centerX, centerY)
+                    } else {
+                        smooth.push(M, startX, startY)
+                    }
+                    break
+                case L:  //lineto(x, y)
+                    x = data[i + 1]
+                    y = data[i + 2]
+                    i += 3
+                    switch (data[i]) { // next command
+                        case L: // lineTo()
+                            smooth.push(U, x, y, data[i + 1], data[i + 2], cornerRadius) // use arcTo(x1, y1, x2, y2, radius)
+                            break
+                        case Z: // closePath()
+                            smooth.push(U, x, y, startX, startY, cornerRadius) // use arcTo(x1, y1, x2, y2, radius)
+                            break
+                        default:
+                            smooth.push(L, x, y)
+                    }
+                    break
+                case C:  //bezierCurveTo(x1, y1, x2, y2, x, y)
+                    smooth.push(C, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6])
+                    i += 7
+                    break
+                case Z:  //closepath()
+                    smooth.push(U, startX, startY, centerX, centerY, cornerRadius) // use arcTo(x1, y1, x2, y2, radius)
+                    smooth.push(Z)
+                    i += 1
+                    break
+
+            }
+        }
+
+        if (command !== Z) {
+            smooth[1] = startX
+            smooth[2] = startY
+        }
+
+        return smooth
     }
 
 }

package/types/index.d.ts

@@ -67,7 +67,7 @@ declare const PathBounds: {
 };
 
 declare const PathCorner: {
-    smooth(data: IPathCommandData, _cornerRadius: number, _cornerSmoothing?: number): IPathCommandData;
+    smooth(data: IPathCommandData, cornerRadius: number, _cornerSmoothing?: number): IPathCommandData;
 };
 
 declare const BezierHelper: {