@visactor/vrender-core 0.19.19 → 0.19.20

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, PointService, Point, abs, max, min, atan2, Matrix, pi2, Logger, pi, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, isString, has, isUndefined, isArray, cos, sin, pointAt, isNumber, getDecimalPlaces, isValidNumber, clamp, getAngleByPoint, isNumberClose, isNil, Bounds, getIntersectPoint, Color, DEFAULT_COLORS, normalTransform, isValidUrl, isBase64, epsilon, acos, sqrt, LRU, lowerCamelCaseToMiddle, clampAngleByRadian, asin, transformBoundsWithMatrix, arrayEqual, getRectIntersect, isRectIntersect, calculateAnchorOfBounds, styleStringToObject, merge } from '@visactor/vutils';
+import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, PointService, Point, abs, max, min, atan2, epsilon, Matrix, pi2, Logger, pi, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, isString, has, isUndefined, isArray, cos, sin, pointAt, isNumber, getDecimalPlaces, isValidNumber, clamp, getAngleByPoint, isNumberClose, isNil, Bounds, getIntersectPoint, Color, DEFAULT_COLORS, normalTransform, isValidUrl, isBase64, acos, sqrt, LRU, lowerCamelCaseToMiddle, clampAngleByRadian, asin, transformBoundsWithMatrix, arrayEqual, getRectIntersect, isRectIntersect, calculateAnchorOfBounds, styleStringToObject, merge } from '@visactor/vutils';
 
 class Generator {
     static GenAutoIncrementId() {
@@ -2212,7 +2212,7 @@ function genLinearTypeSegments(path, points) {
     return genCurveSegments(path, points, 1);
 }
 
-function point$2(curveClass, x, y, defined, p) {
+function point$3(curveClass, x, y, defined, p) {
     curveClass.context.bezierCurveTo((2 * curveClass._x0 + curveClass._x1) / 3, (2 * curveClass._y0 + curveClass._y1) / 3, (curveClass._x0 + 2 * curveClass._x1) / 3, (curveClass._y0 + 2 * curveClass._y1) / 3, (curveClass._x0 + 4 * curveClass._x1 + x) / 6, (curveClass._y0 + 4 * curveClass._y1 + y) / 6, defined, curveClass.lastPoint1);
 }
 class Basis {
@@ -2234,7 +2234,7 @@ class Basis {
     lineEnd() {
         switch (this._point) {
             case 2:
-                point$2(this, this._x1 * 6 - (this._x0 + 4 * this._x1), this._y1 * 6 - (this._y0 + 4 * this._y1), this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
+                point$3(this, this._x1 * 6 - (this._x0 + 4 * this._x1), this._y1 * 6 - (this._y0 + 4 * this._y1), this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
         }
         if (this._line || (this._line !== 0 && this._point === 1)) {
             this.context.closePath();
@@ -2255,7 +2255,7 @@ class Basis {
                 this._point = 2;
                 break;
             default:
-                point$2(this, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false);
+                point$3(this, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false);
                 break;
         }
         (this._x0 = this._x1), (this._x1 = x);
@@ -2301,7 +2301,7 @@ function slope2(curveClass, t) {
     const h = curveClass._x1 - curveClass._x0;
     return h ? ((3 * (curveClass._y1 - curveClass._y0)) / h - t) / 2 : t;
 }
-function point$1(curveClass, t0, t1, defined, p) {
+function point$2(curveClass, t0, t1, defined, p) {
     const x0 = curveClass._x0;
     const y0 = curveClass._y0;
     const x1 = curveClass._x1;
@@ -2331,7 +2331,7 @@ class MonotoneX {
                 this.context.lineTo(this._x1, this._y1, this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
                 break;
             case 3:
-                point$1(this, this._t0, slope2(this, this._t0), this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
+                point$2(this, this._t0, slope2(this, this._t0), this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
                 break;
         }
         if (this._line || (this._line !== 0 && this._point === 1)) {
@@ -2355,10 +2355,10 @@ class MonotoneX {
                 break;
             case 2:
                 this._point = 3;
-                point$1(this, slope2(this, (t1 = slope3(this, x, y))), t1, this._lastDefined1 !== false && this._lastDefined2 !== false);
+                point$2(this, slope2(this, (t1 = slope3(this, x, y))), t1, this._lastDefined1 !== false && this._lastDefined2 !== false);
                 break;
             default:
-                point$1(this, this._t0, (t1 = slope3(this, x, y)), this._lastDefined1 !== false && this._lastDefined2 !== false);
+                point$2(this, this._t0, (t1 = slope3(this, x, y)), this._lastDefined1 !== false && this._lastDefined2 !== false);
                 break;
         }
         (this._x0 = this._x1), (this._x1 = x);
@@ -2510,6 +2510,195 @@ function genLinearClosedTypeSegments(path, points) {
     return genCurveSegments(path, points, 1);
 }
 
+function point$1(curveClass, x, y, defined, p) {
+    let x1 = curveClass._x1;
+    let y1 = curveClass._y1;
+    let x2 = curveClass._x2;
+    let y2 = curveClass._y2;
+    if (curveClass._l01_a > epsilon) {
+        const a = 2 * curveClass._l01_2a + 3 * curveClass._l01_a * curveClass._l12_a + curveClass._l12_2a;
+        const n = 3 * curveClass._l01_a * (curveClass._l01_a + curveClass._l12_a);
+        x1 = (x1 * a - curveClass._x0 * curveClass._l12_2a + curveClass._x2 * curveClass._l01_2a) / n;
+        y1 = (y1 * a - curveClass._y0 * curveClass._l12_2a + curveClass._y2 * curveClass._l01_2a) / n;
+    }
+    if (curveClass._l23_a > epsilon) {
+        const b = 2 * curveClass._l23_2a + 3 * curveClass._l23_a * curveClass._l12_a + curveClass._l12_2a;
+        const m = 3 * curveClass._l23_a * (curveClass._l23_a + curveClass._l12_a);
+        x2 = (x2 * b + curveClass._x1 * curveClass._l23_2a - x * curveClass._l12_2a) / m;
+        y2 = (y2 * b + curveClass._y1 * curveClass._l23_2a - y * curveClass._l12_2a) / m;
+    }
+    curveClass.context.bezierCurveTo(x1, y1, x2, y2, curveClass._x2, curveClass._y2, defined, curveClass.lastPoint1);
+}
+class CatmullRom {
+    constructor(context, alpha = 0.5, startPoint) {
+        this.context = context;
+        this.startPoint = startPoint;
+        this._alpha = alpha;
+    }
+    areaStart() {
+        this._line = 0;
+    }
+    areaEnd() {
+        this._line = NaN;
+    }
+    lineStart() {
+        this._x0 = this._x1 = this._x2 = this._y0 = this._y1 = this._y2 = NaN;
+        this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;
+    }
+    lineEnd() {
+        switch (this._point) {
+            case 2:
+                this.context.lineTo(this._x2, this._y2, this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
+                break;
+            case 3:
+                this.point({ x: this._x2, y: this._y2 });
+                break;
+        }
+        if (this._line || (this._line !== 0 && this._point === 1)) {
+            this.context.closePath();
+        }
+        this._line = 1 - this._line;
+    }
+    point(p) {
+        const { x, y } = p;
+        if (this._point) {
+            const x23 = this._x2 - x;
+            const y23 = this._y2 - y;
+            this._l23_a = Math.sqrt((this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha)));
+        }
+        switch (this._point) {
+            case 0:
+                this._point = 1;
+                this._line
+                    ? this.context.lineTo(x, y, this._lastDefined1 !== false && this._lastDefined2 !== false)
+                    : this.context.moveTo(x, y);
+                break;
+            case 1:
+                this._point = 2;
+                break;
+            case 2:
+                this._point = 3;
+            default:
+                point$1(this, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false);
+                break;
+        }
+        (this._l01_a = this._l12_a), (this._l12_a = this._l23_a);
+        (this._l01_2a = this._l12_2a), (this._l12_2a = this._l23_2a);
+        (this._x0 = this._x1), (this._x1 = this._x2), (this._x2 = x);
+        (this._y0 = this._y1), (this._y1 = this._y2), (this._y2 = y);
+        this._lastDefined1 = this._lastDefined2;
+        this._lastDefined2 = p.defined;
+        this.lastPoint0 = this.lastPoint1;
+        this.lastPoint1 = p;
+    }
+    tryUpdateLength() {
+        return this.context.tryUpdateLength();
+    }
+}
+function commonGenCatmullRomSegments(type, cons) {
+    return function genCatmullRomSegments(points, alpha, params = {}) {
+        const { direction, startPoint } = params;
+        if (points.length < 2 - Number(!!startPoint)) {
+            return null;
+        }
+        if (points.length < 3 - Number(!!startPoint)) {
+            return genLinearSegments(points, params);
+        }
+        const segContext = genSegContext(type, direction, points);
+        const gatmullRom = new cons(segContext, alpha, startPoint);
+        genCurveSegments(gatmullRom, points, 2);
+        return segContext;
+    };
+}
+const genCatmullRomSegments = commonGenCatmullRomSegments('catmullRom', CatmullRom);
+
+class CatmullRomClosed {
+    constructor(context, alpha = 0.5, startPoint) {
+        this.context = context;
+        this.startPoint = startPoint;
+        this._alpha = alpha;
+    }
+    areaStart() {
+        this._line = 0;
+    }
+    areaEnd() {
+        this._line = NaN;
+    }
+    lineStart() {
+        this._x0 =
+            this._x1 =
+                this._x2 =
+                    this._x3 =
+                        this._x4 =
+                            this._x5 =
+                                this._y0 =
+                                    this._y1 =
+                                        this._y2 =
+                                            this._y3 =
+                                                this._y4 =
+                                                    this._y5 =
+                                                        NaN;
+        this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;
+    }
+    lineEnd() {
+        switch (this._point) {
+            case 1: {
+                this.context.moveTo(this._x3, this._y3, this.lastPoint1);
+                this.context.closePath();
+                break;
+            }
+            case 2: {
+                this.context.lineTo(this._x3, this._y3, this._lastDefined1 !== false && this._lastDefined2 !== false, this.lastPoint1);
+                this.context.closePath();
+                break;
+            }
+            case 3: {
+                this.point({ x: this._x3, y: this._y3 });
+                this.point({ x: this._x4, y: this._y4 });
+                this.point({ x: this._x5, y: this._y5 });
+                break;
+            }
+        }
+    }
+    point(p) {
+        const { x, y } = p;
+        if (this._point) {
+            const x23 = this._x2 - x;
+            const y23 = this._y2 - y;
+            this._l23_a = Math.sqrt((this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha)));
+        }
+        switch (this._point) {
+            case 0:
+                this._point = 1;
+                (this._x3 = x), (this._y3 = y);
+                break;
+            case 1:
+                this._point = 2;
+                this.context.moveTo((this._x4 = x), (this._y4 = y), p);
+                break;
+            case 2:
+                this._point = 3;
+                (this._x5 = x), (this._y5 = y);
+                break;
+            default:
+                point$1(this, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false);
+                break;
+        }
+        (this._l01_a = this._l12_a), (this._l12_a = this._l23_a);
+        (this._l01_2a = this._l12_2a), (this._l12_2a = this._l23_2a);
+        (this._x0 = this._x1), (this._x1 = this._x2), (this._x2 = x);
+        (this._y0 = this._y1), (this._y1 = this._y2), (this._y2 = y);
+        this._lastDefined1 = this._lastDefined2;
+        this._lastDefined2 = p.defined;
+        this.lastPoint0 = this.lastPoint1;
+        this.lastPoint1 = p;
+    }
+    tryUpdateLength() {
+        return this.context.tryUpdateLength();
+    }
+}
+const genCatmullRomClosedSegments = commonGenCatmullRomSegments('catmullRomClosed', CatmullRomClosed);
+
 class CurveContext {
     constructor(path) {
         this.path = path;
@@ -2560,6 +2749,7 @@ class CurveContext {
 }
 
 function calcLineCache$1(points, curveType, params) {
+    var _a, _b;
     switch (curveType) {
         case 'linear':
             return genLinearSegments(points, params);
@@ -2575,6 +2765,10 @@ function calcLineCache$1(points, curveType, params) {
             return genStepSegments(points, 0, params);
         case 'stepAfter':
             return genStepSegments(points, 1, params);
+        case 'catmullRom':
+            return genCatmullRomSegments(points, (_a = params === null || params === void 0 ? void 0 : params.curveTension) !== null && _a !== void 0 ? _a : 0.5, params);
+        case 'catmullRomClosed':
+            return genCatmullRomClosedSegments(points, (_b = params === null || params === void 0 ? void 0 : params.curveTension) !== null && _b !== void 0 ? _b : 0.5, params);
         case 'linearClosed':
             return genLinearClosedSegments(points, params);
         default:
@@ -3160,11 +3354,11 @@ function rewriteProto(obj, c) {
     Object.setPrototypeOf(obj, c);
 }
 const DefaultArcAttribute = Object.assign(Object.assign({}, DefaultAttribute), { startAngle: 0, endAngle: pi2, innerRadius: 0, outerRadius: 1, innerPadding: 0, outerPadding: 0, cornerRadius: 0, padRadius: 0, padAngle: 0, cap: false, forceShowCap: false });
-const DefaultAreaAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, closePath: false });
+const DefaultAreaAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, closePath: false, curveTension: 1 });
 const DefaultCircleAttribute = Object.assign(Object.assign({}, DefaultAttribute), { radius: 1, startAngle: 0, endAngle: pi2 });
 const DefaultGroupAttribute = Object.assign(Object.assign({}, DefaultAttribute), { width: 0, height: 0, cornerRadius: 0, path: [], clip: false, visibleAll: true, display: 'relative', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'flex-start', alignItems: 'flex-start', alignContent: 'flex-start', baseOpacity: 1 });
 const DefaultGlyphAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: '', width: 0, height: 0, cornerRadius: 0, clip: false });
-const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default', closePath: false });
+const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default', closePath: false, curveTension: 1 });
 const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: new CustomPath2D(), customPath: () => {
         Logger.getInstance().warn('空函数');
     } });
@@ -13229,11 +13423,12 @@ function drawArcPath$1(arc, context, cx, cy, outerRadius, innerRadius, partStrok
     }
     else {
         const cornerRadius = arc.getParsedCornerRadius();
+        const cornerRadiusIsArray = isArray(cornerRadius);
         const { outerDeltaAngle, innerDeltaAngle, outerStartAngle, outerEndAngle, innerEndAngle, innerStartAngle } = arc.getParsePadAngle(startAngle, endAngle);
-        const outerCornerRadiusStart = cornerRadius;
-        const outerCornerRadiusEnd = cornerRadius;
-        const innerCornerRadiusEnd = cornerRadius;
-        const innerCornerRadiusStart = cornerRadius;
+        const outerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[0] : cornerRadius;
+        const outerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[1] : cornerRadius;
+        const innerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[2] : cornerRadius;
+        const innerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[3] : cornerRadius;
         const maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart);
         const maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
         let limitedOcr = maxOuterCornerRadius;
@@ -15435,7 +15630,7 @@ function createSymbol(attributes) {
     return new Symbol$1(attributes);
 }
 
-const LINE_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', ...GRAPHIC_UPDATE_TAG_KEY];
+const LINE_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', 'curveTension', ...GRAPHIC_UPDATE_TAG_KEY];
 let Line$1 = class Line extends Graphic {
     constructor(params = {}) {
         super(params);
@@ -17158,7 +17353,7 @@ function createPath(attributes) {
     return new Path(attributes);
 }
 
-const AREA_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', ...GRAPHIC_UPDATE_TAG_KEY];
+const AREA_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', 'curveTension', ...GRAPHIC_UPDATE_TAG_KEY];
 class Area extends Graphic {
     constructor(params) {
         super(params);
@@ -17307,9 +17502,25 @@ class Arc extends Graphic {
             return 0;
         }
         const deltaRadius = Math.abs(outerRadius - innerRadius);
-        return Math.min(isNumber(cornerRadius, true)
-            ? cornerRadius
-            : (deltaRadius * parseFloat(cornerRadius)) / 100, deltaRadius / 2);
+        const parseCR = (cornerRadius) => {
+            return Math.min(isNumber(cornerRadius, true)
+                ? cornerRadius
+                : (deltaRadius * parseFloat(cornerRadius)) / 100, deltaRadius / 2);
+        };
+        if (isArray(cornerRadius)) {
+            const crList = cornerRadius.map(cr => parseCR(cr) || 0);
+            if (crList.length === 0) {
+                return [crList[0], crList[0], crList[0], crList[0]];
+            }
+            else if (crList.length === 2) {
+                return [crList[0], crList[1], crList[0], crList[1]];
+            }
+            else if (crList.length === 3) {
+                crList.push(0);
+            }
+            return crList;
+        }
+        return parseCR(cornerRadius);
     }
     getParsedAngle() {
         const arcTheme = getTheme(this).arc;
@@ -20528,11 +20739,12 @@ let DefaultCanvasArcRender = class DefaultCanvasArcRender extends BaseRender {
             innerRadius = temp;
         }
         const cornerRadius = arc.getParsedCornerRadius();
+        const cornerRadiusIsArray = isArray(cornerRadius);
         const { outerDeltaAngle, innerDeltaAngle, outerStartAngle, outerEndAngle, innerEndAngle, innerStartAngle } = arc.getParsePadAngle(startAngle, endAngle);
-        const outerCornerRadiusStart = cornerRadius;
-        const outerCornerRadiusEnd = cornerRadius;
-        const innerCornerRadiusEnd = cornerRadius;
-        const innerCornerRadiusStart = cornerRadius;
+        const outerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[0] : cornerRadius;
+        const outerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[1] : cornerRadius;
+        const innerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[2] : cornerRadius;
+        const innerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[3] : cornerRadius;
         const maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart);
         const maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
         let limitedOcr = maxOuterCornerRadius;
@@ -21136,7 +21348,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
     }
     drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb) {
         const lineAttribute = getTheme(line, params === null || params === void 0 ? void 0 : params.theme).line;
-        const { fill = lineAttribute.fill, stroke = lineAttribute.stroke, fillOpacity = lineAttribute.fillOpacity, strokeOpacity = lineAttribute.strokeOpacity, segments, points, closePath } = line.attribute;
+        const { fill = lineAttribute.fill, stroke = lineAttribute.stroke, fillOpacity = lineAttribute.fillOpacity, strokeOpacity = lineAttribute.strokeOpacity, segments, points, closePath, curveTension = lineAttribute.curveTension } = line.attribute;
         const data = this.valid(line, lineAttribute, fillCb, strokeCb);
         if (!data) {
             return;
@@ -21181,7 +21393,8 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
                         startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;
                     }
                     const data = calcLineCache$1(seg.points, curveType, {
-                        startPoint
+                        startPoint,
+                        curveTension
                     });
                     lastSeg = data;
                     return data;
@@ -21205,7 +21418,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
                 }
             }
             else if (points && points.length) {
-                line.cache = calcLineCache$1(_points, curveType);
+                line.cache = calcLineCache$1(_points, curveType, { curveTension });
             }
             else {
                 line.cache = null;
@@ -21543,6 +21756,7 @@ const defaultAreaTextureRenderContribution = new DefaultAreaTextureRenderContrib
 const defaultAreaBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
 function calcLineCache(points, curveType, params) {
+    var _a, _b;
     switch (curveType) {
         case 'linear':
             return genLinearSegments(points, params);
@@ -21558,6 +21772,10 @@ function calcLineCache(points, curveType, params) {
             return genStepSegments(points, 0, params);
         case 'stepAfter':
             return genStepSegments(points, 1, params);
+        case 'catmullRom':
+            return genCatmullRomSegments(points, (_a = params === null || params === void 0 ? void 0 : params.curveTension) !== null && _a !== void 0 ? _a : 0.5, params);
+        case 'catmullRomClosed':
+            return genCatmullRomClosedSegments(points, (_b = params === null || params === void 0 ? void 0 : params.curveTension) !== null && _b !== void 0 ? _b : 0.5, params);
         case 'linearClosed':
             return genLinearClosedSegments(points, params);
         default:
@@ -21636,7 +21854,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
     drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c, _d, _e, _f;
         const areaAttribute = getTheme(area, params === null || params === void 0 ? void 0 : params.theme).area;
-        const { fill = areaAttribute.fill, stroke = areaAttribute.stroke, fillOpacity = areaAttribute.fillOpacity, z = areaAttribute.z, strokeOpacity = areaAttribute.strokeOpacity } = area.attribute;
+        const { fill = areaAttribute.fill, stroke = areaAttribute.stroke, fillOpacity = areaAttribute.fillOpacity, z = areaAttribute.z, strokeOpacity = areaAttribute.strokeOpacity, curveTension = areaAttribute.curveTension } = area.attribute;
         const data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) {
             return;
@@ -21670,7 +21888,8 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                         startPoint.y = lastTopSeg.endY;
                     }
                     const data = calcLineCache(seg.points, curveType, {
-                        startPoint
+                        startPoint,
+                        curveTension
                     });
                     lastTopSeg = data;
                     return data;
@@ -21697,7 +21916,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                             });
                     }
                     if (bottomPoints.length > 1) {
-                        lastBottomSeg = calcLineCache(bottomPoints, curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType);
+                        lastBottomSeg = calcLineCache(bottomPoints, curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType, { curveTension });
                         bottomCaches.unshift(lastBottomSeg);
                     }
                 }
@@ -21715,8 +21934,8 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                         y: (_f = points[i].y1) !== null && _f !== void 0 ? _f : points[i].y
                     });
                 }
-                const topCache = calcLineCache(topPoints, curveType);
-                const bottomCache = calcLineCache(bottomPoints, curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType);
+                const topCache = calcLineCache(topPoints, curveType, { curveTension });
+                const bottomCache = calcLineCache(bottomPoints, curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType, { curveTension });
                 area.cacheArea = { top: topCache, bottom: bottomCache };
             }
             else {
@@ -29260,4 +29479,4 @@ function registerWrapTextGraphic() {
     graphicCreator.RegisterGraphicCreator('wrapText', createWrapText);
 }
 
-export { ACustomAnimate, ARC3D_NUMBER_TYPE, ARC_NUMBER_TYPE, AREA_NUMBER_TYPE, AbstractGraphicRender, Animate, AnimateGroup, AnimateGroup1, AnimateMode, AnimateStatus, AnimateStepType, Application, Arc, Arc3d, Arc3dRender, ArcRender, ArcRenderContribution, Area, AreaRender, AreaRenderContribution, AttributeAnimate, AttributeUpdateType, AutoEnablePlugins, BaseCanvas, BaseEnvContribution, BaseRender, BaseRenderContributionTime, BaseWindowHandlerContribution, Basis, BeforeRenderConstribution, BoundsContext, BoundsPicker, CIRCLE_NUMBER_TYPE, Canvas3DDrawItemInterceptor, Canvas3DPickItemInterceptor, CanvasFactory, CanvasTextLayout, CbAnimate, Circle, CircleRender, CircleRenderContribution, ClipAngleAnimate, ClipDirectionAnimate, ClipGraphicAnimate, ClipRadiusAnimate, ColorInterpolate, ColorStore, ColorType, CommonDrawItemInterceptorContribution, CommonRenderContribution, Container, ContainerModule, Context2dFactory, ContributionProvider, CurveContext, CurveTypeEnum, CustomEvent, CustomPath2D, CustomSymbolClass, DebugDrawItemInterceptorContribution, DefaultArcAllocate, DefaultArcAttribute, DefaultArcRenderContribution, DefaultAreaAllocate, DefaultAreaAttribute, DefaultAreaTextureRenderContribution, DefaultAttribute, DefaultBaseBackgroundRenderContribution, DefaultBaseInteractiveRenderContribution, DefaultBaseTextureRenderContribution, DefaultCanvasAllocate, DefaultCanvasArcRender, DefaultCanvasAreaRender, DefaultCanvasCircleRender, DefaultCanvasImageRender, DefaultCanvasLineRender, DefaultCanvasPathRender, DefaultCanvasPolygonRender, DefaultCanvasRectRender, DefaultCanvasSymbolRender, DefaultCanvasTextRender, DefaultCircleAllocate, DefaultCircleAttribute, DefaultCircleRenderContribution, DefaultConnectAttribute, DefaultDebugAttribute, DefaultFillStyle, DefaultGlobal, DefaultGlobalPickerService, DefaultGlyphAttribute, DefaultGraphicAllocate, DefaultGraphicMemoryManager, DefaultGraphicService, DefaultGraphicUtil, DefaultGroupAttribute, DefaultGroupBackgroundRenderContribution, DefaultImageAttribute, DefaultImageBackgroundRenderContribution, DefaultImageRenderContribution, DefaultLayerService, DefaultLayout, DefaultLineAllocate, DefaultLineAttribute, DefaultMat4Allocate, DefaultMatrixAllocate, DefaultMorphingAnimateConfig, DefaultPathAllocate, DefaultPathAttribute, DefaultPickService, DefaultPickStyle, DefaultPolygonAttribute, DefaultRect3dAttribute, DefaultRectAllocate, DefaultRectAttribute, DefaultRectRenderContribution, DefaultRenderService, DefaultRichTextAttribute, DefaultRichTextIconAttribute, DefaultStateAnimateConfig, DefaultStrokeStyle, DefaultStyle, DefaultSymbolAllocate, DefaultSymbolAttribute, DefaultSymbolRenderContribution, DefaultTextAllocate, DefaultTextAttribute, DefaultTextMeasureContribution, DefaultTextStyle, DefaultTicker, DefaultTimeline, DefaultTransform, DefaultTransformUtil, DefaultWindow, Direction$1 as Direction, DrawContribution, DrawItemInterceptor, DynamicLayerHandlerContribution, Edge, EmptyContext2d, EnvContribution, EventManager, EventSystem, EventTarget, FORMAT_ELEMENT_COMMAND, FORMAT_TEXT_COMMAND, FadeInPlus, FederatedEvent, FederatedMouseEvent, FederatedPointerEvent, FederatedWheelEvent, GLYPH_NUMBER_TYPE, GRAPHIC_UPDATE_TAG_KEY, GROUP_NUMBER_TYPE, Generator, GlobalPickerService, Glyph, GlyphRender, Graphic, GraphicAnimate, GraphicCreator$1 as GraphicCreator, GraphicPicker, GraphicRender, GraphicService, GraphicUtil, Group, GroupFadeIn, GroupFadeOut, GroupRender, GroupRenderContribution, GroupUpdateAABBBoundsMode, HtmlAttributePlugin, IContainPointMode, IMAGE_NUMBER_TYPE, Image, ImageRender, ImageRenderContribution, IncreaseCount, IncrementalDrawContribution, InputText, InteractiveDrawItemInterceptorContribution, InteractivePickItemInterceptorContribution, InteractiveSubRenderContribution, LINE_NUMBER_TYPE, Layer, LayerService, Line$1 as Line, LineRender, Linear, LinearClosed, ManualTickHandler, ManualTicker, Mat4Allocate, MatrixAllocate, Meteor, MonotoneX, MonotoneY, MorphingPath, MotionPath, MultiToOneMorphingPath, NOWORK_ANIMATE_ATTR, Node, PATH_NUMBER_TYPE, POLYGON_NUMBER_TYPE, PURE_STYLE_KEY, PYRAMID3D_NUMBER_TYPE, Path, PathRender, PathRenderContribution, PickItemInterceptor, PickerService, PluginService, Polygon, PolygonRender, PolygonRenderContribution, Pyramid3d, Pyramid3dRender, RAFTickHandler, RECT3D_NUMBER_TYPE, RECT_NUMBER_TYPE, RICHTEXT_NUMBER_TYPE, RafBasedSTO, ReactAttributePlugin, Rect, Rect3DRender, Rect3d, RectRender, RectRenderContribution, ReflectSegContext, RenderSelector, RenderService, ResourceLoader, RichText, RichTextEditPlugin, RichTextRender, RotateBySphereAnimate, SVG_ATTRIBUTE_MAP, SVG_ATTRIBUTE_MAP_KEYS, SVG_PARSE_ATTRIBUTE_MAP, SVG_PARSE_ATTRIBUTE_MAP_KEYS, SYMBOL_NUMBER_TYPE, SegContext, ShadowRoot, ShadowRootDrawItemInterceptorContribution, ShadowRootPickItemInterceptorContribution, SplitRectAfterRenderContribution, SplitRectBeforeRenderContribution, Stage, StaticLayerHandlerContribution, Step$1 as Step, StreamLight, SubAnimate, Symbol$1 as Symbol, SymbolRender, SymbolRenderContribution, TEXT_NUMBER_TYPE, TagPointsUpdate, Text, TextDirection, TextMeasureContribution, TextRender, TextRenderContribution, Theme, TimeOutTickHandler, TransformUtil, UpdateTag, VGlobal, VWindow, VirtualLayerHandlerContribution, WILDCARD, WindowHandlerContribution, WrapText, XMLParser, _interpolateColor, addArcToBezierPath, addAttributeToPrototype, alignBezierCurves, alignSubpath, application, applyTransformOnBezierCurves, arc3dModule, arcModule, areaModule, bezier, bezierCurversToPath, binarySplitPolygon, bindContributionProvider, bindContributionProviderNoSingletonScope, boundStroke, builtInSymbolStrMap, builtinSymbols, builtinSymbolsMap, calcLineCache$1 as calcLineCache, calculateLineHeight, canvasAllocate, centroidOfSubpath, circleBounds, circleModule, clock, cloneGraphic, colorEqual, colorStringInterpolationToStr, container, cornerTangents, createArc, createArc3d, createArea, createCircle, createColor, createConicalGradient, createGlyph, createGroup, createImage, createLine, createMat4, createPath, createPolygon, createPyramid3d, createRect, createRect3d, createRectPath, createRichText, createShadowRoot, createStage, createSymbol, createText, createWrapText, cubicCalc, cubicLength, cubicPointAt, cubicSubdivide, defaultArcAllocate, defaultArcBackgroundRenderContribution, defaultArcRenderContribution, defaultArcTextureRenderContribution, defaultAreaAllocate, defaultBaseBackgroundRenderContribution, defaultBaseTextureRenderContribution, defaultCircleAllocate, defaultCircleBackgroundRenderContribution, defaultCircleRenderContribution, defaultCircleTextureRenderContribution, defaultGraphicMemoryManager, defaultGroupBackgroundRenderContribution, defaultImageBackgroundRenderContribution, defaultImageRenderContribution, defaultLineAllocate, defaultPathAllocate, defaultRectAllocate, defaultRectBackgroundRenderContribution, defaultRectRenderContribution, defaultRectTextureRenderContribution, defaultSymbolAllocate, defaultSymbolBackgroundRenderContribution, defaultSymbolRenderContribution, defaultSymbolTextureRenderContribution, defaultTextAllocate, defaultTicker, defaultTimeline, drawArc, drawArcPath$1 as drawArcPath, drawAreaSegments, drawIncrementalAreaSegments, drawIncrementalSegments, drawPathProxy, drawSegments, enumCommandMap, fillVisible, findBestMorphingRotation, findNextGraphic, flatten_simplify, foreach, foreachAsync, genBasisSegments, genBasisTypeSegments, genLinearClosedSegments, genLinearClosedTypeSegments, genLinearSegments, genLinearTypeSegments, genMonotoneXSegments, genMonotoneXTypeSegments, genMonotoneYSegments, genMonotoneYTypeSegments, genNumberType, genStepSegments, genStepTypeSegments, getAttributeFromDefaultAttrList, getConicGradientAt, getContextFont, getCurrentEnv, getExtraModelMatrix, getModelMatrix, getRichTextBounds, getScaledStroke, getTextBounds, getTheme, getThemeFromGroup, globalTheme, glyphModule, graphicCreator, graphicService, graphicUtil, imageModule, incrementalAddTo, inject, injectable, interpolateColor, interpolateGradientConicalColor, interpolateGradientLinearColor, interpolateGradientRadialColor, interpolatePureColorArray, intersect, isBrowserEnv, isNodeEnv, isSvg, isTransformKey, isXML, layerService, lineModule, lookAt, mat3Tomat4, mat4Allocate, matrixAllocate, morphPath, multiInject, multiToOneMorph, multiply, multiplyMat4Mat3, multiplyMat4Mat4, named, newThemeObj, oneToMultiMorph, ortho, parsePadding, parseStroke, parseSvgPath, pathModule, pathToBezierCurves, point$2 as point, pointEqual, pointInterpolation, pointInterpolationHighPerformance, pointsEqual, pointsInterpolation, polygonModule, preLoadAllModule, pyramid3dModule, rafBasedSto, rect3dModule, rectFillVisible, rectModule, rectStrokeVisible, recursiveCallBinarySplit, registerArc3dGraphic, registerArcGraphic, registerAreaGraphic, registerCircleGraphic, registerGlyphGraphic, registerGroupGraphic, registerImageGraphic, registerLineGraphic, registerPathGraphic, registerPolygonGraphic, registerPyramid3dGraphic, registerRect3dGraphic, registerRectGraphic, registerRichtextGraphic, registerShadowRootGraphic, registerSymbolGraphic, registerTextGraphic, registerWrapTextGraphic, renderCommandList, rewriteProto, richtextModule, rotateX, rotateY, runFill, runStroke, segments, shouldUseMat4, snapLength, splitArc, splitArea, splitCircle, splitGraphic, splitLine, splitPath, splitPolygon, splitRect, splitToGrids, strCommandMap, strokeVisible, symbolModule, textAttributesToStyle, textDrawOffsetX, textDrawOffsetY, textLayoutOffsetY, textModule, transformKeys, transformMat4, transformUtil, translate, verticalLayout, vglobal, waitForAllSubLayers, wrapCanvas, wrapContext, xul };
+export { ACustomAnimate, ARC3D_NUMBER_TYPE, ARC_NUMBER_TYPE, AREA_NUMBER_TYPE, AbstractGraphicRender, Animate, AnimateGroup, AnimateGroup1, AnimateMode, AnimateStatus, AnimateStepType, Application, Arc, Arc3d, Arc3dRender, ArcRender, ArcRenderContribution, Area, AreaRender, AreaRenderContribution, AttributeAnimate, AttributeUpdateType, AutoEnablePlugins, BaseCanvas, BaseEnvContribution, BaseRender, BaseRenderContributionTime, BaseWindowHandlerContribution, Basis, BeforeRenderConstribution, BoundsContext, BoundsPicker, CIRCLE_NUMBER_TYPE, Canvas3DDrawItemInterceptor, Canvas3DPickItemInterceptor, CanvasFactory, CanvasTextLayout, CbAnimate, Circle, CircleRender, CircleRenderContribution, ClipAngleAnimate, ClipDirectionAnimate, ClipGraphicAnimate, ClipRadiusAnimate, ColorInterpolate, ColorStore, ColorType, CommonDrawItemInterceptorContribution, CommonRenderContribution, Container, ContainerModule, Context2dFactory, ContributionProvider, CurveContext, CurveTypeEnum, CustomEvent, CustomPath2D, CustomSymbolClass, DebugDrawItemInterceptorContribution, DefaultArcAllocate, DefaultArcAttribute, DefaultArcRenderContribution, DefaultAreaAllocate, DefaultAreaAttribute, DefaultAreaTextureRenderContribution, DefaultAttribute, DefaultBaseBackgroundRenderContribution, DefaultBaseInteractiveRenderContribution, DefaultBaseTextureRenderContribution, DefaultCanvasAllocate, DefaultCanvasArcRender, DefaultCanvasAreaRender, DefaultCanvasCircleRender, DefaultCanvasImageRender, DefaultCanvasLineRender, DefaultCanvasPathRender, DefaultCanvasPolygonRender, DefaultCanvasRectRender, DefaultCanvasSymbolRender, DefaultCanvasTextRender, DefaultCircleAllocate, DefaultCircleAttribute, DefaultCircleRenderContribution, DefaultConnectAttribute, DefaultDebugAttribute, DefaultFillStyle, DefaultGlobal, DefaultGlobalPickerService, DefaultGlyphAttribute, DefaultGraphicAllocate, DefaultGraphicMemoryManager, DefaultGraphicService, DefaultGraphicUtil, DefaultGroupAttribute, DefaultGroupBackgroundRenderContribution, DefaultImageAttribute, DefaultImageBackgroundRenderContribution, DefaultImageRenderContribution, DefaultLayerService, DefaultLayout, DefaultLineAllocate, DefaultLineAttribute, DefaultMat4Allocate, DefaultMatrixAllocate, DefaultMorphingAnimateConfig, DefaultPathAllocate, DefaultPathAttribute, DefaultPickService, DefaultPickStyle, DefaultPolygonAttribute, DefaultRect3dAttribute, DefaultRectAllocate, DefaultRectAttribute, DefaultRectRenderContribution, DefaultRenderService, DefaultRichTextAttribute, DefaultRichTextIconAttribute, DefaultStateAnimateConfig, DefaultStrokeStyle, DefaultStyle, DefaultSymbolAllocate, DefaultSymbolAttribute, DefaultSymbolRenderContribution, DefaultTextAllocate, DefaultTextAttribute, DefaultTextMeasureContribution, DefaultTextStyle, DefaultTicker, DefaultTimeline, DefaultTransform, DefaultTransformUtil, DefaultWindow, Direction$1 as Direction, DrawContribution, DrawItemInterceptor, DynamicLayerHandlerContribution, Edge, EmptyContext2d, EnvContribution, EventManager, EventSystem, EventTarget, FORMAT_ELEMENT_COMMAND, FORMAT_TEXT_COMMAND, FadeInPlus, FederatedEvent, FederatedMouseEvent, FederatedPointerEvent, FederatedWheelEvent, GLYPH_NUMBER_TYPE, GRAPHIC_UPDATE_TAG_KEY, GROUP_NUMBER_TYPE, Generator, GlobalPickerService, Glyph, GlyphRender, Graphic, GraphicAnimate, GraphicCreator$1 as GraphicCreator, GraphicPicker, GraphicRender, GraphicService, GraphicUtil, Group, GroupFadeIn, GroupFadeOut, GroupRender, GroupRenderContribution, GroupUpdateAABBBoundsMode, HtmlAttributePlugin, IContainPointMode, IMAGE_NUMBER_TYPE, Image, ImageRender, ImageRenderContribution, IncreaseCount, IncrementalDrawContribution, InputText, InteractiveDrawItemInterceptorContribution, InteractivePickItemInterceptorContribution, InteractiveSubRenderContribution, LINE_NUMBER_TYPE, Layer, LayerService, Line$1 as Line, LineRender, Linear, LinearClosed, ManualTickHandler, ManualTicker, Mat4Allocate, MatrixAllocate, Meteor, MonotoneX, MonotoneY, MorphingPath, MotionPath, MultiToOneMorphingPath, NOWORK_ANIMATE_ATTR, Node, PATH_NUMBER_TYPE, POLYGON_NUMBER_TYPE, PURE_STYLE_KEY, PYRAMID3D_NUMBER_TYPE, Path, PathRender, PathRenderContribution, PickItemInterceptor, PickerService, PluginService, Polygon, PolygonRender, PolygonRenderContribution, Pyramid3d, Pyramid3dRender, RAFTickHandler, RECT3D_NUMBER_TYPE, RECT_NUMBER_TYPE, RICHTEXT_NUMBER_TYPE, RafBasedSTO, ReactAttributePlugin, Rect, Rect3DRender, Rect3d, RectRender, RectRenderContribution, ReflectSegContext, RenderSelector, RenderService, ResourceLoader, RichText, RichTextEditPlugin, RichTextRender, RotateBySphereAnimate, SVG_ATTRIBUTE_MAP, SVG_ATTRIBUTE_MAP_KEYS, SVG_PARSE_ATTRIBUTE_MAP, SVG_PARSE_ATTRIBUTE_MAP_KEYS, SYMBOL_NUMBER_TYPE, SegContext, ShadowRoot, ShadowRootDrawItemInterceptorContribution, ShadowRootPickItemInterceptorContribution, SplitRectAfterRenderContribution, SplitRectBeforeRenderContribution, Stage, StaticLayerHandlerContribution, Step$1 as Step, StreamLight, SubAnimate, Symbol$1 as Symbol, SymbolRender, SymbolRenderContribution, TEXT_NUMBER_TYPE, TagPointsUpdate, Text, TextDirection, TextMeasureContribution, TextRender, TextRenderContribution, Theme, TimeOutTickHandler, TransformUtil, UpdateTag, VGlobal, VWindow, VirtualLayerHandlerContribution, WILDCARD, WindowHandlerContribution, WrapText, XMLParser, _interpolateColor, addArcToBezierPath, addAttributeToPrototype, alignBezierCurves, alignSubpath, application, applyTransformOnBezierCurves, arc3dModule, arcModule, areaModule, bezier, bezierCurversToPath, binarySplitPolygon, bindContributionProvider, bindContributionProviderNoSingletonScope, boundStroke, builtInSymbolStrMap, builtinSymbols, builtinSymbolsMap, calcLineCache$1 as calcLineCache, calculateLineHeight, canvasAllocate, centroidOfSubpath, circleBounds, circleModule, clock, cloneGraphic, colorEqual, colorStringInterpolationToStr, container, cornerTangents, createArc, createArc3d, createArea, createCircle, createColor, createConicalGradient, createGlyph, createGroup, createImage, createLine, createMat4, createPath, createPolygon, createPyramid3d, createRect, createRect3d, createRectPath, createRichText, createShadowRoot, createStage, createSymbol, createText, createWrapText, cubicCalc, cubicLength, cubicPointAt, cubicSubdivide, defaultArcAllocate, defaultArcBackgroundRenderContribution, defaultArcRenderContribution, defaultArcTextureRenderContribution, defaultAreaAllocate, defaultBaseBackgroundRenderContribution, defaultBaseTextureRenderContribution, defaultCircleAllocate, defaultCircleBackgroundRenderContribution, defaultCircleRenderContribution, defaultCircleTextureRenderContribution, defaultGraphicMemoryManager, defaultGroupBackgroundRenderContribution, defaultImageBackgroundRenderContribution, defaultImageRenderContribution, defaultLineAllocate, defaultPathAllocate, defaultRectAllocate, defaultRectBackgroundRenderContribution, defaultRectRenderContribution, defaultRectTextureRenderContribution, defaultSymbolAllocate, defaultSymbolBackgroundRenderContribution, defaultSymbolRenderContribution, defaultSymbolTextureRenderContribution, defaultTextAllocate, defaultTicker, defaultTimeline, drawArc, drawArcPath$1 as drawArcPath, drawAreaSegments, drawIncrementalAreaSegments, drawIncrementalSegments, drawPathProxy, drawSegments, enumCommandMap, fillVisible, findBestMorphingRotation, findNextGraphic, flatten_simplify, foreach, foreachAsync, genBasisSegments, genBasisTypeSegments, genLinearClosedSegments, genLinearClosedTypeSegments, genLinearSegments, genLinearTypeSegments, genMonotoneXSegments, genMonotoneXTypeSegments, genMonotoneYSegments, genMonotoneYTypeSegments, genNumberType, genStepSegments, genStepTypeSegments, getAttributeFromDefaultAttrList, getConicGradientAt, getContextFont, getCurrentEnv, getExtraModelMatrix, getModelMatrix, getRichTextBounds, getScaledStroke, getTextBounds, getTheme, getThemeFromGroup, globalTheme, glyphModule, graphicCreator, graphicService, graphicUtil, imageModule, incrementalAddTo, inject, injectable, interpolateColor, interpolateGradientConicalColor, interpolateGradientLinearColor, interpolateGradientRadialColor, interpolatePureColorArray, intersect, isBrowserEnv, isNodeEnv, isSvg, isTransformKey, isXML, layerService, lineModule, lookAt, mat3Tomat4, mat4Allocate, matrixAllocate, morphPath, multiInject, multiToOneMorph, multiply, multiplyMat4Mat3, multiplyMat4Mat4, named, newThemeObj, oneToMultiMorph, ortho, parsePadding, parseStroke, parseSvgPath, pathModule, pathToBezierCurves, point$3 as point, pointEqual, pointInterpolation, pointInterpolationHighPerformance, pointsEqual, pointsInterpolation, polygonModule, preLoadAllModule, pyramid3dModule, rafBasedSto, rect3dModule, rectFillVisible, rectModule, rectStrokeVisible, recursiveCallBinarySplit, registerArc3dGraphic, registerArcGraphic, registerAreaGraphic, registerCircleGraphic, registerGlyphGraphic, registerGroupGraphic, registerImageGraphic, registerLineGraphic, registerPathGraphic, registerPolygonGraphic, registerPyramid3dGraphic, registerRect3dGraphic, registerRectGraphic, registerRichtextGraphic, registerShadowRootGraphic, registerSymbolGraphic, registerTextGraphic, registerWrapTextGraphic, renderCommandList, rewriteProto, richtextModule, rotateX, rotateY, runFill, runStroke, segments, shouldUseMat4, snapLength, splitArc, splitArea, splitCircle, splitGraphic, splitLine, splitPath, splitPolygon, splitRect, splitToGrids, strCommandMap, strokeVisible, symbolModule, textAttributesToStyle, textDrawOffsetX, textDrawOffsetY, textLayoutOffsetY, textModule, transformKeys, transformMat4, transformUtil, translate, verticalLayout, vglobal, waitForAllSubLayers, wrapCanvas, wrapContext, xul };

package/es/common/segment/catmull-rom-close.d.ts

@@ -0,0 +1,41 @@
+import { type IPointLike } from '@visactor/vutils';
+import type { ICurvedSegment, IGenSegmentParams, ISegPath2D } from '../../interface/curve';
+export declare class CatmullRomClosed implements ICurvedSegment {
+    private _lastDefined1?;
+    private _lastDefined2?;
+    context: ISegPath2D;
+    protected startPoint?: IPointLike;
+    lastPoint0?: IPointLike;
+    lastPoint1?: IPointLike;
+    constructor(context: ISegPath2D, alpha?: number, startPoint?: IPointLike);
+    _alpha: number;
+    _x: number;
+    _y: number;
+    _x0: number;
+    _x1: number;
+    _y0: number;
+    _y1: number;
+    _x2: number;
+    _y2: number;
+    _x3: number;
+    _y3: number;
+    _x4: number;
+    _y4: number;
+    _x5: number;
+    _y5: number;
+    _line: number;
+    _point: number;
+    _l01_a: number;
+    _l12_a: number;
+    _l23_a: number;
+    _l01_2a: number;
+    _l12_2a: number;
+    _l23_2a: number;
+    areaStart(): void;
+    areaEnd(): void;
+    lineStart(): void;
+    lineEnd(): void;
+    point(p: IPointLike): void;
+    tryUpdateLength(): number;
+}
+export declare const genCatmullRomClosedSegments: (points: IPointLike[], alpha: number, params?: IGenSegmentParams) => ISegPath2D;

package/es/common/segment/catmull-rom-close.js

@@ -0,0 +1,74 @@
+import { commonGenCatmullRomSegments, point } from "./catmull-rom";
+
+export class CatmullRomClosed {
+    constructor(context, alpha = .5, startPoint) {
+        this.context = context, this.startPoint = startPoint, this._alpha = alpha;
+    }
+    areaStart() {
+        this._line = 0;
+    }
+    areaEnd() {
+        this._line = NaN;
+    }
+    lineStart() {
+        this._x0 = this._x1 = this._x2 = this._x3 = this._x4 = this._x5 = this._y0 = this._y1 = this._y2 = this._y3 = this._y4 = this._y5 = NaN, 
+        this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;
+    }
+    lineEnd() {
+        switch (this._point) {
+          case 1:
+            this.context.moveTo(this._x3, this._y3, this.lastPoint1), this.context.closePath();
+            break;
+
+          case 2:
+            this.context.lineTo(this._x3, this._y3, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1), 
+            this.context.closePath();
+            break;
+
+          case 3:
+            this.point({
+                x: this._x3,
+                y: this._y3
+            }), this.point({
+                x: this._x4,
+                y: this._y4
+            }), this.point({
+                x: this._x5,
+                y: this._y5
+            });
+        }
+    }
+    point(p) {
+        const {x: x, y: y} = p;
+        if (this._point) {
+            const x23 = this._x2 - x, y23 = this._y2 - y;
+            this._l23_a = Math.sqrt(this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha));
+        }
+        switch (this._point) {
+          case 0:
+            this._point = 1, this._x3 = x, this._y3 = y;
+            break;
+
+          case 1:
+            this._point = 2, this.context.moveTo(this._x4 = x, this._y4 = y, p);
+            break;
+
+          case 2:
+            this._point = 3, this._x5 = x, this._y5 = y;
+            break;
+
+          default:
+            point(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, p);
+        }
+        this._l01_a = this._l12_a, this._l12_a = this._l23_a, this._l01_2a = this._l12_2a, 
+        this._l12_2a = this._l23_2a, this._x0 = this._x1, this._x1 = this._x2, this._x2 = x, 
+        this._y0 = this._y1, this._y1 = this._y2, this._y2 = y, this._lastDefined1 = this._lastDefined2, 
+        this._lastDefined2 = p.defined, this.lastPoint0 = this.lastPoint1, this.lastPoint1 = p;
+    }
+    tryUpdateLength() {
+        return this.context.tryUpdateLength();
+    }
+}
+
+export const genCatmullRomClosedSegments = commonGenCatmullRomSegments("catmullRomClosed", CatmullRomClosed);
+//# sourceMappingURL=catmull-rom-close.js.map

package/es/common/segment/catmull-rom-close.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/common/segment/catmull-rom-close.ts"],"names":[],"mappings":"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","file":"catmull-rom-close.js","sourcesContent":["import { epsilon, type IPointLike } from '@visactor/vutils';\nimport { genLinearSegments } from './linear';\nimport { genCurveSegments, genSegContext } from './common';\nimport type { ICurvedSegment, IGenSegmentParams, ILinearSegment, ISegPath2D } from '../../interface/curve';\nimport { commonGenCatmullRomSegments, point } from './catmull-rom';\n\nexport class CatmullRomClosed implements ICurvedSegment {\n  private _lastDefined1?: boolean;\n  private _lastDefined2?: boolean;\n  declare context: ISegPath2D;\n\n  protected startPoint?: IPointLike;\n  lastPoint0?: IPointLike;\n  lastPoint1?: IPointLike;\n\n  constructor(context: ISegPath2D, alpha: number = 0.5, startPoint?: IPointLike) {\n    this.context = context;\n    this.startPoint = startPoint;\n    this._alpha = alpha;\n  }\n  _alpha: number;\n  _x: number;\n  _y: number;\n  _x0: number;\n  _x1: number;\n  _y0: number;\n  _y1: number;\n  _x2: number;\n  _y2: number;\n  _x3: number;\n  _y3: number;\n  _x4: number;\n  _y4: number;\n  _x5: number;\n  _y5: number;\n  _line: number;\n  _point: number;\n  _l01_a: number;\n  _l12_a: number;\n  _l23_a: number;\n  _l01_2a: number;\n  _l12_2a: number;\n  _l23_2a: number;\n\n  areaStart() {\n    this._line = 0;\n  }\n  areaEnd() {\n    this._line = NaN;\n  }\n  lineStart() {\n    this._x0 =\n      this._x1 =\n      this._x2 =\n      this._x3 =\n      this._x4 =\n      this._x5 =\n      this._y0 =\n      this._y1 =\n      this._y2 =\n      this._y3 =\n      this._y4 =\n      this._y5 =\n        NaN;\n    this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;\n  }\n  lineEnd() {\n    switch (this._point) {\n      case 1: {\n        this.context.moveTo(this._x3, this._y3, this.lastPoint1);\n        this.context.closePath();\n        break;\n      }\n      case 2: {\n        this.context.lineTo(\n          this._x3,\n          this._y3,\n          this._lastDefined1 !== false && this._lastDefined2 !== false,\n          this.lastPoint1\n        );\n        this.context.closePath();\n        break;\n      }\n      case 3: {\n        this.point({ x: this._x3, y: this._y3 });\n        this.point({ x: this._x4, y: this._y4 });\n        this.point({ x: this._x5, y: this._y5 });\n        break;\n      }\n    }\n  }\n  point(p: IPointLike): void {\n    const { x, y } = p;\n\n    if (this._point) {\n      const x23 = this._x2 - x;\n      const y23 = this._y2 - y;\n      this._l23_a = Math.sqrt((this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha)));\n    }\n\n    switch (this._point) {\n      case 0:\n        this._point = 1;\n        (this._x3 = x), (this._y3 = y);\n        break;\n      case 1:\n        this._point = 2;\n        this.context.moveTo((this._x4 = x), (this._y4 = y), p);\n        break;\n      case 2:\n        this._point = 3;\n        (this._x5 = x), (this._y5 = y);\n        break;\n      default:\n        point(this as any, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false, p);\n        break;\n    }\n\n    (this._l01_a = this._l12_a), (this._l12_a = this._l23_a);\n    (this._l01_2a = this._l12_2a), (this._l12_2a = this._l23_2a);\n    (this._x0 = this._x1), (this._x1 = this._x2), (this._x2 = x);\n    (this._y0 = this._y1), (this._y1 = this._y2), (this._y2 = y);\n\n    this._lastDefined1 = this._lastDefined2;\n    this._lastDefined2 = p.defined;\n    this.lastPoint0 = this.lastPoint1;\n    this.lastPoint1 = p;\n  }\n\n  tryUpdateLength(): number {\n    return this.context.tryUpdateLength();\n  }\n}\n\n// export function genCatmullRomClosedTypeSegments(path: ILinearSegment, points: IPointLike[]): void {\n//   return genCurveSegments(path, points, 2);\n// }\n\nexport const genCatmullRomClosedSegments = commonGenCatmullRomSegments('catmullRomClosed', CatmullRomClosed);\n\n// export function genCatmullRomClosedSegments(\n//   points: IPointLike[],\n//   alpha: number,\n//   params: IGenSegmentParams = {}\n// ): ISegPath2D | null {\n//   const { direction, startPoint } = params;\n//   if (points.length < 2 - Number(!!startPoint)) {\n//     return null;\n//   }\n//   if (points.length < 3 - Number(!!startPoint)) {\n//     return genLinearSegments(points, params);\n//   }\n\n//   const segContext = genSegContext('catmullRom', direction, points);\n\n//   const gatmullRom = new CatmullRomClosed(segContext, alpha, startPoint);\n\n//   genCatmullRomClosedTypeSegments(gatmullRom, points);\n\n//   return segContext;\n// }\n"]}