@visactor/vrender 0.14.0-alpha.3 → 0.14.0-alpha.7

package/cjs/common/render-area.js

@@ -15,13 +15,26 @@ function drawAreaSegments(path, segPath, percent, params) {
         const topList = [], bottomList = [];
         let lastDefined = !0;
         if (drawConnect) {
-            for (let i = 0, n = top.curves.length; i < n; i++) {
-                const topCurve = top.curves[i];
-                lastDefined !== topCurve.defined ? (lastDefined ? (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])) : (drawAreaConnectBlock(path, topList, bottomList, params), 
-                topList.length = 0, bottomList.length = 0), lastDefined = !lastDefined) : lastDefined || (topList.push(topCurve), 
-                bottomList.push(bottom.curves[n - i - 1]));
-            }
-            drawAreaBlock(path, topList, bottomList, params);
+            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];
@@ -42,20 +55,42 @@ 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) {

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';\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  if (percent >= 1) {\n    const topList: ICurve<IPoint>[] = [];\n    const bottomList: ICurve<IPoint>[] = [];\n    let lastDefined: boolean = true;\n    if (drawConnect) {\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            drawAreaConnectBlock(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    } 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  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    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  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 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\n/**\n * 绘制某个segment\n * @param ctx\n * @param seg\n * @param t 绘制这个segment的比例，t > 0从start到end，t < 0从end到start\n */\nfunction drawSegItem(\n  ctx: IPath2D,\n  curve: ICurve<IPoint>,\n  endPercent: number,\n  params?: {\n    startLenPercent?: number;\n    endLenPercent?: number;\n    start?: number;\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  if (!curve.p1) {\n    return;\n  }\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n\n  // 完全绘制\n  if (endPercent === 1) {\n    if (curve.p2 && curve.p3) {\n      ctx.bezierCurveTo(\n        offsetX + curve.p1.x,\n        offsetY + curve.p1.y,\n        offsetX + curve.p2.x,\n        offsetY + curve.p2.y,\n        offsetX + curve.p3.x,\n        offsetY + curve.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      ctx.lineTo(offsetX + curve.p1.x, offsetY + curve.p1.y, offsetZ);\n    }\n  } else {\n    // 绘制一部分\n    if (curve.p2 && curve.p3) {\n      const [curve1] = divideCubic(curve as ICubicBezierCurve, endPercent);\n      ctx.bezierCurveTo(\n        offsetX + curve1.p1.x,\n        offsetY + curve1.p1.y,\n        offsetX + curve1.p2.x,\n        offsetY + curve1.p2.y,\n        offsetX + curve1.p3.x,\n        offsetY + curve1.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      const p = curve.getPointAt(endPercent);\n      ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/common/render-area.ts"],"names":[],"mappings":"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","file":"render-area.js","sourcesContent":["import type { IPoint, IPointLike } 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';\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  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\n/**\n * 绘制某个segment\n * @param ctx\n * @param seg\n * @param t 绘制这个segment的比例，t > 0从start到end，t < 0从end到start\n */\nfunction drawSegItem(\n  ctx: IPath2D,\n  curve: ICurve<IPoint>,\n  endPercent: number,\n  params?: {\n    startLenPercent?: number;\n    endLenPercent?: number;\n    start?: number;\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  if (!curve.p1) {\n    return;\n  }\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n\n  // 完全绘制\n  if (endPercent === 1) {\n    if (curve.p2 && curve.p3) {\n      ctx.bezierCurveTo(\n        offsetX + curve.p1.x,\n        offsetY + curve.p1.y,\n        offsetX + curve.p2.x,\n        offsetY + curve.p2.y,\n        offsetX + curve.p3.x,\n        offsetY + curve.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      ctx.lineTo(offsetX + curve.p1.x, offsetY + curve.p1.y, offsetZ);\n    }\n  } else {\n    // 绘制一部分\n    if (curve.p2 && curve.p3) {\n      const [curve1] = divideCubic(curve as ICubicBezierCurve, endPercent);\n      ctx.bezierCurveTo(\n        offsetX + curve1.p1.x,\n        offsetY + curve1.p1.y,\n        offsetX + curve1.p2.x,\n        offsetY + curve1.p2.y,\n        offsetX + curve1.p3.x,\n        offsetY + curve1.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      const p = curve.getPointAt(endPercent);\n      ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);\n    }\n  }\n}\n"]}

package/cjs/common/render-curve.js

@@ -7,30 +7,68 @@ Object.defineProperty(exports, "__esModule", {
 const vutils_1 = require("@visactor/vutils"), enums_1 = require("./enums"), cubic_bezier_1 = require("./segment/curve/cubic-bezier");
 
 function drawSegments(path, segPath, percent, clipRangeByDimension, params) {
+    var _a;
     const {offsetX: offsetX = 0, offsetY: offsetY = 0, offsetZ: offsetZ = 0, mode: mode = "none", drawConnect: drawConnect = !1, zeroX: zeroX = 0, zeroY: zeroY = 0} = params || {};
     if (drawConnect && "none" === mode) return;
     if (!segPath) return;
-    let needMoveTo = !drawConnect;
+    let needMoveTo = !0;
     const {curves: curves} = segPath;
-    if (percent >= 1) return void (drawConnect ? curves.forEach(((curve, i) => {
-        curve.defined ? (needMoveTo && path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
-        needMoveTo = !1) : (needMoveTo ? "zero" === mode && path.lineTo((isFinite(zeroX) ? zeroX : curve.p0.x) + offsetX, (isFinite(zeroY) ? zeroY : curve.p0.y) + offsetY, offsetZ) : path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
-        needMoveTo = !0);
-    })) : curves.forEach((curve => {
-        curve.defined ? (needMoveTo && path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
-        drawSegItem(path, curve, 1, params), needMoveTo = !1) : needMoveTo = !0;
-    })));
+    if (percent >= 1) {
+        if (drawConnect) {
+            let lastCurve, defined0 = !0;
+            curves.forEach(((curve, i) => {
+                var _a;
+                let p0 = curve.p0;
+                if (curve.originP1 !== curve.originP2) {
+                    if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (p0 = lastCurve.p0), 
+                    curve.defined) defined0 || (path.lineTo(p0.x + offsetX, p0.y + offsetY, offsetZ), 
+                    defined0 = !defined0); else {
+                        const {originP1: originP1, originP2: originP2} = curve;
+                        let validP;
+                        if (originP1 && !1 !== originP1.defined ? validP = p0 : originP1 && !1 !== originP2.defined && (validP = null !== (_a = curve.p3) && void 0 !== _a ? _a : curve.p1), 
+                        defined0) {
+                            defined0 = !defined0;
+                            const x = validP ? validP.x : curve.p0.x, y = validP ? validP.y : curve.p0.y;
+                            path.moveTo(x + offsetX, y + offsetY, offsetZ);
+                        } else validP && (defined0 = !defined0, path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ));
+                    }
+                    lastCurve = curve;
+                } else lastCurve = curve;
+            }));
+        } else curves.forEach((curve => {
+            curve.defined ? (needMoveTo && path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
+            drawSegItem(path, curve, 1, params), needMoveTo = !1) : needMoveTo = !0;
+        }));
+        return;
+    }
     if (percent <= 0) return;
     let direction;
     "x" === clipRangeByDimension ? direction = enums_1.Direction.ROW : "y" === clipRangeByDimension ? direction = enums_1.Direction.COLUMN : "auto" === clipRangeByDimension && (direction = segPath.direction);
     const totalDrawLength = percent * segPath.tryUpdateLength(direction);
-    let drawedLengthUntilLast = 0;
+    let drawedLengthUntilLast = 0, defined0 = !0, lastCurve = null;
     for (let i = 0, n = curves.length; i < n; i++) {
         const curve = curves[i], curCurveLength = curve.getLength(direction), _p = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
         if (drawedLengthUntilLast += curCurveLength, _p < 0) break;
-        if (drawConnect) curve.defined ? (needMoveTo && path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
-        needMoveTo = !1) : (needMoveTo ? "zero" === mode && path.lineTo((isFinite(zeroX) ? zeroX : curve.p0.x) + offsetX, (isFinite(zeroY) ? zeroY : curve.p0.y) + offsetY, offsetZ) : path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), 
-        needMoveTo = !0); else {
+        if (drawConnect) {
+            let p0 = curve.p0;
+            if (curve.originP1 === curve.originP2) {
+                lastCurve = curve;
+                continue;
+            }
+            if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (p0 = lastCurve.p0), 
+            curve.defined) defined0 || (path.lineTo(p0.x + offsetX, p0.y + offsetY, offsetZ), 
+            defined0 = !defined0); else {
+                const {originP1: originP1, originP2: originP2} = curve;
+                let validP;
+                if (originP1 && !1 !== originP1.defined ? validP = p0 : originP1 && !1 !== originP2.defined && (validP = null !== (_a = curve.p3) && void 0 !== _a ? _a : curve.p1), 
+                defined0) {
+                    defined0 = !defined0;
+                    const x = validP ? validP.x : curve.p0.x, y = validP ? validP.y : curve.p0.y;
+                    path.moveTo(x + offsetX, y + offsetY, offsetZ);
+                } else validP && (defined0 = !defined0, path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ));
+            }
+            lastCurve = curve;
+        } else {
             if (!curve.defined) {
                 needMoveTo = !0;
                 continue;

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';\n\nimport type {\n  IAreaSegment,\n  IClipRangeByDimensionType,\n  ICubicBezierCurve,\n  ICurve,\n  IDirection,\n  IPath2D,\n  ISegment,\n  ISegPath2D\n} from '../interface';\nimport { Direction } from './enums';\nimport { divideCubic } from './segment/curve/cubic-bezier';\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 {\n    offsetX = 0,\n    offsetY = 0,\n    offsetZ = 0,\n    mode = 'none',\n    drawConnect = false,\n    zeroX = 0,\n    zeroY = 0\n  } = params || {};\n  // none的connect不需要draw\n  if (drawConnect && mode === 'none') {\n    return;\n  }\n  if (!segPath) {\n    return;\n  }\n  let needMoveTo: boolean = !drawConnect;\n  const { curves } = segPath;\n  if (percent >= 1) {\n    if (drawConnect) {\n      curves.forEach((curve, i) => {\n        if (curve.defined) {\n          // connect段结束，封闭\n          if (needMoveTo) {\n            path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n          } else if (!needMoveTo) {\n            // 持续moveTo\n            // if (curve.p2 && curve.p3) {\n            //   path.moveTo(curve.p3.x + offsetX, curve.p3.y + offsetY, offsetZ);\n            // } else {\n            //   path.moveTo(curve.p1.x + offsetX, curve.p1.y + offsetY, offsetZ);\n            // }\n          }\n          needMoveTo = false;\n        } else {\n          // connect段开始\n          if (!needMoveTo) {\n            path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n          } else {\n            // 如果是zero，那么每一段都要绘制一下（第一段不需要绘制）\n            if (mode === 'zero') {\n              path.lineTo(\n                (isFinite(zeroX) ? zeroX : curve.p0.x) + offsetX,\n                (isFinite(zeroY) ? zeroY : curve.p0.y) + offsetY,\n                offsetZ\n              );\n            }\n          }\n          needMoveTo = true;\n        }\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  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      if (curve.defined) {\n        // connect段结束，封闭\n        if (needMoveTo) {\n          path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n        }\n        needMoveTo = false;\n      } else {\n        // connect段开始\n        if (!needMoveTo) {\n          path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);\n        } else {\n          // 如果是zero，那么每一段都要绘制一下（第一段不需要绘制）\n          if (mode === 'zero') {\n            path.lineTo(\n              (isFinite(zeroX) ? zeroX : curve.p0.x) + offsetX,\n              (isFinite(zeroY) ? zeroY : curve.p0.y) + offsetY,\n              offsetZ\n            );\n          }\n        }\n        needMoveTo = true;\n      }\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\n/**\n * 绘制某个segment\n * @param ctx\n * @param seg\n * @param t 绘制这个segment的比例，t > 0从start到end，t < 0从end到start\n */\nfunction drawSegItem(\n  ctx: IPath2D,\n  curve: ICurve<IPoint>,\n  endPercent: number,\n  params?: {\n    startLenPercent?: number;\n    endLenPercent?: number;\n    start?: number;\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  if (!curve.p1) {\n    return;\n  }\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n\n  // 完全绘制\n  if (endPercent === 1) {\n    if (curve.p2 && curve.p3) {\n      ctx.bezierCurveTo(\n        offsetX + curve.p1.x,\n        offsetY + curve.p1.y,\n        offsetX + curve.p2.x,\n        offsetY + curve.p2.y,\n        offsetX + curve.p3.x,\n        offsetY + curve.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      ctx.lineTo(offsetX + curve.p1.x, offsetY + curve.p1.y, offsetZ);\n    }\n  } else {\n    // 绘制一部分\n    if (curve.p2 && curve.p3) {\n      const [curve1] = divideCubic(curve as ICubicBezierCurve, endPercent);\n      ctx.bezierCurveTo(\n        offsetX + curve1.p1.x,\n        offsetY + curve1.p1.y,\n        offsetX + curve1.p2.x,\n        offsetY + curve1.p2.y,\n        offsetX + curve1.p3.x,\n        offsetY + curve1.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      const p = curve.getPointAt(endPercent);\n      ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/common/render-curve.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAY7C,mCAAoC;AACpC,+DAA2D;AAW3D,SAAgB,YAAY,CAC1B,IAAa,EACb,OAAmB,EACnB,OAAe,EACf,oBAA+C,EAC/C,MAQC;;IAED,MAAM,EACJ,OAAO,GAAG,CAAC,EACX,OAAO,GAAG,CAAC,EACX,OAAO,GAAG,CAAC,EACX,IAAI,GAAG,MAAM,EACb,WAAW,GAAG,KAAK,EACnB,KAAK,GAAG,CAAC,EACT,KAAK,GAAG,CAAC,EACV,GAAG,MAAM,IAAI,EAAE,CAAC;IAEjB,IAAI,WAAW,IAAI,IAAI,KAAK,MAAM,EAAE;QAClC,OAAO;KACR;IACD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO;KACR;IACD,IAAI,UAAU,GAAY,IAAI,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,IAAI,OAAO,IAAI,CAAC,EAAE;QAChB,IAAI,WAAW,EAAE;YAEf,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,SAAyB,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;gBAE1B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;oBACrC,SAAS,GAAG,KAAK,CAAC;oBAClB,OAAO;iBACR;gBACD,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE;oBAC1D,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;iBACnB;gBACD,IAAI,KAAK,CAAC,OAAO,EAAE;oBAEjB,IAAI,CAAC,QAAQ,EAAE;wBACb,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;wBACrD,QAAQ,GAAG,CAAC,QAAQ,CAAC;qBACtB;iBACF;qBAAM;oBAEL,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;oBACrC,IAAI,MAAkB,CAAC;oBACvB,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE;wBAC1C,MAAM,GAAG,EAAE,CAAC;qBACb;yBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE;wBACjD,MAAM,GAAG,MAAA,KAAK,CAAC,EAAE,mCAAI,KAAK,CAAC,EAAE,CAAC;qBAC/B;oBAED,IAAI,QAAQ,EAAE;wBACZ,QAAQ,GAAG,CAAC,QAAQ,CAAC;wBACrB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;wBACzC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;wBACzC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;qBAChD;yBAAM;wBAEL,IAAI,MAAM,EAAE;4BAEV,QAAQ,GAAG,CAAC,QAAQ,CAAC;4BACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;yBAC9D;qBACF;iBACF;gBAED,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAErB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;oBAClB,UAAU,GAAG,IAAI,CAAC;oBAClB,OAAO;iBACR;gBACD,IAAI,UAAU,EAAE;oBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;iBAClE;gBACD,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;gBACpC,UAAU,GAAG,KAAK,CAAC;YACrB,CAAC,CAAC,CAAC;SACJ;QAED,OAAO;KACR;IACD,IAAI,OAAO,IAAI,CAAC,EAAE;QAChB,OAAO;KACR;IAED,IAAI,SAAiC,CAAC;IAEtC,IAAI,oBAAoB,KAAK,GAAG,EAAE;QAChC,SAAS,GAAG,iBAAS,CAAC,GAAG,CAAC;KAC3B;SAAM,IAAI,oBAAoB,KAAK,GAAG,EAAE;QACvC,SAAS,GAAG,iBAAS,CAAC,MAAM,CAAC;KAC9B;SAAM,IAAI,oBAAoB,KAAK,MAAM,EAAE;QAC1C,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;KAC/B;IAGD,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAEvD,MAAM,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;IAE9C,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,IAAI,SAAS,GAAmB,IAAI,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,EAAE,GAAG,CAAC,eAAe,GAAG,qBAAqB,CAAC,GAAG,cAAc,CAAC;QACtE,qBAAqB,IAAI,cAAc,CAAC;QACxC,IAAI,EAAE,GAAG,CAAC,EAAE;YACV,MAAM;SACP;QAED,IAAI,WAAW,EAAE;YAEf,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;gBACrC,SAAS,GAAG,KAAK,CAAC;gBAClB,SAAS;aACV;YACD,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE;gBAC1D,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;aACnB;YACD,IAAI,KAAK,CAAC,OAAO,EAAE;gBAEjB,IAAI,CAAC,QAAQ,EAAE;oBACb,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;oBACrD,QAAQ,GAAG,CAAC,QAAQ,CAAC;iBACtB;aACF;iBAAM;gBAEL,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;gBACrC,IAAI,MAAkB,CAAC;gBACvB,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE;oBAC1C,MAAM,GAAG,EAAE,CAAC;iBACb;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE;oBACjD,MAAM,GAAG,MAAA,KAAK,CAAC,EAAE,mCAAI,KAAK,CAAC,EAAE,CAAC;iBAC/B;gBAED,IAAI,QAAQ,EAAE;oBACZ,QAAQ,GAAG,CAAC,QAAQ,CAAC;oBACrB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBACzC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBACzC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;iBAChD;qBAAM;oBAEL,IAAI,MAAM,EAAE;wBAEV,QAAQ,GAAG,CAAC,QAAQ,CAAC;wBACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;qBAC9D;iBACF;aACF;YAED,SAAS,GAAG,KAAK,CAAC;SACnB;aAAM;YAEL,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBAClB,UAAU,GAAG,IAAI,CAAC;gBAClB,SAAS;aACV;YACD,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;aAClE;YACD,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAA,YAAG,EAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;YAC7C,UAAU,GAAG,KAAK,CAAC;SACpB;KACF;AACH,CAAC;AAxLD,oCAwLC;AAED,SAAgB,uBAAuB,CACrC,IAAa,EACb,OAAiB,EACjB,QAAkB,EAClB,MAGC;IAED,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;IACpD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC1B,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;YAC1C,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,0DAmBC;AAED,SAAgB,2BAA2B,CACzC,IAAa,EACb,OAAqB,EACrB,QAAsB,EACtB,MAGC;IAED,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IAClD,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE5B,MAAM,iBAAiB,GAAmB,EAAE,CAAC;IAC7C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE;YAC/B,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,EAAE;gBACrB,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;aACrC;YACD,OAAO,GAAG,CAAC,CAAC;SACb;KACF;IACD,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;;QACtC,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1F,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;QAEpD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;gBAC1C,OAAO;aACR;YACD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,EAAE,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,MAAM,CAAC,MAAA,MAAM,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,EAAE,MAAA,MAAM,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AA3CD,kEA2CC;AAQD,SAAS,WAAW,CAClB,GAAY,EACZ,KAAqB,EACrB,UAAkB,EAClB,MAOC;IAED,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;QACb,OAAO;KACR;IACD,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IAG/D,IAAI,UAAU,KAAK,CAAC,EAAE;QACpB,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;YACxB,GAAG,CAAC,aAAa,CACf,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EACpB,OAAO,CACR,CAAC;SACH;aAAM;YAEL,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACjE;KACF;SAAM;QAEL,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;YACxB,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,0BAAW,EAAC,KAA0B,EAAE,UAAU,CAAC,CAAC;YACrE,GAAG,CAAC,aAAa,CACf,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,EACrB,OAAO,CACR,CAAC;SACH;aAAM;YAEL,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACvC,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACnD;KACF;AACH,CAAC","file":"render-curve.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { last, min } from '@visactor/vutils';\n\nimport type {\n  IAreaSegment,\n  IClipRangeByDimensionType,\n  ICubicBezierCurve,\n  ICurve,\n  IDirection,\n  IPath2D,\n  ISegment,\n  ISegPath2D\n} from '../interface';\nimport { Direction } from './enums';\nimport { divideCubic } from './segment/curve/cubic-bezier';\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 {\n    offsetX = 0,\n    offsetY = 0,\n    offsetZ = 0,\n    mode = 'none',\n    drawConnect = false,\n    zeroX = 0,\n    zeroY = 0\n  } = 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        let p0 = curve.p0;\n        if (curve.originP1 === curve.originP2) {\n          lastCurve = curve;\n          return;\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            defined0 = !defined0;\n          }\n        } else {\n          // 找到合法的点\n          const { originP1, originP2 } = curve;\n          let validP: IPointLike;\n          if (originP1 && originP1.defined !== false) {\n            validP = p0;\n          } else if (originP1 && originP2.defined !== false) {\n            validP = curve.p3 ?? curve.p1;\n          }\n          // 合法/（初始）变非法，moveTo\n          if (defined0) {\n            defined0 = !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              defined0 = !defined0;\n              path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ);\n            }\n          }\n        }\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      let p0 = curve.p0;\n      if (curve.originP1 === curve.originP2) {\n        lastCurve = curve;\n        continue;\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          defined0 = !defined0;\n        }\n      } else {\n        // 找到合法的点\n        const { originP1, originP2 } = curve;\n        let validP: IPointLike;\n        if (originP1 && originP1.defined !== false) {\n          validP = p0;\n        } else if (originP1 && originP2.defined !== false) {\n          validP = curve.p3 ?? curve.p1;\n        }\n        // 合法/（初始）变非法，moveTo\n        if (defined0) {\n          defined0 = !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            defined0 = !defined0;\n            path.lineTo(validP.x + offsetX, validP.y + offsetY, offsetZ);\n          }\n        }\n      }\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\n/**\n * 绘制某个segment\n * @param ctx\n * @param seg\n * @param t 绘制这个segment的比例，t > 0从start到end，t < 0从end到start\n */\nfunction drawSegItem(\n  ctx: IPath2D,\n  curve: ICurve<IPoint>,\n  endPercent: number,\n  params?: {\n    startLenPercent?: number;\n    endLenPercent?: number;\n    start?: number;\n    offsetX?: number;\n    offsetY?: number;\n    offsetZ?: number;\n  }\n) {\n  if (!curve.p1) {\n    return;\n  }\n  const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};\n\n  // 完全绘制\n  if (endPercent === 1) {\n    if (curve.p2 && curve.p3) {\n      ctx.bezierCurveTo(\n        offsetX + curve.p1.x,\n        offsetY + curve.p1.y,\n        offsetX + curve.p2.x,\n        offsetY + curve.p2.y,\n        offsetX + curve.p3.x,\n        offsetY + curve.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      ctx.lineTo(offsetX + curve.p1.x, offsetY + curve.p1.y, offsetZ);\n    }\n  } else {\n    // 绘制一部分\n    if (curve.p2 && curve.p3) {\n      const [curve1] = divideCubic(curve as ICubicBezierCurve, endPercent);\n      ctx.bezierCurveTo(\n        offsetX + curve1.p1.x,\n        offsetY + curve1.p1.y,\n        offsetX + curve1.p2.x,\n        offsetY + curve1.p2.y,\n        offsetX + curve1.p3.x,\n        offsetY + curve1.p3.y,\n        offsetZ\n      );\n    } else {\n      // linear的线段\n      const p = curve.getPointAt(endPercent);\n      ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);\n    }\n  }\n}\n"]}

package/cjs/common/seg-context.d.ts

@@ -1,10 +1,12 @@
-import { IPoint } from '@visactor/vutils';
+import type { IPoint, IPointLike } from '@visactor/vutils';
 import type { ICurve, ICurveType, IDirection, ILineCurve, ISegPath2D } from '../interface';
 export declare class SegContext implements ISegPath2D {
     private _lastX;
     private _lastY;
     private _startX;
     private _startY;
+    private _lastOriginP?;
+    private _startOriginP?;
     get endX(): number;
     get endY(): number;
     curves: ICurve<IPoint>[];
@@ -13,22 +15,22 @@ export declare class SegContext implements ISegPath2D {
     length: number;
     constructor(curveType: ICurveType, direction: IDirection);
     init(curveType: ICurveType, direction: IDirection): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean, p: IPointLike): void;
     closePath(): void;
     ellipse(): void;
-    lineTo(x: number, y: number, defined: boolean): void;
-    moveTo(x: number, y: number): ISegPath2D;
+    lineTo(x: number, y: number, defined: boolean, p: IPointLike): void;
+    moveTo(x: number, y: number, p: IPointLike): ISegPath2D;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
     clear(): void;
     tryUpdateLength(direction?: IDirection): number;
-    protected addLinearCurve(x: number, y: number, defined: boolean): ILineCurve;
+    protected addLinearCurve(x: number, y: number, defined: boolean, p1: IPointLike, p2: IPointLike): ILineCurve;
     getPointAt(t: number): IPoint;
     getCurveLengths(): number[];
     getLength(direction?: IDirection): number;
 }
 export declare class ReflectSegContext extends SegContext {
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean): void;
-    lineTo(x: number, y: number, defined: boolean): void;
-    moveTo(x: number, y: number): ISegPath2D;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean, p: IPointLike): void;
+    lineTo(x: number, y: number, defined: boolean, p: IPointLike): void;
+    moveTo(x: number, y: number, p: IPointLike): ISegPath2D;
     clear(): void;
 }

package/cjs/common/seg-context.js

@@ -20,24 +20,26 @@ class SegContext {
         this._lastX = this._lastY = this._startX = this._startY = 0, this.curveType = curveType, 
         this.direction = direction, this.curves = [];
     }
-    bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y, defined) {
+    bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y, defined, p) {
         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));
-        curve.defined = defined, this.curves.push(curve), this._lastX = x, this._lastY = y;
+        curve.originP1 = this._lastOriginP, curve.originP2 = p, curve.defined = defined, 
+        this.curves.push(curve), this._lastX = x, this._lastY = y, this._lastOriginP = p;
     }
     closePath() {
         if (this.curves.length < 2) return;
         const lastCurve = this.curves[this.curves.length - 1];
-        this.lineTo(this._startX, this._startY, lastCurve.defined);
+        this.lineTo(this._startX, this._startY, lastCurve.defined, this._startOriginP);
     }
     ellipse() {
         throw new Error("SegContext不支持调用ellipse");
     }
-    lineTo(x, y, defined) {
-        const curve = this.addLinearCurve(x, y, defined);
-        this.curves.push(curve), this._lastX = x, this._lastY = y;
+    lineTo(x, y, defined, p) {
+        const curve = this.addLinearCurve(x, y, defined, this._lastOriginP, p);
+        this.curves.push(curve), this._lastX = x, this._lastY = y, this._lastOriginP = p;
     }
-    moveTo(x, y) {
-        return this._lastX = this._startX = x, this._lastY = this._startY = y, this;
+    moveTo(x, y, p) {
+        return this._lastX = this._startX = x, this._lastY = this._startY = y, this._lastOriginP = p, 
+        this._startOriginP = p, this;
     }
     quadraticCurveTo(cpx, cpy, x, y) {
         throw new Error("SegContext不支持调用quadraticCurveTo");
@@ -48,9 +50,9 @@ class SegContext {
     tryUpdateLength(direction) {
         return this.getLength(direction);
     }
-    addLinearCurve(x, y, defined) {
+    addLinearCurve(x, y, defined, p1, p2) {
         const curve = new line_1.LineCurve(new vutils_1.Point(this._lastX, this._lastY), new vutils_1.Point(x, y));
-        return curve.defined = defined, curve;
+        return curve.originP1 = p1, curve.originP2 = p2, curve.defined = defined, curve;
     }
     getPointAt(t) {
         throw new Error("暂未实现");
@@ -59,15 +61,16 @@ class SegContext {
         return [];
     }
     getLength(direction) {
+        var _a, _b;
         if (direction === enums_1.Direction.COLUMN) {
             if (!this.curves.length) return 0;
-            const sc = this.curves[0], ec = this.curves[this.curves.length - 1];
-            return (0, vutils_1.abs)(sc.p0.y - ec.p1.y);
+            const sc = this.curves[0], ec = this.curves[this.curves.length - 1], endP = null !== (_a = ec.p3) && void 0 !== _a ? _a : ec.p1;
+            return (0, vutils_1.abs)(sc.p0.y - endP.y);
         }
         if (direction === enums_1.Direction.ROW) {
             if (!this.curves.length) return 0;
-            const sc = this.curves[0], ec = this.curves[this.curves.length - 1];
-            return (0, vutils_1.abs)(sc.p0.x - ec.p1.x);
+            const sc = this.curves[0], ec = this.curves[this.curves.length - 1], endP = null !== (_b = ec.p3) && void 0 !== _b ? _b : ec.p1;
+            return (0, vutils_1.abs)(sc.p0.x - endP.x);
         }
         return Number.isFinite(this.length) || (this.length = this.curves.reduce(((l, c) => l + c.getLength()), 0)), 
         this.length;
@@ -77,14 +80,14 @@ class SegContext {
 exports.SegContext = SegContext;
 
 class ReflectSegContext extends SegContext {
-    bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y, defined) {
-        return super.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x, defined);
+    bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y, defined, p) {
+        return super.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x, defined, p);
     }
-    lineTo(x, y, defined) {
-        return super.lineTo(y, x, defined);
+    lineTo(x, y, defined, p) {
+        return super.lineTo(y, x, defined, p);
     }
-    moveTo(x, y) {
-        return super.moveTo(y, x);
+    moveTo(x, y, p) {
+        return super.moveTo(y, x, p);
     }
     clear() {
         return super.clear();

package/cjs/common/seg-context.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/common/seg-context.ts"],"names":[],"mappings":"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","file":"seg-context.js","sourcesContent":["import { abs, IPoint, Point } from '@visactor/vutils';\nimport type { ICubicBezierCurve, ICurve, ICurveType, IDirection, ILineCurve, ISegPath2D } from '../interface';\nimport { Direction } from './enums';\nimport { CubicBezierCurve } from './segment/curve/cubic-bezier';\nimport { LineCurve } from './segment/curve/line';\n\n/**\n * 部分逻辑参考d3-shape：https://github.com/d3/d3-shape/blob/8ec82658454750cfa29efb1e0ea514e3dd9b2297/src/curve/monotone.js\n * Copyright 2010-2022 Mike Bostock\n\n  Permission to use, copy, modify, and/or distribute this software for any purpose\n  with or without fee is hereby granted, provided that the above copyright notice\n  and this permission notice appear in all copies.\n\n  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\n  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS\n  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF\n  THIS SOFTWARE.\n */\n\n/**\n * 缓存segment的context\n */\nexport class SegContext implements ISegPath2D {\n  private _lastX: number;\n  private _lastY: number;\n  private _startX: number;\n  private _startY: number;\n\n  get endX(): number {\n    return this._lastX;\n  }\n  get endY(): number {\n    return this._lastY;\n  }\n\n  curves: ICurve<IPoint>[];\n  direction: IDirection;\n  curveType: ICurveType;\n  length: number;\n\n  constructor(curveType: ICurveType, direction: IDirection) {\n    this.init(curveType, direction);\n  }\n\n  init(curveType: ICurveType, direction: IDirection) {\n    this._lastX = this._lastY = this._startX = this._startY = 0;\n    this.curveType = curveType;\n    this.direction = direction;\n    this.curves = [];\n  }\n  // @ts-ignore\n  bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean): 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    curve.defined = defined;\n    this.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  closePath(): void {\n    if (this.curves.length < 2) {\n      return;\n    }\n    const lastCurve = this.curves[this.curves.length - 1];\n    this.lineTo(this._startX, this._startY, lastCurve.defined);\n  }\n  // @ts-ignore\n  ellipse(): void {\n    throw new Error('SegContext不支持调用ellipse');\n  }\n  lineTo(x: number, y: number, defined: boolean): void {\n    const curve = this.addLinearCurve(x, y, defined);\n    this.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n  }\n  moveTo(x: number, y: number): ISegPath2D {\n    this._lastX = this._startX = x;\n    this._lastY = this._startY = y;\n    return this;\n  }\n  // @ts-ignore\n  quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void {\n    throw new Error('SegContext不支持调用quadraticCurveTo');\n  }\n\n  clear() {\n    this.curves = [];\n    this.length = NaN;\n  }\n\n  tryUpdateLength(direction?: IDirection): number {\n    return this.getLength(direction);\n  }\n\n  // linear\n  protected addLinearCurve(x: number, y: number, defined: boolean): ILineCurve {\n    const curve = new LineCurve(new Point(this._lastX, this._lastY), new Point(x, y));\n    curve.defined = defined;\n    return curve;\n  }\n\n  getPointAt(t: number): IPoint {\n    throw new Error('暂未实现');\n  }\n  getCurveLengths(): number[] {\n    return [];\n  }\n  getLength(direction?: IDirection): number {\n    if (direction === Direction.COLUMN) {\n      if (!this.curves.length) {\n        return 0;\n      }\n      const sc = this.curves[0];\n      const ec = this.curves[this.curves.length - 1];\n      return abs(sc.p0.y - ec.p1.y);\n    } else if (direction === Direction.ROW) {\n      if (!this.curves.length) {\n        return 0;\n      }\n      const sc = this.curves[0];\n      const ec = this.curves[this.curves.length - 1];\n      return abs(sc.p0.x - ec.p1.x);\n    }\n    if (Number.isFinite(this.length)) {\n      return this.length;\n    }\n    this.length = this.curves.reduce((l, c) => l + c.getLength(), 0);\n    return this.length;\n  }\n}\n\n/**\n * 用于monotoneY等类型的segment\n */\nexport class ReflectSegContext extends SegContext {\n  // @ts-ignore\n  bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, defined: boolean): void {\n    return super.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x, defined);\n  }\n  lineTo(x: number, y: number, defined: boolean): void {\n    return super.lineTo(y, x, defined);\n  }\n  moveTo(x: number, y: number): ISegPath2D {\n    return super.moveTo(y, x);\n  }\n  clear() {\n    return super.clear();\n  }\n}\n\n// export class ReflectContextWrap implements IPath {\n//   ctx: IPath;\n//   constructor(path: IPath) {\n//     this.ctx = path;\n//   }\n\n//   // @ts-ignore\n//   arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void {\n//     return this.ctx.arc(y, x, radius, startAngle, endAngle, counterclockwise);\n//   }\n//   // @ts-ignore\n//   arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void {\n//     return this.ctx.arcTo(y1, x1, y2, x2, radius);\n//   }\n//   // @ts-ignore\n//   bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void {\n//     return this.ctx.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x);\n//   }\n//   closePath(): void {\n//     return this.ctx.closePath();\n//   }\n//   // @ts-ignore\n//   ellipse(\n//     x: number,\n//     y: number,\n//     radiusX: number,\n//     radiusY: number,\n//     rotation: number,\n//     startAngle: number,\n//     endAngle: number,\n//     counterclockwise?: boolean\n//   ): void {\n//     return this.ctx.ellipse(y, x, radiusY, radiusX, rotation, startAngle, endAngle, counterclockwise);\n//   }\n//   lineTo(x: number, y: number): void {\n//     return this.ctx.lineTo(y, x);\n//   }\n//   moveTo(x: number, y: number): void {\n//     return this.ctx.moveTo(y, x);\n//   }\n//   // @ts-ignore\n//   quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void {\n//     return this.ctx.quadraticCurveTo(cpy, cpx, y, x);\n//   }\n//   // @ts-ignore\n//   rect(x: number, y: number, w: number, h: number): void {\n//     return this.rect(y, x, w, h);\n//   }\n// }\n"]}
+{"version":3,"sources":["../../src/common/seg-context.ts"],"names":[],"mappings":"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","file":"seg-context.js","sourcesContent":["import type { IPoint, IPointLike } from '@visactor/vutils';\nimport { abs, Point } from '@visactor/vutils';\nimport type { ICubicBezierCurve, ICurve, ICurveType, IDirection, ILineCurve, ISegPath2D } from '../interface';\nimport { Direction } from './enums';\nimport { CubicBezierCurve } from './segment/curve/cubic-bezier';\nimport { LineCurve } from './segment/curve/line';\n\n/**\n * 部分逻辑参考d3-shape：https://github.com/d3/d3-shape/blob/8ec82658454750cfa29efb1e0ea514e3dd9b2297/src/curve/monotone.js\n * Copyright 2010-2022 Mike Bostock\n\n  Permission to use, copy, modify, and/or distribute this software for any purpose\n  with or without fee is hereby granted, provided that the above copyright notice\n  and this permission notice appear in all copies.\n\n  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\n  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS\n  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF\n  THIS SOFTWARE.\n */\n\n/**\n * 缓存segment的context\n */\nexport class SegContext implements ISegPath2D {\n  private _lastX: number;\n  private _lastY: number;\n  private _startX: number;\n  private _startY: number;\n  private _lastOriginP?: IPointLike;\n  private _startOriginP?: IPointLike;\n\n  get endX(): number {\n    return this._lastX;\n  }\n  get endY(): number {\n    return this._lastY;\n  }\n\n  curves: ICurve<IPoint>[];\n  direction: IDirection;\n  curveType: ICurveType;\n  length: number;\n\n  constructor(curveType: ICurveType, direction: IDirection) {\n    this.init(curveType, direction);\n  }\n\n  init(curveType: ICurveType, direction: IDirection) {\n    this._lastX = this._lastY = this._startX = this._startY = 0;\n    this.curveType = curveType;\n    this.direction = direction;\n    this.curves = [];\n  }\n  // @ts-ignore\n  bezierCurveTo(\n    cp1x: number,\n    cp1y: number,\n    cp2x: number,\n    cp2y: number,\n    x: number,\n    y: number,\n    defined: boolean,\n    p: IPointLike\n  ): 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    curve.originP1 = this._lastOriginP;\n    curve.originP2 = p;\n    curve.defined = defined;\n    this.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n    this._lastOriginP = p;\n  }\n  closePath(): void {\n    if (this.curves.length < 2) {\n      return;\n    }\n    const lastCurve = this.curves[this.curves.length - 1];\n    this.lineTo(this._startX, this._startY, lastCurve.defined, this._startOriginP);\n  }\n  // @ts-ignore\n  ellipse(): void {\n    throw new Error('SegContext不支持调用ellipse');\n  }\n  lineTo(x: number, y: number, defined: boolean, p: IPointLike): void {\n    const curve = this.addLinearCurve(x, y, defined, this._lastOriginP, p);\n    this.curves.push(curve);\n    this._lastX = x;\n    this._lastY = y;\n    this._lastOriginP = p;\n  }\n  moveTo(x: number, y: number, p: IPointLike): ISegPath2D {\n    this._lastX = this._startX = x;\n    this._lastY = this._startY = y;\n    this._lastOriginP = p;\n    this._startOriginP = p;\n    return this;\n  }\n  // @ts-ignore\n  quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void {\n    throw new Error('SegContext不支持调用quadraticCurveTo');\n  }\n\n  clear() {\n    this.curves = [];\n    this.length = NaN;\n  }\n\n  tryUpdateLength(direction?: IDirection): number {\n    return this.getLength(direction);\n  }\n\n  // linear\n  protected addLinearCurve(x: number, y: number, defined: boolean, p1: IPointLike, p2: IPointLike): ILineCurve {\n    const curve = new LineCurve(new Point(this._lastX, this._lastY), new Point(x, y));\n    curve.originP1 = p1;\n    curve.originP2 = p2;\n    curve.defined = defined;\n    return curve;\n  }\n\n  getPointAt(t: number): IPoint {\n    throw new Error('暂未实现');\n  }\n  getCurveLengths(): number[] {\n    return [];\n  }\n  getLength(direction?: IDirection): number {\n    if (direction === Direction.COLUMN) {\n      if (!this.curves.length) {\n        return 0;\n      }\n      const sc = this.curves[0];\n      const ec = this.curves[this.curves.length - 1];\n      const endP = ec.p3 ?? ec.p1;\n      return abs(sc.p0.y - endP.y);\n    } else if (direction === Direction.ROW) {\n      if (!this.curves.length) {\n        return 0;\n      }\n      const sc = this.curves[0];\n      const ec = this.curves[this.curves.length - 1];\n      const endP = ec.p3 ?? ec.p1;\n      return abs(sc.p0.x - endP.x);\n    }\n    if (Number.isFinite(this.length)) {\n      return this.length;\n    }\n    this.length = this.curves.reduce((l, c) => l + c.getLength(), 0);\n    return this.length;\n  }\n}\n\n/**\n * 用于monotoneY等类型的segment\n */\nexport class ReflectSegContext extends SegContext {\n  // @ts-ignore\n  bezierCurveTo(\n    cp1x: number,\n    cp1y: number,\n    cp2x: number,\n    cp2y: number,\n    x: number,\n    y: number,\n    defined: boolean,\n    p: IPointLike\n  ): void {\n    return super.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x, defined, p);\n  }\n  lineTo(x: number, y: number, defined: boolean, p: IPointLike): void {\n    return super.lineTo(y, x, defined, p);\n  }\n  moveTo(x: number, y: number, p: IPointLike): ISegPath2D {\n    return super.moveTo(y, x, p);\n  }\n  clear() {\n    return super.clear();\n  }\n}\n\n// export class ReflectContextWrap implements IPath {\n//   ctx: IPath;\n//   constructor(path: IPath) {\n//     this.ctx = path;\n//   }\n\n//   // @ts-ignore\n//   arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void {\n//     return this.ctx.arc(y, x, radius, startAngle, endAngle, counterclockwise);\n//   }\n//   // @ts-ignore\n//   arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void {\n//     return this.ctx.arcTo(y1, x1, y2, x2, radius);\n//   }\n//   // @ts-ignore\n//   bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void {\n//     return this.ctx.bezierCurveTo(cp1y, cp1x, cp2y, cp2x, y, x);\n//   }\n//   closePath(): void {\n//     return this.ctx.closePath();\n//   }\n//   // @ts-ignore\n//   ellipse(\n//     x: number,\n//     y: number,\n//     radiusX: number,\n//     radiusY: number,\n//     rotation: number,\n//     startAngle: number,\n//     endAngle: number,\n//     counterclockwise?: boolean\n//   ): void {\n//     return this.ctx.ellipse(y, x, radiusY, radiusX, rotation, startAngle, endAngle, counterclockwise);\n//   }\n//   lineTo(x: number, y: number): void {\n//     return this.ctx.lineTo(y, x);\n//   }\n//   moveTo(x: number, y: number): void {\n//     return this.ctx.moveTo(y, x);\n//   }\n//   // @ts-ignore\n//   quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void {\n//     return this.ctx.quadraticCurveTo(cpy, cpx, y, x);\n//   }\n//   // @ts-ignore\n//   rect(x: number, y: number, w: number, h: number): void {\n//     return this.rect(y, x, w, h);\n//   }\n// }\n"]}

package/cjs/common/segment/basis.d.ts

@@ -1,11 +1,13 @@
-import { IPointLike } from '@visactor/vutils';
-import { ICurvedSegment, IGenSegmentParams, ILinearSegment, ISegPath2D } from '../../interface/curve';
-export declare function point(curveClass: Basis, x: number, y: number, defined: boolean): void;
+import type { IPointLike } from '@visactor/vutils';
+import type { ICurvedSegment, IGenSegmentParams, ILinearSegment, ISegPath2D } from '../../interface/curve';
+export declare function point(curveClass: Basis, x: number, y: number, defined: boolean, p: IPointLike): void;
 export declare class Basis implements ICurvedSegment {
     private _lastDefined1?;
     private _lastDefined2?;
     context: ISegPath2D;
     protected startPoint?: IPointLike;
+    lastPoint0?: IPointLike;
+    lastPoint1?: IPointLike;
     constructor(context: ISegPath2D, startPoint?: IPointLike);
     _x: number;
     _y: number;