@visactor/vrender-core 0.21.14 → 0.22.0-vstory.10

package/cjs/common/render-area.js

@@ -8,18 +8,44 @@ const vutils_1 = require("@visactor/vutils"), enums_1 = require("./enums"), cubi
 
 function drawAreaSegments(path, segPath, percent, params) {
     var _a;
+    const {drawConnect: drawConnect = !1, mode: mode = "none"} = params || {};
+    if (drawConnect && "none" === mode) return;
     const {top: top, bottom: bottom} = segPath;
     if (top.curves.length !== bottom.curves.length) return;
     if (percent >= 1) {
         const topList = [], bottomList = [];
         let lastDefined = !0;
-        for (let i = 0, n = top.curves.length; i < n; i++) {
-            const topCurve = top.curves[i];
-            lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), 
-            topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), 
-            lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
+        if (drawConnect) {
+            let lastCurve, lastBottomCurve, defined0 = !0;
+            const n = top.curves.length;
+            top.curves.forEach(((curve, i) => {
+                const bototmCurve = bottom.curves[n - i - 1];
+                let currentTopCurve = curve, currentBottomCurve = bototmCurve;
+                if (curve.originP1 === curve.originP2) return lastCurve = curve, void (lastBottomCurve = bototmCurve);
+                if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (currentTopCurve = lastCurve, 
+                currentBottomCurve = lastBottomCurve), curve.defined) defined0 || (topList.push(currentTopCurve), 
+                bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), 
+                topList.length = 0, bottomList.length = 0, defined0 = !defined0); else {
+                    const {originP1: originP1, originP2: originP2} = curve;
+                    let validTopCurve, validBottomCurve;
+                    originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = curve, 
+                    validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || curve), 
+                    bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, 
+                    topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve), 
+                    drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
+                }
+                lastCurve = curve;
+            })), drawAreaConnectBlock(path, topList, bottomList, params);
+        } else {
+            for (let i = 0, n = top.curves.length; i < n; i++) {
+                const topCurve = top.curves[i];
+                lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), 
+                topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), 
+                lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
+            }
+            drawAreaBlock(path, topList, bottomList, params);
         }
-        return void drawAreaBlock(path, topList, bottomList, params);
+        return;
     }
     if (percent <= 0) return;
     let {direction: direction} = params || {};
@@ -30,20 +56,54 @@ function drawAreaSegments(path, segPath, percent, params) {
     const totalDrawLength = percent * (direction === enums_1.Direction.ROW ? xTotalLength : yTotalLength);
     let drawedLengthUntilLast = 0, lastDefined = !0;
     const topList = [], bottomList = [];
+    let lastTopCurve, lastBottomCurve, defined0 = !0;
     for (let i = 0, n = top.curves.length; i < n; i++) {
         const topCurve = top.curves[i], curCurveLength = topCurve.getLength(direction), percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
         if (percent < 0) break;
-        drawedLengthUntilLast += curCurveLength;
-        let tc = null, bc = null;
-        lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), 
-        topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), 
-        lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), 
-        tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? (0, cubic_bezier_1.divideCubic)(tc, percent)[0] : (0, 
-        line_1.divideLinear)(tc, percent)[0], bc = bc.p2 && bc.p3 ? (0, cubic_bezier_1.divideCubic)(bc, 1 - percent)[1] : (0, 
-        line_1.divideLinear)(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, 
-        topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
+        if (drawedLengthUntilLast += curCurveLength, drawConnect) {
+            const bototmCurve = bottom.curves[n - i - 1];
+            let currentTopCurve = topCurve, currentBottomCurve = bototmCurve;
+            if (topCurve.originP1 === topCurve.originP2) {
+                lastTopCurve = topCurve, lastBottomCurve = bototmCurve;
+                continue;
+            }
+            if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2 && (currentTopCurve = lastTopCurve, 
+            currentBottomCurve = lastBottomCurve), topCurve.defined) defined0 || (topList.push(currentTopCurve), 
+            bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), 
+            topList.length = 0, bottomList.length = 0, defined0 = !defined0); else {
+                const {originP1: originP1, originP2: originP2} = topCurve;
+                let validTopCurve, validBottomCurve;
+                originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = topCurve, 
+                validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || topCurve), 
+                bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, 
+                topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve), 
+                drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
+            }
+            lastTopCurve = topCurve;
+        } else {
+            let tc = null, bc = null;
+            lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), 
+            topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), 
+            lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), 
+            tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? (0, cubic_bezier_1.divideCubic)(tc, percent)[0] : (0, 
+            line_1.divideLinear)(tc, percent)[0], bc = bc.p2 && bc.p3 ? (0, cubic_bezier_1.divideCubic)(bc, 1 - percent)[1] : (0, 
+            line_1.divideLinear)(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, 
+            topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
+        }
     }
-    drawAreaBlock(path, topList, bottomList, params);
+    drawConnect ? drawAreaConnectBlock(path, topList, bottomList, params) : drawAreaBlock(path, topList, bottomList, params);
+}
+
+function drawAreaConnectBlock(path, topList, bottomList, params) {
+    if (topList.length < 2) return;
+    const {offsetX: offsetX = 0, offsetY: offsetY = 0, offsetZ: offsetZ = 0, mode: mode} = params || {};
+    let curve = topList[0];
+    path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = topList[topList.length - 1];
+    let end = curve.p3 || curve.p1;
+    path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), curve = bottomList[bottomList.length - 1], 
+    path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = bottomList[0], 
+    end = curve.p3 || curve.p1, path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), 
+    path.closePath();
 }
 
 function drawAreaBlock(path, topList, bottomList, params) {
@@ -61,5 +121,4 @@ function drawAreaBlock(path, topList, bottomList, params) {
     path.closePath();
 }
 
-//# sourceMappingURL=render-area.js.map
 exports.drawAreaSegments = drawAreaSegments;

package/cjs/common/render-area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/render-area.ts"],"names":[],"mappings":"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","file":"render-area.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { abs } from '@visactor/vutils';\nimport type { IAreaCacheItem, ICubicBezierCurve, ICurve, IDirection, ILineCurve, IPath2D } from '../interface';\nimport { Direction } from './enums';\nimport { divideCubic } from './segment/curve/cubic-bezier';\nimport { divideLinear } from './segment/curve/line';\nimport { drawSegItem } from './render-utils';\n\n/**\n * 绘制连续的线段\n * 绘制长度为总长度percent的path，drawDirection为绘制的方向，也就是percent的方向\n * @param path\n * @param segPath\n * @param percent\n * @param drawDirection 绘制的方向，用于使用percent绘制\n * @param line 用于获取line相关属性\n */\nexport function drawAreaSegments(\n  path: IPath2D,\n  segPath: IAreaCacheItem,\n  percent: number,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n    direction?: IDirection;\n  }\n) {\n  // let needMoveTo: boolean = true;\n  const { top, bottom } = segPath;\n  // 如果top和bottom的curves数量不同，那么就跳过\n  if (top.curves.length !== bottom.curves.length) {\n    return;\n  }\n  if (percent >= 1) {\n    const topList: ICurve<IPoint>[] = [];\n    const bottomList: ICurve<IPoint>[] = [];\n    let lastDefined: boolean = true;\n    for (let i = 0, n = top.curves.length; i < n; i++) {\n      const topCurve = top.curves[i];\n      if (lastDefined !== topCurve.defined) {\n        if (lastDefined) {\n          drawAreaBlock(path, topList, bottomList, params);\n          topList.length = 0;\n          bottomList.length = 0;\n        } else {\n          topList.push(topCurve);\n          bottomList.push(bottom.curves[n - i - 1]);\n        }\n        lastDefined = !lastDefined;\n      } else {\n        if (lastDefined) {\n          topList.push(topCurve);\n          bottomList.push(bottom.curves[n - i - 1]);\n        }\n      }\n    }\n    drawAreaBlock(path, topList, bottomList, params);\n\n    return;\n  }\n  if (percent <= 0) {\n    return;\n  }\n\n  let { direction } = params || {};\n  const { curves: topCurves } = top;\n  const endP = topCurves[topCurves.length - 1].p3 ?? topCurves[topCurves.length - 1].p1;\n  const xTotalLength = abs(endP.x - topCurves[0].p0.x);\n  const yTotalLength = abs(endP.y - topCurves[0].p0.y);\n  direction = direction ?? (xTotalLength > yTotalLength ? Direction.ROW : Direction.COLUMN);\n  if (!Number.isFinite(xTotalLength)) {\n    direction = Direction.COLUMN;\n  }\n  if (!Number.isFinite(yTotalLength)) {\n    direction = Direction.ROW;\n  }\n\n  // x和y必须始终保持同方向\n  // 整个线段的总长度（基于水平、垂直方向）\n  const totalLength: number = direction === Direction.ROW ? xTotalLength : yTotalLength;\n\n  // 总需要绘制的长度\n  const totalDrawLength = percent * totalLength;\n  // 直到上次绘制的长度\n  let drawedLengthUntilLast = 0;\n  let lastDefined: boolean = true;\n  const topList: ICurve<IPoint>[] = [];\n  const bottomList: ICurve<IPoint>[] = [];\n  const defined0 = true;\n  let lastTopCurve: ICurve<IPoint>;\n  let lastBottomCurve: ICurve<IPoint>;\n  for (let i = 0, n = top.curves.length; i < n; i++) {\n    const topCurve = top.curves[i];\n    const curCurveLength = topCurve.getLength(direction);\n    const percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n    if (percent < 0) {\n      break;\n    }\n    drawedLengthUntilLast += curCurveLength;\n\n    let tc: ICurve<IPoint> | null = null;\n    let bc: ICurve<IPoint> | null = null;\n    if (lastDefined !== topCurve.defined) {\n      if (lastDefined) {\n        drawAreaBlock(path, topList, bottomList, params);\n        topList.length = 0;\n        bottomList.length = 0;\n      } else {\n        tc = topCurve;\n        bc = bottom.curves[n - i - 1];\n      }\n      lastDefined = !lastDefined;\n    } else {\n      if (lastDefined) {\n        tc = topCurve;\n        bc = bottom.curves[n - i - 1];\n      }\n    }\n\n    if (tc && bc) {\n      if (percent < 1) {\n        if (tc.p2 && tc.p3) {\n          tc = divideCubic(tc as ICubicBezierCurve, percent)[0];\n        } else {\n          tc = divideLinear(tc as ILineCurve, percent)[0];\n        }\n        if (bc.p2 && bc.p3) {\n          bc = divideCubic(bc as ICubicBezierCurve, 1 - percent)[1];\n        } else {\n          bc = divideLinear(bc as ILineCurve, 1 - percent)[1];\n        }\n      }\n      tc.defined = lastDefined;\n      bc.defined = lastDefined;\n      topList.push(tc);\n      bottomList.push(bc);\n    }\n\n    tc = null;\n    bc = null;\n  }\n\n  drawAreaBlock(path, topList, bottomList, params);\n\n  // const totalLength = segPath.tryUpdateLength();\n\n  // // 直到上次绘制的长度\n  // let drawedLengthUntilLast = 0;\n  // for (let i = 0, n = curves.length; i < n; i++) {\n  //   const curve = curves[i];\n  //   const curCurveLength = curve.getLength();\n  //   const _p = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n  //   drawedLengthUntilLast += curCurveLength;\n  //   if (_p < 0) {\n  //     break;\n  //   }\n\n  //   // 跳过这个点\n  //   if (!curve.defined()) {\n  //     needMoveTo = true;\n  //     continue;\n  //   }\n  //   if (needMoveTo) {\n  //     path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY);\n  //   }\n  //   drawSegItem(path, curve, min(_p, 1), params);\n  //   needMoveTo = false;\n  // }\n}\n\nfunction drawAreaBlock(\n  path: IPath2D,\n  topList: ICurve<IPoint>[],\n  bottomList: ICurve<IPoint>[],\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n  let needMoveTo = true;\n  topList.forEach(curve => {\n    // 跳过这个点\n    if (!curve.defined) {\n      needMoveTo = true;\n      return;\n    }\n    if (needMoveTo) {\n      path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n    }\n    drawSegItem(path, curve, 1, params);\n    needMoveTo = false;\n  });\n  needMoveTo = true;\n  for (let i = bottomList.length - 1; i >= 0; i--) {\n    const curve = bottomList[i];\n    // 跳过这个点\n    if (!curve.defined) {\n      needMoveTo = true;\n      continue;\n    }\n    if (needMoveTo) {\n      // bottom需要直接line绘制\n      path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n    }\n    drawSegItem(path, curve, 1, params);\n    needMoveTo = false;\n  }\n  path.closePath();\n}\n"]}
+{"version":3,"sources":["../src/common/render-area.ts"],"names":[],"mappings":"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","file":"render-area.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { abs } from '@visactor/vutils';\nimport type { IAreaCacheItem, ICubicBezierCurve, ICurve, IDirection, ILineCurve, IPath2D } from '../interface';\nimport { Direction } from './enums';\nimport { divideCubic } from './segment/curve/cubic-bezier';\nimport { divideLinear } from './segment/curve/line';\nimport { drawSegItem } from './render-utils';\n\n/**\n * 绘制连续的线段\n * 绘制长度为总长度percent的path，drawDirection为绘制的方向，也就是percent的方向\n * @param path\n * @param segPath\n * @param percent\n * @param drawDirection 绘制的方向，用于使用percent绘制\n * @param line 用于获取line相关属性\n */\nexport function drawAreaSegments(\n  path: IPath2D,\n  segPath: IAreaCacheItem,\n  percent: number,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n    direction?: IDirection;\n    drawConnect?: boolean; // 是否是绘制connect区域的效果\n    mode?: 'none' | 'connect' | 'zero';\n    zeroX?: number;\n    zeroY?: number;\n  }\n) {\n  const { drawConnect = false, mode = 'none' } = params || {};\n  if (drawConnect && mode === 'none') {\n    return;\n  }\n  // let needMoveTo: boolean = true;\n  const { top, bottom } = segPath;\n  // 如果top和bottom的curves数量不同，那么就跳过\n  if (top.curves.length !== bottom.curves.length) {\n    return;\n  }\n  if (percent >= 1) {\n    const topList: ICurve<IPoint>[] = [];\n    const bottomList: ICurve<IPoint>[] = [];\n    let lastDefined: boolean = true;\n    if (drawConnect) {\n      let defined0 = true;\n      let lastCurve: ICurve<IPoint>;\n      let lastBottomCurve: ICurve<IPoint>;\n      const n = top.curves.length;\n      top.curves.forEach((curve, i) => {\n        // step的逻辑\n        const bototmCurve = bottom.curves[n - i - 1];\n        let currentTopCurve = curve;\n        let currentBottomCurve = bototmCurve;\n        if (curve.originP1 === curve.originP2) {\n          lastCurve = curve;\n          lastBottomCurve = bototmCurve;\n          return;\n        }\n        if (lastCurve && lastCurve.originP1 === lastCurve.originP2) {\n          currentTopCurve = lastCurve;\n          currentBottomCurve = lastBottomCurve;\n        }\n        if (curve.defined) {\n          // 非法变合法需要lineTo，合法变非法需要moveTo，初始非法需要moveTo\n          if (!defined0) {\n            topList.push(currentTopCurve);\n            bottomList.push(currentBottomCurve);\n            drawAreaConnectBlock(path, topList, bottomList, params);\n            topList.length = 0;\n            bottomList.length = 0;\n            defined0 = !defined0;\n          }\n        } else {\n          // 找到合法的点\n          const { originP1, originP2 } = curve;\n          let validTopCurve: ICurve<IPoint>;\n          let validBottomCurve: ICurve<IPoint>;\n          if (originP1 && originP1.defined !== false) {\n            validTopCurve = currentTopCurve;\n            validBottomCurve = currentBottomCurve;\n          } else if (originP1 && originP2.defined !== false) {\n            validTopCurve = curve;\n            validBottomCurve = bototmCurve;\n          }\n          // 合法/（初始）变非法，moveTo\n          if (defined0) {\n            defined0 = !defined0;\n            topList.push(validTopCurve || curve);\n            bottomList.push(validBottomCurve || bototmCurve);\n          } else {\n            // 非法变非法/合法，看情况要不要lineTo\n            if (validTopCurve) {\n              // 非法变合法，需要lineTo\n              defined0 = !defined0;\n              topList.push(validTopCurve || curve);\n              bottomList.push(validBottomCurve || bototmCurve);\n              drawAreaConnectBlock(path, topList, bottomList, params);\n              topList.length = 0;\n              bottomList.length = 0;\n            }\n          }\n        }\n        lastCurve = curve;\n      });\n      drawAreaConnectBlock(path, topList, bottomList, params);\n    } else {\n      for (let i = 0, n = top.curves.length; i < n; i++) {\n        const topCurve = top.curves[i];\n        if (lastDefined !== topCurve.defined) {\n          if (lastDefined) {\n            drawAreaBlock(path, topList, bottomList, params);\n            topList.length = 0;\n            bottomList.length = 0;\n          } else {\n            topList.push(topCurve);\n            bottomList.push(bottom.curves[n - i - 1]);\n          }\n          lastDefined = !lastDefined;\n        } else {\n          if (lastDefined) {\n            topList.push(topCurve);\n            bottomList.push(bottom.curves[n - i - 1]);\n          }\n        }\n      }\n      drawAreaBlock(path, topList, bottomList, params);\n    }\n\n    return;\n  }\n  if (percent <= 0) {\n    return;\n  }\n\n  let { direction } = params || {};\n  const { curves: topCurves } = top;\n  const endP = topCurves[topCurves.length - 1].p3 ?? topCurves[topCurves.length - 1].p1;\n  const xTotalLength = abs(endP.x - topCurves[0].p0.x);\n  const yTotalLength = abs(endP.y - topCurves[0].p0.y);\n  direction = direction ?? (xTotalLength > yTotalLength ? Direction.ROW : Direction.COLUMN);\n  if (!Number.isFinite(xTotalLength)) {\n    direction = Direction.COLUMN;\n  }\n  if (!Number.isFinite(yTotalLength)) {\n    direction = Direction.ROW;\n  }\n\n  // x和y必须始终保持同方向\n  // 整个线段的总长度（基于水平、垂直方向）\n  const totalLength: number = direction === Direction.ROW ? xTotalLength : yTotalLength;\n\n  // 总需要绘制的长度\n  const totalDrawLength = percent * totalLength;\n  // 直到上次绘制的长度\n  let drawedLengthUntilLast = 0;\n  let lastDefined: boolean = true;\n  const topList: ICurve<IPoint>[] = [];\n  const bottomList: ICurve<IPoint>[] = [];\n  let defined0 = true;\n  let lastTopCurve: ICurve<IPoint>;\n  let lastBottomCurve: ICurve<IPoint>;\n  for (let i = 0, n = top.curves.length; i < n; i++) {\n    const topCurve = top.curves[i];\n    const curCurveLength = topCurve.getLength(direction);\n    const percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n    if (percent < 0) {\n      break;\n    }\n    drawedLengthUntilLast += curCurveLength;\n\n    if (drawConnect) {\n      // step的逻辑\n      const bototmCurve = bottom.curves[n - i - 1];\n      let currentTopCurve = topCurve;\n      let currentBottomCurve = bototmCurve;\n      if (topCurve.originP1 === topCurve.originP2) {\n        lastTopCurve = topCurve;\n        lastBottomCurve = bototmCurve;\n        continue;\n      }\n      if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2) {\n        currentTopCurve = lastTopCurve;\n        currentBottomCurve = lastBottomCurve;\n      }\n      if (topCurve.defined) {\n        // 非法变合法需要lineTo，合法变非法需要moveTo，初始非法需要moveTo\n        if (!defined0) {\n          topList.push(currentTopCurve);\n          bottomList.push(currentBottomCurve);\n          drawAreaConnectBlock(path, topList, bottomList, params);\n          topList.length = 0;\n          bottomList.length = 0;\n          defined0 = !defined0;\n        }\n      } else {\n        // 找到合法的点\n        const { originP1, originP2 } = topCurve;\n        let validTopCurve: ICurve<IPoint>;\n        let validBottomCurve: ICurve<IPoint>;\n        if (originP1 && originP1.defined !== false) {\n          validTopCurve = currentTopCurve;\n          validBottomCurve = currentBottomCurve;\n        } else if (originP1 && originP2.defined !== false) {\n          validTopCurve = topCurve;\n          validBottomCurve = bototmCurve;\n        }\n        // 合法/（初始）变非法，moveTo\n        if (defined0) {\n          defined0 = !defined0;\n          topList.push(validTopCurve || topCurve);\n          bottomList.push(validBottomCurve || bototmCurve);\n        } else {\n          // 非法变非法/合法，看情况要不要lineTo\n          if (validTopCurve) {\n            // 非法变合法，需要lineTo\n            defined0 = !defined0;\n            topList.push(validTopCurve || topCurve);\n            bottomList.push(validBottomCurve || bototmCurve);\n            drawAreaConnectBlock(path, topList, bottomList, params);\n            topList.length = 0;\n            bottomList.length = 0;\n          }\n        }\n      }\n      lastTopCurve = topCurve;\n      // drawAreaBlock(path, topList, bottomList, params);\n    } else {\n      let tc: ICurve<IPoint> | null = null;\n      let bc: ICurve<IPoint> | null = null;\n      if (lastDefined !== topCurve.defined) {\n        if (lastDefined) {\n          drawAreaBlock(path, topList, bottomList, params);\n          topList.length = 0;\n          bottomList.length = 0;\n        } else {\n          tc = topCurve;\n          bc = bottom.curves[n - i - 1];\n        }\n        lastDefined = !lastDefined;\n      } else {\n        if (lastDefined) {\n          tc = topCurve;\n          bc = bottom.curves[n - i - 1];\n        }\n      }\n\n      if (tc && bc) {\n        if (percent < 1) {\n          if (tc.p2 && tc.p3) {\n            tc = divideCubic(tc as ICubicBezierCurve, percent)[0];\n          } else {\n            tc = divideLinear(tc as ILineCurve, percent)[0];\n          }\n          if (bc.p2 && bc.p3) {\n            bc = divideCubic(bc as ICubicBezierCurve, 1 - percent)[1];\n          } else {\n            bc = divideLinear(bc as ILineCurve, 1 - percent)[1];\n          }\n        }\n        tc.defined = lastDefined;\n        bc.defined = lastDefined;\n        topList.push(tc);\n        bottomList.push(bc);\n      }\n\n      tc = null;\n      bc = null;\n    }\n  }\n\n  if (drawConnect) {\n    drawAreaConnectBlock(path, topList, bottomList, params);\n  } else {\n    drawAreaBlock(path, topList, bottomList, params);\n  }\n\n  // const totalLength = segPath.tryUpdateLength();\n\n  // // 直到上次绘制的长度\n  // let drawedLengthUntilLast = 0;\n  // for (let i = 0, n = curves.length; i < n; i++) {\n  //   const curve = curves[i];\n  //   const curCurveLength = curve.getLength();\n  //   const _p = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n  //   drawedLengthUntilLast += curCurveLength;\n  //   if (_p < 0) {\n  //     break;\n  //   }\n\n  //   // 跳过这个点\n  //   if (!curve.defined()) {\n  //     needMoveTo = true;\n  //     continue;\n  //   }\n  //   if (needMoveTo) {\n  //     path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY);\n  //   }\n  //   drawSegItem(path, curve, min(_p, 1), params);\n  //   needMoveTo = false;\n  // }\n}\n\nfunction drawAreaConnectBlock(\n  path: IPath2D,\n  topList: ICurve<IPoint>[],\n  bottomList: ICurve<IPoint>[],\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n    mode?: 'none' | 'connect' | 'zero';\n    zeroX?: number;\n    zeroY?: number;\n  }\n) {\n  if (topList.length < 2) {\n    return;\n  }\n  const { offsetX = 0, offsetY = 0, offsetZ = 0, mode } = params || {};\n  let curve = topList[0];\n  // mode不支持zero\n  path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n  curve = topList[topList.length - 1];\n  let end = curve.p3 || curve.p1;\n  path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ);\n\n  curve = bottomList[bottomList.length - 1];\n  path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n  curve = bottomList[0];\n  end = curve.p3 || curve.p1;\n  path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ);\n\n  path.closePath();\n}\n\nfunction drawAreaBlock(\n  path: IPath2D,\n  topList: ICurve<IPoint>[],\n  bottomList: ICurve<IPoint>[],\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n  let needMoveTo = true;\n  topList.forEach(curve => {\n    // 跳过这个点\n    if (!curve.defined) {\n      needMoveTo = true;\n      return;\n    }\n    if (needMoveTo) {\n      path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n    }\n    drawSegItem(path, curve, 1, params);\n    needMoveTo = false;\n  });\n  needMoveTo = true;\n  for (let i = bottomList.length - 1; i >= 0; i--) {\n    const curve = bottomList[i];\n    // 跳过这个点\n    if (!curve.defined) {\n      needMoveTo = true;\n      continue;\n    }\n    if (needMoveTo) {\n      // bottom需要直接line绘制\n      path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n    }\n    drawSegItem(path, curve, 1, params);\n    needMoveTo = false;\n  }\n  path.closePath();\n}\n"]}

package/cjs/common/render-command-list.js

@@ -13,4 +13,5 @@ function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy = 1, z
     }
 }
 
-exports.renderCommandList = renderCommandList;
+exports.renderCommandList = renderCommandList;
+//# sourceMappingURL=render-command-list.js.map

package/cjs/common/render-curve.d.ts

@@ -4,7 +4,7 @@ export declare function drawSegments(path: IPath2D, segPath: ISegPath2D, percent
     offsetY?: number;
     offsetZ?: number;
     drawConnect?: boolean;
-    mode?: 'none' | 'connect';
+    mode?: 'none' | 'connect' | 'zero';
     zeroX?: number;
     zeroY?: number;
 }): void;

package/cjs/common/render-curve.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/render-curve.ts"],"names":[],"mappings":"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","file":"render-curve.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { min } from '@visactor/vutils';\nimport type {\n  IAreaSegment,\n  IClipRangeByDimensionType,\n  ICurve,\n  IDirection,\n  IPath2D,\n  ISegment,\n  ISegPath2D\n} from '../interface';\nimport { Direction } from './enums';\nimport { drawSegItem } from './render-utils';\n\nfunction drawEachCurve(\n  path: IPath2D,\n  curve: ICurve<IPoint>,\n  lastCurve: ICurve<IPoint>,\n  defined0: boolean,\n  offsetX: number,\n  offsetY: number,\n  offsetZ: number\n) {\n  let p0 = curve.p0;\n  let newDefined0 = defined0;\n\n  if (lastCurve && lastCurve.originP1 === lastCurve.originP2) {\n    p0 = lastCurve.p0;\n  }\n  if (curve.defined) {\n    // 非法变合法需要lineTo，合法变非法需要moveTo，初始非法需要moveTo\n    if (!defined0) {\n      path.lineTo(p0.x + offsetX, p0.y + offsetY, offsetZ);\n      newDefined0 = !defined0;\n    }\n  } else {\n    // 找到合法的点\n    const { originP1, originP2 } = curve;\n    let validP: IPointLike;\n    // 只能第一个curve才可以用p0作为合法点，后面的curve都不应该算p1，因为已经算在前面了\n    // lastCurve只在第一个curve不存在\n    if (originP1 && originP1.defined !== false && !lastCurve) {\n      validP = p0;\n    } else if (originP1 && originP2.defined !== false) {\n      validP = curve.p3 ?? curve.p1;\n    }\n    // 合法/（初始）变非法，moveTo\n    if (defined0) {\n      newDefined0 = !defined0;\n      const x = validP ? validP.x : curve.p0.x;\n      const y = validP ? validP.y : curve.p0.y;\n      path.moveTo(x + offsetX, y + offsetY, offsetZ);\n    } else {\n      // 非法变非法/合法，看情况要不要lineTo\n      if (validP) {\n        // 非法变合法，需要lineTo\n        newDefined0 = !defined0;\n        path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ);\n      }\n    }\n  }\n\n  return newDefined0;\n}\n\n/**\n * 绘制连续的线段\n * 绘制长度为总长度percent的path，drawDirection为绘制的方向，也就是percent的方向\n * @param path\n * @param segPath\n * @param percent\n * @param drawDirection 绘制的方向，用于使用percent绘制\n * @param line 用于获取line相关属性\n */\nexport function drawSegments(\n  path: IPath2D,\n  segPath: ISegPath2D,\n  percent: number,\n  clipRangeByDimension: IClipRangeByDimensionType,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n    drawConnect?: boolean; // 是否是绘制connect区域的效果\n    mode?: 'none' | 'connect';\n    zeroX?: number;\n    zeroY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0, offsetZ = 0, mode = 'none', drawConnect = false } = params || {};\n  // none的connect不需要draw\n  if (drawConnect && mode === 'none') {\n    return;\n  }\n  if (!segPath) {\n    return;\n  }\n  let needMoveTo: boolean = true;\n  const { curves } = segPath;\n  if (percent >= 1) {\n    if (drawConnect) {\n      // return;\n      let defined0 = true;\n      let lastCurve: ICurve<IPoint>;\n      curves.forEach((curve, i) => {\n        // step的逻辑\n        if (curve.originP1 === curve.originP2) {\n          lastCurve = curve;\n          return;\n        }\n        defined0 = drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offsetZ);\n\n        lastCurve = curve;\n      });\n    } else {\n      curves.forEach(curve => {\n        // 跳过这个点\n        if (!curve.defined) {\n          needMoveTo = true;\n          return;\n        }\n        if (needMoveTo) {\n          path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n        }\n        drawSegItem(path, curve, 1, params);\n        needMoveTo = false;\n      });\n    }\n\n    return;\n  }\n  if (percent <= 0) {\n    return;\n  }\n\n  let direction: IDirection | undefined;\n\n  if (clipRangeByDimension === 'x') {\n    direction = Direction.ROW;\n  } else if (clipRangeByDimension === 'y') {\n    direction = Direction.COLUMN;\n  } else if (clipRangeByDimension === 'auto') {\n    direction = segPath.direction;\n  }\n\n  // 整个线段的总长度\n  const totalLength = segPath.tryUpdateLength(direction);\n  // 总需要绘制的长度\n  const totalDrawLength = percent * totalLength;\n  // 直到上次绘制的长度\n  let drawedLengthUntilLast = 0;\n  let defined0 = true;\n  let lastCurve: ICurve<IPoint> = null;\n  for (let i = 0, n = curves.length; i < n; i++) {\n    const curve = curves[i];\n    const curCurveLength = curve.getLength(direction);\n    const _p = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n    drawedLengthUntilLast += curCurveLength;\n    if (_p < 0) {\n      break;\n    }\n\n    if (drawConnect) {\n      // step的逻辑\n      if (curve.originP1 === curve.originP2) {\n        lastCurve = curve;\n        continue;\n      }\n      defined0 = drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offsetZ);\n\n      lastCurve = curve;\n    } else {\n      // 跳过这个点\n      if (!curve.defined) {\n        needMoveTo = true;\n        continue;\n      }\n      if (needMoveTo) {\n        path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n      }\n      drawSegItem(path, curve, min(_p, 1), params);\n      needMoveTo = false;\n    }\n  }\n}\n\nexport function drawIncrementalSegments(\n  path: IPath2D,\n  lastSeg: ISegment,\n  segments: ISegment,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0 } = params || {};\n  const startP = lastSeg ? lastSeg.points[lastSeg.points.length - 1] : segments.points[0];\n  path.moveTo(startP.x + offsetX, startP.y + offsetY);\n  segments.points.forEach(p => {\n    if (p.defined === false) {\n      path.moveTo(p.x + offsetX, p.y + offsetY);\n      return;\n    }\n    path.lineTo(p.x + offsetX, p.y + offsetY);\n  });\n}\n\nexport function drawIncrementalAreaSegments(\n  path: IPath2D,\n  lastSeg: IAreaSegment,\n  segments: IAreaSegment,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0 } = params || {};\n  const { points } = segments;\n  // 分段\n  const definedPointsList: IPointLike[][] = [];\n  let lastIdx = 0;\n  for (let i = 0; i < points.length; i++) {\n    if (points[i].defined === false) {\n      if (lastIdx + 1 !== i) {\n        definedPointsList.slice(lastIdx, i);\n      }\n      lastIdx = i;\n    }\n  }\n  definedPointsList.length === 0;\n  definedPointsList.push(points);\n  definedPointsList.forEach((points, i) => {\n    const startP = lastSeg && i === 0 ? lastSeg.points[lastSeg.points.length - 1] : points[0];\n    path.moveTo(startP.x + offsetX, startP.y + offsetY);\n    // 绘制上层\n    points.forEach(p => {\n      if (p.defined === false) {\n        path.moveTo(p.x + offsetX, p.y + offsetY);\n        return;\n      }\n      path.lineTo(p.x + offsetX, p.y + offsetY);\n    });\n    // 绘制下层\n    for (let i = points.length - 1; i >= 0; i--) {\n      const p = points[i];\n      path.lineTo(p.x1 ?? p.x, p.y1 ?? p.y);\n    }\n    path.lineTo(startP.x1 ?? startP.x, startP.y1 ?? startP.y);\n    path.closePath();\n  });\n}\n"]}
+{"version":3,"sources":["../src/common/render-curve.ts"],"names":[],"mappings":"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","file":"render-curve.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { min } from '@visactor/vutils';\nimport type {\n  IAreaSegment,\n  IClipRangeByDimensionType,\n  ICurve,\n  IDirection,\n  IPath2D,\n  ISegment,\n  ISegPath2D\n} from '../interface';\nimport { Direction } from './enums';\nimport { drawSegItem } from './render-utils';\n\nfunction drawEachCurve(\n  path: IPath2D,\n  curve: ICurve<IPoint>,\n  lastCurve: ICurve<IPoint>,\n  defined0: boolean,\n  offsetX: number,\n  offsetY: number,\n  offsetZ: number\n) {\n  let p0 = curve.p0;\n  let newDefined0 = defined0;\n\n  if (lastCurve && lastCurve.originP1 === lastCurve.originP2) {\n    p0 = lastCurve.p0;\n  }\n  if (curve.defined) {\n    // 非法变合法需要lineTo，合法变非法需要moveTo，初始非法需要moveTo\n    if (!defined0) {\n      path.lineTo(p0.x + offsetX, p0.y + offsetY, offsetZ);\n      newDefined0 = !defined0;\n    }\n  } else {\n    // 找到合法的点\n    const { originP1, originP2 } = curve;\n    let validP: IPointLike;\n    // 只能第一个curve才可以用p0作为合法点，后面的curve都不应该算p1，因为已经算在前面了\n    // lastCurve只在第一个curve不存在\n    if (originP1 && originP1.defined !== false && !lastCurve) {\n      validP = p0;\n    } else if (originP1 && originP2.defined !== false) {\n      validP = curve.p3 ?? curve.p1;\n    }\n    // 合法/（初始）变非法，moveTo\n    if (defined0) {\n      newDefined0 = !defined0;\n      const x = validP ? validP.x : curve.p0.x;\n      const y = validP ? validP.y : curve.p0.y;\n      path.moveTo(x + offsetX, y + offsetY, offsetZ);\n    } else {\n      // 非法变非法/合法，看情况要不要lineTo\n      if (validP) {\n        // 非法变合法，需要lineTo\n        newDefined0 = !defined0;\n        path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ);\n      }\n    }\n  }\n\n  return newDefined0;\n}\n\n/**\n * 绘制连续的线段\n * 绘制长度为总长度percent的path，drawDirection为绘制的方向，也就是percent的方向\n * @param path\n * @param segPath\n * @param percent\n * @param drawDirection 绘制的方向，用于使用percent绘制\n * @param line 用于获取line相关属性\n */\nexport function drawSegments(\n  path: IPath2D,\n  segPath: ISegPath2D,\n  percent: number,\n  clipRangeByDimension: IClipRangeByDimensionType,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n    drawConnect?: boolean; // 是否是绘制connect区域的效果\n    mode?: 'none' | 'connect' | 'zero';\n    zeroX?: number;\n    zeroY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0, offsetZ = 0, mode = 'none', drawConnect = false } = params || {};\n  // none的connect不需要draw\n  if (drawConnect && mode === 'none') {\n    return;\n  }\n  if (!segPath) {\n    return;\n  }\n  let needMoveTo: boolean = true;\n  const { curves } = segPath;\n  if (percent >= 1) {\n    if (drawConnect) {\n      // return;\n      let defined0 = true;\n      let lastCurve: ICurve<IPoint>;\n      curves.forEach((curve, i) => {\n        // step的逻辑\n        if (curve.originP1 === curve.originP2) {\n          lastCurve = curve;\n          return;\n        }\n        defined0 = drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offsetZ);\n\n        lastCurve = curve;\n      });\n    } else {\n      curves.forEach(curve => {\n        // 跳过这个点\n        if (!curve.defined) {\n          needMoveTo = true;\n          return;\n        }\n        if (needMoveTo) {\n          path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n        }\n        drawSegItem(path, curve, 1, params);\n        needMoveTo = false;\n      });\n    }\n\n    return;\n  }\n  if (percent <= 0) {\n    return;\n  }\n\n  let direction: IDirection | undefined;\n\n  if (clipRangeByDimension === 'x') {\n    direction = Direction.ROW;\n  } else if (clipRangeByDimension === 'y') {\n    direction = Direction.COLUMN;\n  } else if (clipRangeByDimension === 'auto') {\n    direction = segPath.direction;\n  }\n\n  // 整个线段的总长度\n  const totalLength = segPath.tryUpdateLength(direction);\n  // 总需要绘制的长度\n  const totalDrawLength = percent * totalLength;\n  // 直到上次绘制的长度\n  let drawedLengthUntilLast = 0;\n  let defined0 = true;\n  let lastCurve: ICurve<IPoint> = null;\n  for (let i = 0, n = curves.length; i < n; i++) {\n    const curve = curves[i];\n    const curCurveLength = curve.getLength(direction);\n    const _p = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;\n    drawedLengthUntilLast += curCurveLength;\n    if (_p < 0) {\n      break;\n    }\n\n    if (drawConnect) {\n      // step的逻辑\n      if (curve.originP1 === curve.originP2) {\n        lastCurve = curve;\n        continue;\n      }\n      defined0 = drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offsetZ);\n\n      lastCurve = curve;\n    } else {\n      // 跳过这个点\n      if (!curve.defined) {\n        needMoveTo = true;\n        continue;\n      }\n      if (needMoveTo) {\n        path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n      }\n      drawSegItem(path, curve, min(_p, 1), params);\n      needMoveTo = false;\n    }\n  }\n}\n\nexport function drawIncrementalSegments(\n  path: IPath2D,\n  lastSeg: ISegment,\n  segments: ISegment,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0 } = params || {};\n  const startP = lastSeg ? lastSeg.points[lastSeg.points.length - 1] : segments.points[0];\n  path.moveTo(startP.x + offsetX, startP.y + offsetY);\n  segments.points.forEach(p => {\n    if (p.defined === false) {\n      path.moveTo(p.x + offsetX, p.y + offsetY);\n      return;\n    }\n    path.lineTo(p.x + offsetX, p.y + offsetY);\n  });\n}\n\nexport function drawIncrementalAreaSegments(\n  path: IPath2D,\n  lastSeg: IAreaSegment,\n  segments: IAreaSegment,\n  params?: {\n    offsetX?: number;\n    offsetY?: number;\n  }\n) {\n  const { offsetX = 0, offsetY = 0 } = params || {};\n  const { points } = segments;\n  // 分段\n  const definedPointsList: IPointLike[][] = [];\n  let lastIdx = 0;\n  for (let i = 0; i < points.length; i++) {\n    if (points[i].defined === false) {\n      if (lastIdx + 1 !== i) {\n        definedPointsList.slice(lastIdx, i);\n      }\n      lastIdx = i;\n    }\n  }\n  definedPointsList.length === 0;\n  definedPointsList.push(points);\n  definedPointsList.forEach((points, i) => {\n    const startP = lastSeg && i === 0 ? lastSeg.points[lastSeg.points.length - 1] : points[0];\n    path.moveTo(startP.x + offsetX, startP.y + offsetY);\n    // 绘制上层\n    points.forEach(p => {\n      if (p.defined === false) {\n        path.moveTo(p.x + offsetX, p.y + offsetY);\n        return;\n      }\n      path.lineTo(p.x + offsetX, p.y + offsetY);\n    });\n    // 绘制下层\n    for (let i = points.length - 1; i >= 0; i--) {\n      const p = points[i];\n      path.lineTo(p.x1 ?? p.x, p.y1 ?? p.y);\n    }\n    path.lineTo(startP.x1 ?? startP.x, startP.y1 ?? startP.y);\n    path.closePath();\n  });\n}\n"]}

package/cjs/common/segment/curve/arc.d.ts

@@ -1,4 +1,4 @@
-import type { IDirection, IArcCurve } from '../../../interface';
+import type { IDirection, IArcCurve, IPath2D } from '../../../interface';
 import { Curve } from './base';
 import type { IPoint, IPointLike } from '@visactor/vutils';
 export declare class ArcCurve extends Curve implements IArcCurve {
@@ -11,4 +11,7 @@ export declare class ArcCurve extends Curve implements IArcCurve {
     protected calcLength(): number;
     protected calcProjLength(direction: IDirection): number;
     getAngleAt(t: number): number;
+    draw(path: IPath2D, percent: number): void;
+    getYAt(x: number): number;
+    includeX(x: number): boolean;
 }

package/cjs/common/segment/curve/arc.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ArcCurve = void 0;
 
-const enums_1 = require("src/common/enums"), base_1 = require("./base");
+const enums_1 = require("../../enums"), base_1 = require("./base");
 
 class ArcCurve extends base_1.Curve {
     constructor(p0, p1, radius) {
@@ -23,6 +23,15 @@ class ArcCurve extends base_1.Curve {
     getAngleAt(t) {
         throw new Error("ArcCurve暂不支持getAngleAt");
     }
+    draw(path, percent) {
+        throw new Error("暂不支持");
+    }
+    getYAt(x) {
+        throw new Error("ArcCurve暂不支持getYAt");
+    }
+    includeX(x) {
+        throw new Error("ArcCurve暂不支持includeX");
+    }
 }
 
 exports.ArcCurve = ArcCurve;

package/cjs/common/segment/curve/arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/curve/arc.ts"],"names":[],"mappings":";;;AAAA,4CAAiD;AAEjD,iCAA+B;AAG/B,MAAa,QAAS,SAAQ,YAAK;IAKjC,YAAY,EAAU,EAAE,EAAU,EAAE,MAAc;QAChD,KAAK,EAAE,CAAC;QALV,SAAI,GAAW,qBAAa,CAAC,QAAQ,CAAC;QAMpC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACS,UAAU;QAClB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACS,cAAc,CAAC,SAAqB;QAC5C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;CACF;AAvBD,4BAuBC","file":"arc.js","sourcesContent":["import { CurveTypeEnum } from 'src/common/enums';\nimport type { IDirection, IArcCurve } from '../../../interface';\nimport { Curve } from './base';\nimport type { IPoint, IPointLike } from '@visactor/vutils';\n\nexport class ArcCurve extends Curve implements IArcCurve {\n  type: number = CurveTypeEnum.ArcCurve;\n  declare readonly p0: IPoint;\n  declare readonly p1: IPoint;\n  declare radius: number;\n  constructor(p0: IPoint, p1: IPoint, radius: number) {\n    super();\n    this.p0 = p0;\n    this.p1 = p1;\n    this.radius = radius;\n  }\n  getPointAt(t: number): IPointLike {\n    throw new Error('ArcCurve暂不支持getPointAt');\n  }\n  protected calcLength(): number {\n    throw new Error('ArcCurve暂不支持updateLength');\n  }\n  protected calcProjLength(direction: IDirection): number {\n    throw new Error('QuadraticBezierCurve暂不支持updateLength');\n  }\n  getAngleAt(t: number): number {\n    throw new Error('ArcCurve暂不支持getAngleAt');\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/segment/curve/arc.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAC5C,iCAA+B;AAG/B,MAAa,QAAS,SAAQ,YAAK;IAKjC,YAAY,EAAU,EAAE,EAAU,EAAE,MAAc;QAChD,KAAK,EAAE,CAAC;QALV,SAAI,GAAW,qBAAa,CAAC,QAAQ,CAAC;QAMpC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACS,UAAU;QAClB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACS,cAAc,CAAC,SAAqB;QAC5C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,IAAa,EAAE,OAAe;QACjC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,CAAC,CAAS;QACd,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,QAAQ,CAAC,CAAS;QAChB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;CACF;AAjCD,4BAiCC","file":"arc.js","sourcesContent":["import type { IDirection, IArcCurve, IPath2D } from '../../../interface';\nimport { CurveTypeEnum } from '../../enums';\nimport { Curve } from './base';\nimport type { IPoint, IPointLike } from '@visactor/vutils';\n\nexport class ArcCurve extends Curve implements IArcCurve {\n  type: number = CurveTypeEnum.ArcCurve;\n  declare readonly p0: IPoint;\n  declare readonly p1: IPoint;\n  declare radius: number;\n  constructor(p0: IPoint, p1: IPoint, radius: number) {\n    super();\n    this.p0 = p0;\n    this.p1 = p1;\n    this.radius = radius;\n  }\n  getPointAt(t: number): IPointLike {\n    throw new Error('ArcCurve暂不支持getPointAt');\n  }\n  protected calcLength(): number {\n    throw new Error('ArcCurve暂不支持updateLength');\n  }\n  protected calcProjLength(direction: IDirection): number {\n    throw new Error('QuadraticBezierCurve暂不支持updateLength');\n  }\n  getAngleAt(t: number): number {\n    throw new Error('ArcCurve暂不支持getAngleAt');\n  }\n\n  draw(path: IPath2D, percent: number) {\n    throw new Error('暂不支持');\n  }\n  getYAt(x: number): number {\n    throw new Error('ArcCurve暂不支持getYAt');\n  }\n  includeX(x: number): boolean {\n    throw new Error('ArcCurve暂不支持includeX');\n  }\n}\n"]}

package/cjs/common/segment/curve/base.d.ts

@@ -1,5 +1,5 @@
 import type { IPoint, IPointLike } from '@visactor/vutils';
-import type { IDirection, ICurve } from '../../../interface';
+import type { IDirection, ICurve, IPath2D } from '../../../interface';
 export declare abstract class Curve implements ICurve<IPoint> {
     type: number;
     readonly p0: IPoint;
@@ -7,7 +7,10 @@ export declare abstract class Curve implements ICurve<IPoint> {
     protected length: number;
     abstract getPointAt(t: number): IPointLike;
     abstract getAngleAt(t: number): number;
+    abstract getYAt(x: number): number;
+    abstract includeX(x: number): boolean;
     getLength(direction?: IDirection): number;
     protected abstract calcLength(): number;
     protected abstract calcProjLength(direction: IDirection): number;
+    abstract draw(path: IPath2D, x: number, y: number, sx: number, sy: number, percent: number): void;
 }

package/cjs/common/segment/curve/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/curve/base.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IAQzB,SAAS,CAAC,SAAsB;QAC9B,IAAI,SAAS,IAAI,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SACvC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC,MAAM,CAAC;SACpB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAGF;AApBD,sBAoBC","file":"base.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport type { IDirection, ICurve } from '../../../interface';\n\nexport abstract class Curve implements ICurve<IPoint> {\n  type: number;\n  readonly p0: IPoint;\n  defined: boolean;\n\n  protected length: number;\n  abstract getPointAt(t: number): IPointLike;\n  abstract getAngleAt(t: number): number;\n  getLength(direction?: IDirection): number {\n    if (direction != null) {\n      return this.calcProjLength(direction);\n    }\n    if (Number.isFinite(this.length)) {\n      return this.length;\n    }\n    this.length = this.calcLength();\n    return this.length;\n  }\n  protected abstract calcLength(): number;\n  protected abstract calcProjLength(direction: IDirection): number;\n}\n"]}
+{"version":3,"sources":["../src/common/segment/curve/base.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IAUzB,SAAS,CAAC,SAAsB;QAC9B,IAAI,SAAS,IAAI,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SACvC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC,MAAM,CAAC;SACpB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAIF;AAvBD,sBAuBC","file":"base.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport type { IDirection, ICurve, IPath2D } from '../../../interface';\n\nexport abstract class Curve implements ICurve<IPoint> {\n  type: number;\n  readonly p0: IPoint;\n  defined: boolean;\n\n  protected length: number;\n  abstract getPointAt(t: number): IPointLike;\n  abstract getAngleAt(t: number): number;\n  abstract getYAt(x: number): number;\n  abstract includeX(x: number): boolean;\n  getLength(direction?: IDirection): number {\n    if (direction != null) {\n      return this.calcProjLength(direction);\n    }\n    if (Number.isFinite(this.length)) {\n      return this.length;\n    }\n    this.length = this.calcLength();\n    return this.length;\n  }\n  protected abstract calcLength(): number;\n  protected abstract calcProjLength(direction: IDirection): number;\n  abstract draw(path: IPath2D, x: number, y: number, sx: number, sy: number, percent: number): void;\n}\n"]}

package/cjs/common/segment/curve/cubic-bezier.d.ts

@@ -1,7 +1,8 @@
 import type { IPoint, IPointLike } from '@visactor/vutils';
-import type { ICubicBezierCurve, IDirection } from '../../../interface';
+import type { ICubicBezierCurve, IDirection, IPath2D, IQuadraticBezierCurve } from '../../../interface';
 import { Curve } from './base';
 export declare function divideCubic(curve: ICubicBezierCurve, t: number): ICubicBezierCurve[];
+export declare function divideQuad(curve: IQuadraticBezierCurve, t: number): IQuadraticBezierCurve[];
 export declare class CubicBezierCurve extends Curve implements ICubicBezierCurve {
     type: number;
     originP1?: IPointLike;
@@ -16,4 +17,7 @@ export declare class CubicBezierCurve extends Curve implements ICubicBezierCurve
     protected calcLength(): number;
     protected calcProjLength(direction: IDirection): number;
     getAngleAt(t: number): number;
+    draw(path: IPath2D, x: number, y: number, sx: number, sy: number, percent: number): void;
+    includeX(x: number): boolean;
+    getYAt(x: number): number;
 }

package/cjs/common/segment/curve/cubic-bezier.js

@@ -2,16 +2,21 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.CubicBezierCurve = exports.divideCubic = void 0;
+}), exports.CubicBezierCurve = exports.divideQuad = exports.divideCubic = void 0;
 
-const vutils_1 = require("@visactor/vutils"), base_1 = require("./base"), enums_1 = require("../../enums"), bezier_utils_1 = require("../../bezier-utils");
+const vutils_1 = require("@visactor/vutils"), base_1 = require("./base"), enums_1 = require("../../enums"), bezier_utils_1 = require("../../bezier-utils"), quadratic_bezier_1 = require("./quadratic-bezier");
 
 function divideCubic(curve, t) {
     const {p0: p0, p1: p1, p2: p2, p3: p3} = curve, pt = (0, bezier_utils_1.cubicPointAt)(p0, p1, p2, p3, t), c1 = vutils_1.PointService.pointAtPP(p0, p1, t), c2 = vutils_1.PointService.pointAtPP(p1, p2, t), c3 = vutils_1.PointService.pointAtPP(p2, p3, t), c12 = vutils_1.PointService.pointAtPP(c1, c2, t), c23 = vutils_1.PointService.pointAtPP(c2, c3, t);
     return [ new CubicBezierCurve(p0, c1, c12, pt), new CubicBezierCurve(pt, c23, c3, p3) ];
 }
 
-exports.divideCubic = divideCubic;
+function divideQuad(curve, t) {
+    const {p0: p0, p1: p1, p2: p2} = curve, pt = (0, bezier_utils_1.quadPointAt)(p0, p1, p2, t), c1 = vutils_1.PointService.pointAtPP(p0, p1, t), c2 = vutils_1.PointService.pointAtPP(p1, p2, t);
+    return [ new quadratic_bezier_1.QuadraticBezierCurve(p0, c1, pt), new quadratic_bezier_1.QuadraticBezierCurve(pt, c2, p2) ];
+}
+
+exports.divideCubic = divideCubic, exports.divideQuad = divideQuad;
 
 class CubicBezierCurve extends base_1.Curve {
     constructor(p0, p1, p2, p3) {
@@ -36,6 +41,22 @@ class CubicBezierCurve extends base_1.Curve {
         const minT = (0, vutils_1.max)(t - .01, 0), maxT = (0, vutils_1.min)(t + .01, 1), minP = this.getPointAt(minT), maxP = this.getPointAt(maxT);
         return (0, vutils_1.atan2)(maxP.y - minP.y, maxP.x - minP.x);
     }
+    draw(path, x, y, sx, sy, percent) {
+        if (path.moveTo(this.p0.x * sx + x, this.p0.y * sy + y), percent >= 1) path.bezierCurveTo(this.p1.x * sx + x, this.p1.y * sy + y, this.p2.x * sx + x, this.p2.y * sy + y, this.p3.x * sx + x, this.p3.y * sy + y); else if (percent > 0) {
+            const [curve1] = divideCubic(this, percent);
+            path.bezierCurveTo(curve1.p1.x * sx + x, curve1.p1.y * sy + y, curve1.p2.x * sx + x, curve1.p2.y * sy + y, curve1.p3.x * sx + x, curve1.p3.y * sy + y);
+        }
+    }
+    includeX(x) {
+        const minX = (0, vutils_1.min)(this.p0.x, this.p1.x, this.p2.x, this.p3.x), maxX = (0, 
+        vutils_1.max)(this.p0.x, this.p1.x, this.p2.x, this.p3.x);
+        return x >= minX && x <= maxX;
+    }
+    getYAt(x) {
+        const minX = (0, vutils_1.min)(this.p0.x, this.p1.x, this.p2.x, this.p3.x), t = (x - minX) / ((0, 
+        vutils_1.max)(this.p0.x, this.p1.x, this.p2.x, this.p3.x) - minX);
+        return this.getPointAt(t).y;
+    }
 }
 
 exports.CubicBezierCurve = CubicBezierCurve;

package/cjs/common/segment/curve/cubic-bezier.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/curve/cubic-bezier.ts"],"names":[],"mappings":"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","file":"cubic-bezier.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { abs, atan2, max, min, PointService } from '@visactor/vutils';\nimport type { ICubicBezierCurve, IDirection } from '../../../interface';\nimport { Curve } from './base';\nimport { CurveTypeEnum, Direction } from '../../enums';\nimport { cubicLength, cubicPointAt } from '../../bezier-utils';\n\n/**\n * 对三次贝塞尔曲线进行分割\n * @param p0 起点\n * @param p1 控制点1\n * @param p2 控制点2\n * @param p3 终点\n * @param t\n */\nexport function divideCubic(curve: ICubicBezierCurve, t: number): ICubicBezierCurve[] {\n  const { p0, p1, p2, p3 } = curve;\n\n  // 划分点\n  const pt = cubicPointAt(p0, p1, p2, p3, t);\n  //  const xt = pt.x;\n  //  const yt = pt.y;\n\n  // 计算两点之间的差值点\n  const c1 = PointService.pointAtPP(p0, p1, t);\n  const c2 = PointService.pointAtPP(p1, p2, t);\n  const c3 = PointService.pointAtPP(p2, p3, t);\n  const c12 = PointService.pointAtPP(c1, c2, t);\n  const c23 = PointService.pointAtPP(c2, c3, t);\n  // const direction = p1.x1 ? p1.y > p0.y ? 0 : 1 : p1.x > p0.x ? 0 : 1;\n\n  const curve1 = new CubicBezierCurve(p0, c1, c12, pt);\n  const curve2 = new CubicBezierCurve(pt, c23, c3, p3);\n\n  return [curve1, curve2];\n}\n\nexport class CubicBezierCurve extends Curve implements ICubicBezierCurve {\n  type: number = CurveTypeEnum.CubicBezierCurve;\n  declare originP1?: IPointLike;\n  declare originP2?: IPointLike;\n  declare readonly p0: IPoint;\n  declare readonly p1: IPoint;\n  declare readonly p2: IPoint;\n  declare readonly p3: IPoint;\n  constructor(p0: IPoint, p1: IPoint, p2: IPoint, p3: IPoint) {\n    super();\n    this.p0 = p0;\n    this.p1 = p1;\n    this.p2 = p2;\n    this.p3 = p3;\n  }\n\n  protected _validPoint(): boolean {\n    return Number.isFinite(\n      this.p0.x + this.p0.y + this.p1.x + this.p1.y + this.p2.x + this.p2.y + this.p3.x + this.p3.y\n    );\n  }\n  getPointAt(t: number): IPointLike {\n    if (this.defined !== false) {\n      return cubicPointAt(this.p0, this.p1, this.p2, this.p3, t);\n    }\n    throw new Error('defined为false的点不能getPointAt');\n  }\n  protected calcLength(): number {\n    // throw new Error('CubicBezierCurve暂不支持updateLength');\n    if (this._validPoint()) {\n      return cubicLength(this.p0, this.p1, this.p2, this.p3, 0);\n    }\n    // return distance(this.p0.x || 0, this.p0.y || 0, this.p3.x || 0, this.p3.y || 0);\n    // 默认长度不好给\n    return 60;\n  }\n\n  protected calcProjLength(direction: IDirection): number {\n    if (direction === Direction.ROW) {\n      return abs(this.p0.x - this.p3.x);\n    } else if (direction === Direction.COLUMN) {\n      return abs(this.p0.y - this.p3.y);\n    }\n    return 0;\n  }\n  getAngleAt(t: number): number {\n    const minT = max(t - 0.01, 0);\n    const maxT = min(t + 0.01, 1);\n    const minP = this.getPointAt(minT);\n    const maxP = this.getPointAt(maxT);\n    return atan2(maxP.y - minP.y, maxP.x - minP.x);\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/segment/curve/cubic-bezier.ts"],"names":[],"mappings":"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","file":"cubic-bezier.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { abs, atan2, max, min, PointService } from '@visactor/vutils';\nimport type { ICubicBezierCurve, IDirection, IPath2D, IQuadraticBezierCurve } from '../../../interface';\nimport { Curve } from './base';\nimport { CurveTypeEnum, Direction } from '../../enums';\nimport { cubicLength, cubicPointAt, quadPointAt } from '../../bezier-utils';\nimport { QuadraticBezierCurve } from './quadratic-bezier';\n\n/**\n * 对三次贝塞尔曲线进行分割\n * @param p0 起点\n * @param p1 控制点1\n * @param p2 控制点2\n * @param p3 终点\n * @param t\n */\nexport function divideCubic(curve: ICubicBezierCurve, t: number): ICubicBezierCurve[] {\n  const { p0, p1, p2, p3 } = curve;\n\n  // 划分点\n  const pt = cubicPointAt(p0, p1, p2, p3, t);\n  //  const xt = pt.x;\n  //  const yt = pt.y;\n\n  // 计算两点之间的差值点\n  const c1 = PointService.pointAtPP(p0, p1, t);\n  const c2 = PointService.pointAtPP(p1, p2, t);\n  const c3 = PointService.pointAtPP(p2, p3, t);\n  const c12 = PointService.pointAtPP(c1, c2, t);\n  const c23 = PointService.pointAtPP(c2, c3, t);\n  // const direction = p1.x1 ? p1.y > p0.y ? 0 : 1 : p1.x > p0.x ? 0 : 1;\n\n  const curve1 = new CubicBezierCurve(p0, c1, c12, pt);\n  const curve2 = new CubicBezierCurve(pt, c23, c3, p3);\n\n  return [curve1, curve2];\n}\n/**\n * 对三次贝塞尔曲线进行分割\n * @param p0 起点\n * @param p1 控制点1\n * @param p2 控制点2\n * @param p3 终点\n * @param t\n */\nexport function divideQuad(curve: IQuadraticBezierCurve, t: number): IQuadraticBezierCurve[] {\n  const { p0, p1, p2 } = curve;\n\n  // 划分点\n  const pt = quadPointAt(p0, p1, p2, t);\n  //  const xt = pt.x;\n  //  const yt = pt.y;\n\n  // 计算两点之间的差值点\n  const c1 = PointService.pointAtPP(p0, p1, t);\n  const c2 = PointService.pointAtPP(p1, p2, t);\n  // const c3 = PointService.pointAtPP(p2, p3, t);\n  // const c12 = PointService.pointAtPP(c1, c2, t);\n  // const c23 = PointService.pointAtPP(c2, c3, t);\n  // const direction = p1.x1 ? p1.y > p0.y ? 0 : 1 : p1.x > p0.x ? 0 : 1;\n\n  const curve1 = new QuadraticBezierCurve(p0, c1, pt);\n  const curve2 = new QuadraticBezierCurve(pt, c2, p2);\n\n  return [curve1, curve2];\n}\n\nexport class CubicBezierCurve extends Curve implements ICubicBezierCurve {\n  type: number = CurveTypeEnum.CubicBezierCurve;\n  declare originP1?: IPointLike;\n  declare originP2?: IPointLike;\n  declare readonly p0: IPoint;\n  declare readonly p1: IPoint;\n  declare readonly p2: IPoint;\n  declare readonly p3: IPoint;\n  constructor(p0: IPoint, p1: IPoint, p2: IPoint, p3: IPoint) {\n    super();\n    this.p0 = p0;\n    this.p1 = p1;\n    this.p2 = p2;\n    this.p3 = p3;\n  }\n\n  protected _validPoint(): boolean {\n    return Number.isFinite(\n      this.p0.x + this.p0.y + this.p1.x + this.p1.y + this.p2.x + this.p2.y + this.p3.x + this.p3.y\n    );\n  }\n  getPointAt(t: number): IPointLike {\n    if (this.defined !== false) {\n      return cubicPointAt(this.p0, this.p1, this.p2, this.p3, t);\n    }\n    throw new Error('defined为false的点不能getPointAt');\n  }\n  protected calcLength(): number {\n    // throw new Error('CubicBezierCurve暂不支持updateLength');\n    if (this._validPoint()) {\n      return cubicLength(this.p0, this.p1, this.p2, this.p3, 0);\n    }\n    // return distance(this.p0.x || 0, this.p0.y || 0, this.p3.x || 0, this.p3.y || 0);\n    // 默认长度不好给\n    return 60;\n  }\n\n  protected calcProjLength(direction: IDirection): number {\n    if (direction === Direction.ROW) {\n      return abs(this.p0.x - this.p3.x);\n    } else if (direction === Direction.COLUMN) {\n      return abs(this.p0.y - this.p3.y);\n    }\n    return 0;\n  }\n  getAngleAt(t: number): number {\n    const minT = max(t - 0.01, 0);\n    const maxT = min(t + 0.01, 1);\n    const minP = this.getPointAt(minT);\n    const maxP = this.getPointAt(maxT);\n    return atan2(maxP.y - minP.y, maxP.x - minP.x);\n  }\n  draw(path: IPath2D, x: number, y: number, sx: number, sy: number, percent: number) {\n    path.moveTo(this.p0.x * sx + x, this.p0.y * sy + y);\n    if (percent >= 1) {\n      path.bezierCurveTo(\n        this.p1.x * sx + x,\n        this.p1.y * sy + y,\n        this.p2.x * sx + x,\n        this.p2.y * sy + y,\n        this.p3.x * sx + x,\n        this.p3.y * sy + y\n      );\n    } else if (percent > 0) {\n      const [curve1] = divideCubic(this, percent);\n      path.bezierCurveTo(\n        curve1.p1.x * sx + x,\n        curve1.p1.y * sy + y,\n        curve1.p2.x * sx + x,\n        curve1.p2.y * sy + y,\n        curve1.p3.x * sx + x,\n        curve1.p3.y * sy + y\n      );\n    }\n  }\n\n  includeX(x: number): boolean {\n    const minX = min(this.p0.x, this.p1.x, this.p2.x, this.p3.x);\n    const maxX = max(this.p0.x, this.p1.x, this.p2.x, this.p3.x);\n    return x >= minX && x <= maxX;\n  }\n\n  getYAt(x: number): number {\n    const minX = min(this.p0.x, this.p1.x, this.p2.x, this.p3.x);\n    const maxX = max(this.p0.x, this.p1.x, this.p2.x, this.p3.x);\n    const t = (x - minX) / (maxX - minX);\n    return this.getPointAt(t).y;\n  }\n}\n"]}

package/cjs/common/segment/curve/curve-context.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CurveContext = void 0;
 
-const vutils_1 = require("@visactor/vutils"), line_1 = require("./line"), cubic_bezier_1 = require("./cubic-bezier");
+const vutils_1 = require("@visactor/vutils"), line_1 = require("./line"), cubic_bezier_1 = require("./cubic-bezier"), quadratic_bezier_1 = require("./quadratic-bezier");
 
 class CurveContext {
     constructor(path) {
@@ -15,17 +15,18 @@ class CurveContext {
     }
     lineTo(x, y) {
         const curve = this.addLinearCurve(x, y);
-        this.path.curves.push(curve), this._lastX = x, this._lastY = y;
+        this.path.addCurve(curve), this._lastX = x, this._lastY = y;
     }
     addLinearCurve(x, y) {
         return new line_1.LineCurve(new vutils_1.Point(this._lastX, this._lastY), new vutils_1.Point(x, y));
     }
     quadraticCurveTo(aCPx, aCPy, aX, aY) {
-        throw new Error("CurveContext不支持调用quadraticCurveTo");
+        const curve = new quadratic_bezier_1.QuadraticBezierCurve(new vutils_1.Point(this._lastX, this._lastY), new vutils_1.Point(aCPx, aCPy), new vutils_1.Point(aX, aY));
+        this.path.addCurve(curve), this._lastX = aX, this._lastY = aY;
     }
     bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) {
         const curve = new cubic_bezier_1.CubicBezierCurve(new vutils_1.Point(this._lastX, this._lastY), new vutils_1.Point(cp1x, cp1y), new vutils_1.Point(cp2x, cp2y), new vutils_1.Point(x, y));
-        this.path.curves.push(curve), this._lastX = x, this._lastY = y;
+        this.path.addCurve(curve), this._lastX = x, this._lastY = y;
     }
     arcTo(aX1, aY1, aX2, aY2, aRadius) {
         throw new Error("CurveContext不支持调用arcTo");

package/cjs/common/segment/curve/curve-context.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/curve/curve-context.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,iCAAmC;AACnC,iDAAkD;AAElD,MAAa,YAAY;IAOvB,YAAY,IAAmB;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,CAAC,CAAS,EAAE,CAAS;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,CAAS,EAAE,CAAS;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IAES,cAAc,CAAC,CAAS,EAAE,CAAS;QAC3C,MAAM,KAAK,GAAG,IAAI,gBAAS,CAAC,IAAI,cAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,cAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,gBAAgB,CAAC,IAAY,EAAE,IAAY,EAAE,EAAU,EAAE,EAAU;QACjE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACxF,MAAM,KAAK,GAAsB,IAAI,+BAAgB,CACnD,IAAI,cAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EACnC,IAAI,cAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EACrB,IAAI,cAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EACrB,IAAI,cAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAChB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,GAAW,EAAE,GAAW,EAAE,GAAW,EAAE,GAAW,EAAE,OAAe;QACvE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,CACL,EAAU,EACV,EAAU,EACV,OAAe,EACf,OAAe,EACf,SAAiB,EACjB,WAAmB,EACnB,SAAiB,EACjB,UAAmB;QAEnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;QAC7C,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IACD,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,MAAc,EAAE,UAAkB,EAAE,QAAgB,EAAE,gBAA0B;QACxG,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,SAAS;QACP,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF;AApED,oCAoEC","file":"curve-context.js","sourcesContent":["import type { IPath2D, ICustomPath2D, ILineCurve, ICubicBezierCurve } from '../../../interface';\nimport { Point } from '@visactor/vutils';\nimport { LineCurve } from './line';\nimport { CubicBezierCurve } from './cubic-bezier';\n\nexport class CurveContext implements IPath2D {\n  declare path: ICustomPath2D;\n  private _lastX: number;\n  private _lastY: number;\n  private _startX: number;\n  private _startY: number;\n\n  constructor(path: ICustomPath2D) {\n    this.path = path;\n    this._lastX = this._lastY = this._startX = this._startY = 0;\n  }\n  moveTo(x: number, y: number) {\n    this._lastX = this._startX = x;\n    this._lastY = this._startY = y;\n    return this;\n  }\n  lineTo(x: number, y: number) {\n    const curve = this.addLinearCurve(x, y);\n    this.path.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  // linear\n  protected addLinearCurve(x: number, y: number): ILineCurve {\n    const curve = new LineCurve(new Point(this._lastX, this._lastY), new Point(x, y));\n    return curve;\n  }\n  quadraticCurveTo(aCPx: number, aCPy: number, aX: number, aY: number) {\n    throw new Error('CurveContext不支持调用quadraticCurveTo');\n  }\n  bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void {\n    const curve: ICubicBezierCurve = new CubicBezierCurve(\n      new Point(this._lastX, this._lastY),\n      new Point(cp1x, cp1y),\n      new Point(cp2x, cp2y),\n      new Point(x, y)\n    );\n    this.path.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  arcTo(aX1: number, aY1: number, aX2: number, aY2: number, aRadius: number) {\n    throw new Error('CurveContext不支持调用arcTo');\n  }\n  ellipse(\n    aX: number,\n    aY: number,\n    xRadius: number,\n    yRadius: number,\n    aRotation: number,\n    aStartAngle: number,\n    aEndAngle: number,\n    aClockwise: boolean\n  ) {\n    throw new Error('CurveContext不支持调用ellipse');\n  }\n  rect(x: number, y: number, w: number, h: number) {\n    throw new Error('CurveContext不支持调用rect');\n  }\n  arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean) {\n    throw new Error('CurveContext不支持调用arc');\n  }\n  closePath(): void {\n    if (this.path.curves.length < 2) {\n      return;\n    }\n    this.lineTo(this._startX, this._startY);\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/segment/curve/curve-context.ts"],"names":[],"mappings":"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","file":"curve-context.js","sourcesContent":["import type { IPath2D, ICustomPath2D, ILineCurve, ICubicBezierCurve, IQuadraticBezierCurve } from '../../../interface';\nimport { Point } from '@visactor/vutils';\nimport { LineCurve } from './line';\nimport { CubicBezierCurve } from './cubic-bezier';\nimport { QuadraticBezierCurve } from './quadratic-bezier';\n\nexport class CurveContext implements IPath2D {\n  declare path: ICustomPath2D;\n  private _lastX: number;\n  private _lastY: number;\n  private _startX: number;\n  private _startY: number;\n\n  constructor(path: ICustomPath2D) {\n    this.path = path;\n    this._lastX = this._lastY = this._startX = this._startY = 0;\n  }\n  moveTo(x: number, y: number) {\n    this._lastX = this._startX = x;\n    this._lastY = this._startY = y;\n    return this;\n  }\n  lineTo(x: number, y: number) {\n    const curve = this.addLinearCurve(x, y);\n    this.path.addCurve(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  // linear\n  protected addLinearCurve(x: number, y: number): ILineCurve {\n    const curve = new LineCurve(new Point(this._lastX, this._lastY), new Point(x, y));\n    return curve;\n  }\n  quadraticCurveTo(aCPx: number, aCPy: number, aX: number, aY: number) {\n    const curve: IQuadraticBezierCurve = new QuadraticBezierCurve(\n      new Point(this._lastX, this._lastY),\n      new Point(aCPx, aCPy),\n      new Point(aX, aY)\n    );\n    this.path.addCurve(curve);\n    this._lastX = aX;\n    this._lastY = aY;\n  }\n  bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void {\n    const curve: ICubicBezierCurve = new CubicBezierCurve(\n      new Point(this._lastX, this._lastY),\n      new Point(cp1x, cp1y),\n      new Point(cp2x, cp2y),\n      new Point(x, y)\n    );\n    this.path.addCurve(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  arcTo(aX1: number, aY1: number, aX2: number, aY2: number, aRadius: number) {\n    throw new Error('CurveContext不支持调用arcTo');\n  }\n  ellipse(\n    aX: number,\n    aY: number,\n    xRadius: number,\n    yRadius: number,\n    aRotation: number,\n    aStartAngle: number,\n    aEndAngle: number,\n    aClockwise: boolean\n  ) {\n    throw new Error('CurveContext不支持调用ellipse');\n  }\n  rect(x: number, y: number, w: number, h: number) {\n    throw new Error('CurveContext不支持调用rect');\n  }\n  arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean) {\n    throw new Error('CurveContext不支持调用arc');\n  }\n  closePath(): void {\n    if (this.path.curves.length < 2) {\n      return;\n    }\n    this.lineTo(this._startX, this._startY);\n  }\n}\n"]}

package/cjs/common/segment/curve/ellipse.d.ts

@@ -1,5 +1,5 @@
 import type { IPoint, IPointLike } from '@visactor/vutils';
-import type { IEllipseCurve, IDirection } from '../../../interface';
+import type { IEllipseCurve, IDirection, IPath2D } from '../../../interface';
 import { Curve } from './base';
 export declare class EllipseCurve extends Curve implements IEllipseCurve {
     type: number;
@@ -15,4 +15,7 @@ export declare class EllipseCurve extends Curve implements IEllipseCurve {
     getAngleAt(t: number): number;
     protected calcLength(): number;
     protected calcProjLength(direction: IDirection): number;
+    draw(path: IPath2D, percent: number): void;
+    getYAt(x: number): number;
+    includeX(x: number): boolean;
 }

package/cjs/common/segment/curve/ellipse.js

@@ -24,6 +24,15 @@ class EllipseCurve extends base_1.Curve {
     calcProjLength(direction) {
         throw new Error("QuadraticBezierCurve暂不支持updateLength");
     }
+    draw(path, percent) {
+        throw new Error("暂不支持");
+    }
+    getYAt(x) {
+        throw new Error("QuadraticBezierCurve暂不支持getYAt");
+    }
+    includeX(x) {
+        throw new Error("QuadraticBezierCurve暂不支持includeX");
+    }
 }
 
 exports.EllipseCurve = EllipseCurve;

package/cjs/common/segment/curve/ellipse.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/curve/ellipse.ts"],"names":[],"mappings":";;;AAEA,iCAA+B;AAC/B,uCAA4C;AAE5C,MAAa,YAAa,SAAQ,YAAK;IASrC,YACE,EAAU,EACV,OAAe,EACf,OAAe,EACf,QAAgB,EAChB,UAAkB,EAClB,QAAgB,EAChB,aAAuB;QAEvB,KAAK,EAAE,CAAC;QAjBV,SAAI,GAAW,qBAAa,CAAC,YAAY,CAAC;QAkBxC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACS,UAAU;QAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IACS,cAAc,CAAC,SAAqB;QAC5C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;CACF;AAvCD,oCAuCC","file":"ellipse.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport type { IEllipseCurve, IDirection } from '../../../interface';\nimport { Curve } from './base';\nimport { CurveTypeEnum } from '../../enums';\n\nexport class EllipseCurve extends Curve implements IEllipseCurve {\n  type: number = CurveTypeEnum.EllipseCurve;\n  declare p0: IPoint;\n  declare radiusX: number;\n  declare radiusY: number;\n  declare rotation: number;\n  declare startAngle: number;\n  declare endAngle: number;\n  declare anticlockwise?: boolean;\n  constructor(\n    p0: IPoint,\n    radiusX: number,\n    radiusY: number,\n    rotation: number,\n    startAngle: number,\n    endAngle: number,\n    anticlockwise?: boolean\n  ) {\n    super();\n    this.p0 = p0;\n    this.radiusX = radiusX;\n    this.radiusY = radiusY;\n    this.rotation = rotation;\n    this.startAngle = startAngle;\n    this.endAngle = endAngle;\n    this.anticlockwise = anticlockwise;\n  }\n  getPointAt(t: number): IPointLike {\n    throw new Error('EllipseCurve暂不支持getPointAt');\n  }\n  getAngleAt(t: number): number {\n    throw new Error('ArcCurve暂不支持getAngleAt');\n  }\n  protected calcLength(): number {\n    throw new Error('EllipseCurve暂不支持updateLength');\n  }\n  protected calcProjLength(direction: IDirection): number {\n    throw new Error('QuadraticBezierCurve暂不支持updateLength');\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/segment/curve/ellipse.ts"],"names":[],"mappings":";;;AAEA,iCAA+B;AAC/B,uCAA4C;AAE5C,MAAa,YAAa,SAAQ,YAAK;IASrC,YACE,EAAU,EACV,OAAe,EACf,OAAe,EACf,QAAgB,EAChB,UAAkB,EAClB,QAAgB,EAChB,aAAuB;QAEvB,KAAK,EAAE,CAAC;QAjBV,SAAI,GAAW,qBAAa,CAAC,YAAY,CAAC;QAkBxC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACS,UAAU;QAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IACS,cAAc,CAAC,SAAqB;QAC5C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,CAAC,IAAa,EAAE,OAAe;QACjC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,CAAC,CAAS;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,QAAQ,CAAC,CAAS;QAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;CACF;AAjDD,oCAiDC","file":"ellipse.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport type { IEllipseCurve, IDirection, IPath2D } from '../../../interface';\nimport { Curve } from './base';\nimport { CurveTypeEnum } from '../../enums';\n\nexport class EllipseCurve extends Curve implements IEllipseCurve {\n  type: number = CurveTypeEnum.EllipseCurve;\n  declare p0: IPoint;\n  declare radiusX: number;\n  declare radiusY: number;\n  declare rotation: number;\n  declare startAngle: number;\n  declare endAngle: number;\n  declare anticlockwise?: boolean;\n  constructor(\n    p0: IPoint,\n    radiusX: number,\n    radiusY: number,\n    rotation: number,\n    startAngle: number,\n    endAngle: number,\n    anticlockwise?: boolean\n  ) {\n    super();\n    this.p0 = p0;\n    this.radiusX = radiusX;\n    this.radiusY = radiusY;\n    this.rotation = rotation;\n    this.startAngle = startAngle;\n    this.endAngle = endAngle;\n    this.anticlockwise = anticlockwise;\n  }\n  getPointAt(t: number): IPointLike {\n    throw new Error('EllipseCurve暂不支持getPointAt');\n  }\n  getAngleAt(t: number): number {\n    throw new Error('ArcCurve暂不支持getAngleAt');\n  }\n  protected calcLength(): number {\n    throw new Error('EllipseCurve暂不支持updateLength');\n  }\n  protected calcProjLength(direction: IDirection): number {\n    throw new Error('QuadraticBezierCurve暂不支持updateLength');\n  }\n\n  draw(path: IPath2D, percent: number) {\n    throw new Error('暂不支持');\n  }\n  getYAt(x: number): number {\n    throw new Error('QuadraticBezierCurve暂不支持getYAt');\n  }\n  includeX(x: number): boolean {\n    throw new Error('QuadraticBezierCurve暂不支持includeX');\n  }\n}\n"]}

package/cjs/common/segment/curve/line.d.ts

@@ -1,5 +1,5 @@
 import type { IPoint, IPointLike } from '@visactor/vutils';
-import type { ILineCurve, IDirection } from '../../../interface';
+import type { ILineCurve, IDirection, IPath2D } from '../../../interface';
 import { Curve } from './base';
 export declare function divideLinear(curve: ILineCurve, t: number): ILineCurve[];
 export declare class LineCurve extends Curve implements ILineCurve {
@@ -15,4 +15,7 @@ export declare class LineCurve extends Curve implements ILineCurve {
     protected _validPoint(): boolean;
     protected calcLength(): number;
     protected calcProjLength(direction: IDirection): number;
+    draw(path: IPath2D, x: number, y: number, sx: number, sy: number, percent: number): void;
+    includeX(x: number): boolean;
+    getYAt(x: number): number;
 }