@visactor/vrender-core 0.20.0-alpha.0 → 0.20.0-alpha.2

package/es/graphic/arc.d.ts

@@ -1,4 +1,4 @@
-import type { AABBBounds } from '@visactor/vutils';
+import type { IAABBBounds } from '@visactor/vutils';
 import type { IArc, IArcGraphicAttribute } from '../interface/graphic/arc';
 import { Graphic } from './graphic';
 import { CustomPath2D } from '../common/custom-path2d';
@@ -39,7 +39,7 @@ export declare class Arc extends Graphic<IArcGraphicAttribute> implements IArc {
     constructor(params: IArcGraphicAttribute);
     isValid(): boolean;
     private _isValid;
-    getParsedCornerRadius(): number;
+    getParsedCornerRadius(): number | number[];
     getParsedAngle(): {
         startAngle: number;
         endAngle: number;
@@ -59,10 +59,12 @@ export declare class Arc extends Graphic<IArcGraphicAttribute> implements IArc {
         innerDeltaAngle: number;
         outerDeltaAngle: number;
     };
-    protected doUpdateAABBBounds(full?: boolean): AABBBounds;
+    getGraphicTheme(): Required<IArcGraphicAttribute>;
+    protected updateAABBBounds(attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds, full?: boolean): import("@visactor/vutils").IBounds;
+    protected updateArcAABBBoundsImprecise(attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds): IAABBBounds;
+    protected updateArcAABBBoundsAccurate(attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds): IAABBBounds;
     protected needUpdateTags(keys: string[]): boolean;
     protected needUpdateTag(key: string): boolean;
-    getDefaultAttribute(name: string): any;
     toCustomPath(): CustomPath2D;
     clone(): Arc;
     getNoWorkAnimateAttr(): Record<string, number>;

package/es/graphic/arc.js

@@ -1,10 +1,10 @@
-import { pi2, sin, epsilon, abs, asin, clampAngleByRadian, isNumber, cos, sqrt } from "@visactor/vutils";
+import { pi2, sin, epsilon, abs, asin, clampAngleByRadian, isNumber, cos, sqrt, isArray } from "@visactor/vutils";
 
 import { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from "./graphic";
 
 import { CustomPath2D } from "../common/custom-path2d";
 
-import { parsePadding } from "../common/utils";
+import { circleBounds } from "../common/utils";
 
 import { getTheme } from "./theme";
 
@@ -12,6 +12,8 @@ import { application } from "../application";
 
 import { ARC_NUMBER_TYPE } from "./constants";
 
+import { updateBoundsOfCommonOuterBorder } from "./graphic-service/common-outer-boder-bounds";
+
 const ARC_UPDATE_TAG_KEY = [ "innerRadius", "outerRadius", "startAngle", "endAngle", "cornerRadius", "padAngle", "padRadius", "cap", ...GRAPHIC_UPDATE_TAG_KEY ];
 
 export class Arc extends Graphic {
@@ -26,14 +28,19 @@ export class Arc extends Graphic {
         return this._validNumber(startAngle) && this._validNumber(endAngle) && this._validNumber(outerRadius) && this._validNumber(innerRadius);
     }
     getParsedCornerRadius() {
-        const arcTheme = getTheme(this).arc, {cornerRadius: cornerRadius = arcTheme.cornerRadius, innerPadding: innerPadding = arcTheme.innerPadding, outerPadding: outerPadding = arcTheme.outerPadding} = this.attribute;
+        const arcTheme = this.getGraphicTheme(), {cornerRadius: cornerRadius = arcTheme.cornerRadius, innerPadding: innerPadding = arcTheme.innerPadding, outerPadding: outerPadding = arcTheme.outerPadding} = this.attribute;
         let {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius} = this.attribute;
         if (outerRadius += outerPadding, innerRadius -= innerPadding, 0 === cornerRadius || "0%" === cornerRadius) return 0;
-        const deltaRadius = Math.abs(outerRadius - innerRadius);
-        return Math.min(isNumber(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+        const deltaRadius = Math.abs(outerRadius - innerRadius), parseCR = cornerRadius => Math.min(isNumber(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+        if (isArray(cornerRadius)) {
+            const crList = cornerRadius.map((cr => parseCR(cr) || 0));
+            return 0 === crList.length ? [ crList[0], crList[0], crList[0], crList[0] ] : 2 === crList.length ? [ crList[0], crList[1], crList[0], crList[1] ] : (3 === crList.length && crList.push(0), 
+            crList);
+        }
+        return parseCR(cornerRadius);
     }
     getParsedAngle() {
-        const arcTheme = getTheme(this).arc;
+        const arcTheme = this.getGraphicTheme();
         let {startAngle: startAngle = arcTheme.startAngle, endAngle: endAngle = arcTheme.endAngle} = this.attribute;
         const {cap: cap = arcTheme.cap} = this.attribute, sign = endAngle - startAngle >= 0 ? 1 : -1, deltaAngle = endAngle - startAngle;
         if (startAngle = clampAngleByRadian(startAngle), endAngle = startAngle + deltaAngle, 
@@ -57,7 +64,7 @@ export class Arc extends Graphic {
         };
     }
     getParsePadAngle(startAngle, endAngle) {
-        const arcTheme = getTheme(this).arc, {innerPadding: innerPadding = arcTheme.innerPadding, outerPadding: outerPadding = arcTheme.outerPadding, padAngle: padAngle = arcTheme.padAngle} = this.attribute;
+        const arcTheme = this.getGraphicTheme(), {innerPadding: innerPadding = arcTheme.innerPadding, outerPadding: outerPadding = arcTheme.outerPadding, padAngle: padAngle = arcTheme.padAngle} = this.attribute;
         let {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius} = this.attribute;
         outerRadius += outerPadding, innerRadius -= innerPadding;
         const {padRadius: padRadius = sqrt(outerRadius * outerRadius + innerRadius * innerRadius)} = this.attribute, deltaAngle = abs(endAngle - startAngle);
@@ -88,12 +95,39 @@ export class Arc extends Graphic {
             outerDeltaAngle: outerDeltaAngle
         };
     }
-    doUpdateAABBBounds(full) {
-        const arcTheme = getTheme(this).arc;
-        this._AABBBounds.clear();
-        const attribute = this.attribute, bounds = application.graphicService.updateArcAABBBounds(attribute, getTheme(this).arc, this._AABBBounds, full, this), {boundsPadding: boundsPadding = arcTheme.boundsPadding} = attribute, paddingArray = parsePadding(boundsPadding);
-        return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), 
-        bounds;
+    getGraphicTheme() {
+        return getTheme(this).arc;
+    }
+    updateAABBBounds(attribute, arcTheme, aabbBounds, full) {
+        if (!application.graphicService.validCheck(attribute, arcTheme, aabbBounds, this)) return aabbBounds;
+        this.updatePathProxyAABBBounds(aabbBounds) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds));
+        const {tb1: tb1, tb2: tb2} = application.graphicService.updateTempAABBBounds(aabbBounds);
+        updateBoundsOfCommonOuterBorder(attribute, arcTheme, tb1), aabbBounds.union(tb1), 
+        tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
+        const {lineJoin: lineJoin = arcTheme.lineJoin} = attribute;
+        return application.graphicService.transformAABBBounds(attribute, aabbBounds, arcTheme, "miter" === lineJoin, this), 
+        aabbBounds;
+    }
+    updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds) {
+        let {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius} = attribute;
+        const {outerPadding: outerPadding = arcTheme.outerPadding, innerPadding: innerPadding = arcTheme.innerPadding} = attribute;
+        return outerRadius += outerPadding, innerRadius -= innerPadding, outerRadius < innerRadius && (outerRadius = innerRadius), 
+        aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius), aabbBounds;
+    }
+    updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds) {
+        let {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius} = attribute;
+        const {outerPadding: outerPadding = arcTheme.outerPadding, innerPadding: innerPadding = arcTheme.innerPadding} = attribute;
+        if (outerRadius += outerPadding, innerRadius -= innerPadding, outerRadius < innerRadius) {
+            const temp = outerRadius;
+            outerRadius = innerRadius, innerRadius = temp;
+        }
+        let {endAngle: endAngle = arcTheme.endAngle, startAngle: startAngle = arcTheme.startAngle} = attribute;
+        if (startAngle > endAngle) {
+            const temp = startAngle;
+            startAngle = endAngle, endAngle = temp;
+        }
+        return outerRadius <= epsilon ? aabbBounds.set(0, 0, 0, 0) : Math.abs(endAngle - startAngle) > pi2 - epsilon ? aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius) : (circleBounds(startAngle, endAngle, outerRadius, aabbBounds), 
+        circleBounds(startAngle, endAngle, innerRadius, aabbBounds)), aabbBounds;
     }
     needUpdateTags(keys) {
         return super.needUpdateTags(keys, ARC_UPDATE_TAG_KEY);
@@ -101,9 +135,6 @@ export class Arc extends Graphic {
     needUpdateTag(key) {
         return super.needUpdateTag(key, ARC_UPDATE_TAG_KEY);
     }
-    getDefaultAttribute(name) {
-        return getTheme(this).arc[name];
-    }
     toCustomPath() {
         const attribute = this.attribute, {startAngle: startAngle, endAngle: endAngle} = this.getParsedAngle();
         let innerRadius = attribute.innerRadius - (attribute.innerPadding || 0), outerRadius = attribute.outerRadius - (attribute.outerPadding || 0);

package/es/graphic/arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/arc.ts"],"names":[],"mappings":"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","file":"arc.js","sourcesContent":["import type { AABBBounds } from '@visactor/vutils';\nimport { pi2, sin, epsilon, abs, asin, clampAngleByRadian, isNumber, cos, sqrt } from '@visactor/vutils';\nimport type { IArc, IArcGraphicAttribute } from '../interface/graphic/arc';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { parsePadding } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport type { GraphicType } from '../interface';\nimport { ARC_NUMBER_TYPE } from './constants';\n\n/**\n * 部分代码参考 https://github.com/d3/d3-shape/\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\nconst ARC_UPDATE_TAG_KEY = [\n  'innerRadius',\n  'outerRadius',\n  'startAngle',\n  'endAngle',\n  'cornerRadius',\n  'padAngle',\n  'padRadius',\n  'cap',\n  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\n/**\n * 圆形图元\n * 默认顺时针绘制\n */\nexport class Arc extends Graphic<IArcGraphicAttribute> implements IArc {\n  type: GraphicType = 'arc';\n\n  static NOWORK_ANIMATE_ATTR = {\n    cap: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  // static parseCornerRadius(r: IArcGraphicAttribute['cornerRadius']) {\n  //   if (isArray(r)) {\n  //     if ((r as any[]).length === 1) {\n  //       const value = r[0];\n  //       return [value, value, value, value];\n  //     }\n\n  //     if ((r as any[]).length === 2) {\n  //       return [r[0], r[0], r[1], r[1]];\n  //     }\n\n  //     if ((r as any[]).length === 3) {\n  //       return [r[0], r[1], r[2], 0];\n  //     }\n\n  //     return (r as any[]).slice(0, 4);\n  //   }\n\n  //   return [r as string | number, r as string | number, r as string | number, r as string | number];\n  // }\n\n  // static isCornerRadiusEqual(oldR: IArcGraphicAttribute['cornerRadius'], newR: IArcGraphicAttribute['cornerRadius']) {\n  //   throw new Error('暂不支持');\n  //   if (oldR === newR) {\n  //     return true;\n  //   }\n\n  //   if (isArray(oldR) && !isArray(newR)) {\n  //     return (oldR as (string | number)[]).every(r => r === newR);\n  //   }\n\n  //   if (!isArray(oldR) && isArray(newR)) {\n  //     return (newR as (string | number)[]).every(r => r === oldR);\n  //   }\n\n  //   return arrayEqual(oldR as (string | number)[], newR as (string | number)[]);\n  // }\n\n  constructor(params: IArcGraphicAttribute) {\n    super(params);\n    this.numberType = ARC_NUMBER_TYPE;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { startAngle, endAngle, outerRadius, innerRadius } = this.attribute;\n    return (\n      this._validNumber(startAngle) &&\n      this._validNumber(endAngle) &&\n      this._validNumber(outerRadius) &&\n      this._validNumber(innerRadius)\n    );\n  }\n\n  getParsedCornerRadius() {\n    const arcTheme = getTheme(this).arc;\n    const {\n      cornerRadius = arcTheme.cornerRadius,\n      innerPadding = arcTheme.innerPadding,\n      outerPadding = arcTheme.outerPadding\n    } = this.attribute;\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n    if (cornerRadius === 0 || cornerRadius === '0%') {\n      return 0;\n    }\n    const deltaRadius = Math.abs(outerRadius - innerRadius);\n    return Math.min(\n      isNumber(cornerRadius, true)\n        ? (cornerRadius as number)\n        : (deltaRadius * parseFloat(cornerRadius as string)) / 100,\n      deltaRadius / 2\n    );\n  }\n\n  getParsedAngle() {\n    const arcTheme = getTheme(this).arc;\n    let { startAngle = arcTheme.startAngle, endAngle = arcTheme.endAngle } = this.attribute;\n    const { cap = arcTheme.cap } = this.attribute;\n\n    const sign = endAngle - startAngle >= 0 ? 1 : -1;\n    const deltaAngle = endAngle - startAngle;\n\n    startAngle = clampAngleByRadian(startAngle);\n    endAngle = startAngle + deltaAngle;\n\n    if (cap && abs(deltaAngle) < pi2 - epsilon) {\n      let startCap = 1;\n      let endCap = 1;\n      if ((cap as boolean[]).length) {\n        startCap = Number(cap[0]);\n        endCap = Number(cap[1]);\n      }\n      let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n      const { outerPadding = arcTheme.outerPadding, innerPadding = arcTheme.innerPadding } = this.attribute;\n      outerRadius += outerPadding;\n      innerRadius -= innerPadding;\n      const capWidth = Math.abs(outerRadius - innerRadius) / 2;\n      // 以外边界长度为准\n      const capAngle = capWidth / outerRadius;\n\n      if (capWidth > epsilon && outerRadius > epsilon) {\n        return {\n          startAngle: startAngle - sign * capAngle * startCap,\n          endAngle: endAngle + sign * capAngle * endCap,\n          sc: sign * capAngle * startCap,\n          ec: sign * capAngle * endCap\n        };\n      }\n    }\n\n    return {\n      startAngle: startAngle,\n      endAngle: endAngle\n    };\n  }\n\n  // 参考 https://github.com/d3/d3-shape/blob/main/src/arc.js\n  getParsePadAngle(startAngle: number, endAngle: number) {\n    const arcTheme = getTheme(this).arc;\n    const {\n      innerPadding = arcTheme.innerPadding,\n      outerPadding = arcTheme.outerPadding,\n      padAngle = arcTheme.padAngle\n    } = this.attribute;\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n\n    const { padRadius = sqrt(outerRadius * outerRadius + innerRadius * innerRadius) } = this.attribute;\n    const deltaAngle = abs(endAngle - startAngle);\n\n    // Or is it a circular or annular sector?\n    let outerStartAngle = startAngle;\n    let outerEndAngle = endAngle;\n    let innerStartAngle = startAngle;\n    let innerEndAngle = endAngle;\n    const halfPadAngle = padAngle / 2;\n    let innerDeltaAngle = deltaAngle;\n    let outerDeltaAngle = deltaAngle;\n\n    // Apply padding? Note that since r1 ≥ r0, outerDeltaAngle ≥ innerDeltaAngle.\n    if (halfPadAngle > epsilon && padRadius > epsilon) {\n      const sign = endAngle > startAngle ? 1 : -1;\n\n      let p0 = asin((Number(padRadius) / innerRadius) * sin(halfPadAngle));\n      let p1 = asin((Number(padRadius) / outerRadius) * sin(halfPadAngle));\n      if ((innerDeltaAngle -= p0 * 2) > epsilon) {\n        p0 *= sign;\n        innerStartAngle += p0;\n        innerEndAngle -= p0;\n      } else {\n        innerDeltaAngle = 0;\n        innerStartAngle = innerEndAngle = (startAngle + endAngle) / 2;\n      }\n      if ((outerDeltaAngle -= p1 * 2) > epsilon) {\n        p1 *= sign;\n        outerStartAngle += p1;\n        outerEndAngle -= p1;\n      } else {\n        outerDeltaAngle = 0;\n        outerStartAngle = outerEndAngle = (startAngle + endAngle) / 2;\n      }\n\n      return {\n        outerStartAngle,\n        outerEndAngle,\n        innerStartAngle,\n        innerEndAngle,\n        innerDeltaAngle,\n        outerDeltaAngle\n      };\n    }\n\n    return {\n      outerStartAngle,\n      outerEndAngle,\n      innerStartAngle,\n      innerEndAngle,\n      innerDeltaAngle,\n      outerDeltaAngle\n    };\n  }\n\n  protected doUpdateAABBBounds(full?: boolean): AABBBounds {\n    const arcTheme = getTheme(this).arc;\n    this._AABBBounds.clear();\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateArcAABBBounds(\n      attribute,\n      getTheme(this).arc,\n      this._AABBBounds,\n      full,\n      this\n    ) as AABBBounds;\n\n    const { boundsPadding = arcTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      bounds.expand(paddingArray);\n    }\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, ARC_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, ARC_UPDATE_TAG_KEY);\n  }\n\n  getDefaultAttribute(name: string) {\n    const arcTheme = getTheme(this).arc;\n    return arcTheme[name];\n  }\n\n  toCustomPath() {\n    const x = 0;\n    const y = 0;\n\n    const attribute = this.attribute;\n    const { startAngle, endAngle } = this.getParsedAngle();\n    let innerRadius = attribute.innerRadius - (attribute.innerPadding || 0);\n    let outerRadius = attribute.outerRadius - (attribute.outerPadding || 0);\n    const deltaAngle = abs(endAngle - startAngle);\n    const clockwise: boolean = endAngle > startAngle;\n\n    if (outerRadius < innerRadius) {\n      const temp = outerRadius;\n      outerRadius = innerRadius;\n      innerRadius = temp;\n    }\n\n    const path = new CustomPath2D();\n\n    if (outerRadius <= epsilon) {\n      path.moveTo(x, y);\n    } else if (deltaAngle >= pi2 - epsilon) {\n      // 是个完整的圆环\n      // Or is it a circle or annulus?\n      path.moveTo(x + outerRadius * cos(startAngle), y + outerRadius * sin(startAngle));\n      path.arc(x, y, outerRadius, startAngle, endAngle, !clockwise);\n      if (innerRadius > epsilon) {\n        path.moveTo(x + innerRadius * cos(endAngle), y + innerRadius * sin(endAngle));\n        path.arc(x, y, innerRadius, endAngle, startAngle, clockwise);\n      }\n    } else {\n      const xors = outerRadius * cos(startAngle);\n      const yors = outerRadius * sin(startAngle);\n      const xire = innerRadius * cos(endAngle);\n      const yire = innerRadius * sin(endAngle);\n\n      path.moveTo(x + xors, y + yors);\n      path.arc(x, y, outerRadius, startAngle, endAngle, !clockwise);\n      path.lineTo(x + xire, y + yire);\n      path.arc(x, y, innerRadius, endAngle, startAngle, clockwise);\n      path.closePath();\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Arc({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Arc.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArc(attributes: IArcGraphicAttribute): IArc {\n  return new Arc(attributes);\n}\n\n// addAttributeToPrototype(DefaultCircleStyle, Circle, PURE_STYLE_KEY);\n"]}
+{"version":3,"sources":["../src/graphic/arc.ts"],"names":[],"mappings":"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","file":"arc.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport { pi2, sin, epsilon, abs, asin, clampAngleByRadian, isNumber, cos, sqrt, isArray } from '@visactor/vutils';\nimport type { IArc, IArcGraphicAttribute } from '../interface/graphic/arc';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { circleBounds } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport type { GraphicType } from '../interface';\nimport { ARC_NUMBER_TYPE } from './constants';\nimport { updateBoundsOfCommonOuterBorder } from './graphic-service/common-outer-boder-bounds';\n\n/**\n * 部分代码参考 https://github.com/d3/d3-shape/\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\nconst ARC_UPDATE_TAG_KEY = [\n  'innerRadius',\n  'outerRadius',\n  'startAngle',\n  'endAngle',\n  'cornerRadius',\n  'padAngle',\n  'padRadius',\n  'cap',\n  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\n/**\n * 圆形图元\n * 默认顺时针绘制\n */\nexport class Arc extends Graphic<IArcGraphicAttribute> implements IArc {\n  type: GraphicType = 'arc';\n\n  static NOWORK_ANIMATE_ATTR = {\n    cap: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  // static parseCornerRadius(r: IArcGraphicAttribute['cornerRadius']) {\n  //   if (isArray(r)) {\n  //     if ((r as any[]).length === 1) {\n  //       const value = r[0];\n  //       return [value, value, value, value];\n  //     }\n\n  //     if ((r as any[]).length === 2) {\n  //       return [r[0], r[0], r[1], r[1]];\n  //     }\n\n  //     if ((r as any[]).length === 3) {\n  //       return [r[0], r[1], r[2], 0];\n  //     }\n\n  //     return (r as any[]).slice(0, 4);\n  //   }\n\n  //   return [r as string | number, r as string | number, r as string | number, r as string | number];\n  // }\n\n  // static isCornerRadiusEqual(oldR: IArcGraphicAttribute['cornerRadius'], newR: IArcGraphicAttribute['cornerRadius']) {\n  //   throw new Error('暂不支持');\n  //   if (oldR === newR) {\n  //     return true;\n  //   }\n\n  //   if (isArray(oldR) && !isArray(newR)) {\n  //     return (oldR as (string | number)[]).every(r => r === newR);\n  //   }\n\n  //   if (!isArray(oldR) && isArray(newR)) {\n  //     return (newR as (string | number)[]).every(r => r === oldR);\n  //   }\n\n  //   return arrayEqual(oldR as (string | number)[], newR as (string | number)[]);\n  // }\n\n  constructor(params: IArcGraphicAttribute) {\n    super(params);\n    this.numberType = ARC_NUMBER_TYPE;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { startAngle, endAngle, outerRadius, innerRadius } = this.attribute;\n    return (\n      this._validNumber(startAngle) &&\n      this._validNumber(endAngle) &&\n      this._validNumber(outerRadius) &&\n      this._validNumber(innerRadius)\n    );\n  }\n\n  getParsedCornerRadius() {\n    const arcTheme = this.getGraphicTheme();\n    const {\n      cornerRadius = arcTheme.cornerRadius,\n      innerPadding = arcTheme.innerPadding,\n      outerPadding = arcTheme.outerPadding\n    } = this.attribute;\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n    if (cornerRadius === 0 || cornerRadius === '0%') {\n      return 0;\n    }\n    const deltaRadius = Math.abs(outerRadius - innerRadius);\n    const parseCR = (cornerRadius: number | string) => {\n      return Math.min(\n        isNumber(cornerRadius, true)\n          ? (cornerRadius as number)\n          : (deltaRadius * parseFloat(cornerRadius as string)) / 100,\n        deltaRadius / 2\n      );\n    };\n    if (isArray(cornerRadius)) {\n      const crList = cornerRadius.map(cr => parseCR(cr) || 0);\n      if (crList.length === 0) {\n        return [crList[0], crList[0], crList[0], crList[0]];\n      } else if (crList.length === 2) {\n        return [crList[0], crList[1], crList[0], crList[1]];\n      } else if (crList.length === 3) {\n        crList.push(0);\n      }\n      return crList;\n    }\n    return parseCR(cornerRadius);\n  }\n\n  getParsedAngle() {\n    const arcTheme = this.getGraphicTheme();\n    let { startAngle = arcTheme.startAngle, endAngle = arcTheme.endAngle } = this.attribute;\n    const { cap = arcTheme.cap } = this.attribute;\n\n    const sign = endAngle - startAngle >= 0 ? 1 : -1;\n    const deltaAngle = endAngle - startAngle;\n\n    startAngle = clampAngleByRadian(startAngle);\n    endAngle = startAngle + deltaAngle;\n\n    if (cap && abs(deltaAngle) < pi2 - epsilon) {\n      let startCap = 1;\n      let endCap = 1;\n      if ((cap as boolean[]).length) {\n        startCap = Number((cap as boolean[])[0]);\n        endCap = Number((cap as boolean[])[1]);\n      }\n      let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n      const { outerPadding = arcTheme.outerPadding, innerPadding = arcTheme.innerPadding } = this.attribute;\n      outerRadius += outerPadding;\n      innerRadius -= innerPadding;\n      const capWidth = Math.abs(outerRadius - innerRadius) / 2;\n      // 以外边界长度为准\n      const capAngle = capWidth / outerRadius;\n\n      if (capWidth > epsilon && outerRadius > epsilon) {\n        return {\n          startAngle: startAngle - sign * capAngle * startCap,\n          endAngle: endAngle + sign * capAngle * endCap,\n          sc: sign * capAngle * startCap,\n          ec: sign * capAngle * endCap\n        };\n      }\n    }\n\n    return {\n      startAngle: startAngle,\n      endAngle: endAngle\n    };\n  }\n\n  // 参考 https://github.com/d3/d3-shape/blob/main/src/arc.js\n  getParsePadAngle(startAngle: number, endAngle: number) {\n    const arcTheme = this.getGraphicTheme();\n    const {\n      innerPadding = arcTheme.innerPadding,\n      outerPadding = arcTheme.outerPadding,\n      padAngle = arcTheme.padAngle\n    } = this.attribute;\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = this.attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n\n    const { padRadius = sqrt(outerRadius * outerRadius + innerRadius * innerRadius) } = this.attribute;\n    const deltaAngle = abs(endAngle - startAngle);\n\n    // Or is it a circular or annular sector?\n    let outerStartAngle = startAngle;\n    let outerEndAngle = endAngle;\n    let innerStartAngle = startAngle;\n    let innerEndAngle = endAngle;\n    const halfPadAngle = padAngle / 2;\n    let innerDeltaAngle = deltaAngle;\n    let outerDeltaAngle = deltaAngle;\n\n    // Apply padding? Note that since r1 ≥ r0, outerDeltaAngle ≥ innerDeltaAngle.\n    if (halfPadAngle > epsilon && padRadius > epsilon) {\n      const sign = endAngle > startAngle ? 1 : -1;\n\n      let p0 = asin((Number(padRadius) / innerRadius) * sin(halfPadAngle));\n      let p1 = asin((Number(padRadius) / outerRadius) * sin(halfPadAngle));\n      if ((innerDeltaAngle -= p0 * 2) > epsilon) {\n        p0 *= sign;\n        innerStartAngle += p0;\n        innerEndAngle -= p0;\n      } else {\n        innerDeltaAngle = 0;\n        innerStartAngle = innerEndAngle = (startAngle + endAngle) / 2;\n      }\n      if ((outerDeltaAngle -= p1 * 2) > epsilon) {\n        p1 *= sign;\n        outerStartAngle += p1;\n        outerEndAngle -= p1;\n      } else {\n        outerDeltaAngle = 0;\n        outerStartAngle = outerEndAngle = (startAngle + endAngle) / 2;\n      }\n\n      return {\n        outerStartAngle,\n        outerEndAngle,\n        innerStartAngle,\n        innerEndAngle,\n        innerDeltaAngle,\n        outerDeltaAngle\n      };\n    }\n\n    return {\n      outerStartAngle,\n      outerEndAngle,\n      innerStartAngle,\n      innerEndAngle,\n      innerDeltaAngle,\n      outerDeltaAngle\n    };\n  }\n\n  getGraphicTheme(): Required<IArcGraphicAttribute> {\n    return getTheme(this).arc;\n  }\n\n  protected updateAABBBounds(\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean\n  ) {\n    if (!application.graphicService.validCheck(attribute, arcTheme, aabbBounds, this)) {\n      return aabbBounds;\n    }\n    if (!this.updatePathProxyAABBBounds(aabbBounds)) {\n      full\n        ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds)\n        : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds);\n    }\n\n    const { tb1, tb2 } = application.graphicService.updateTempAABBBounds(aabbBounds);\n\n    updateBoundsOfCommonOuterBorder(attribute, arcTheme, tb1);\n    aabbBounds.union(tb1);\n    tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n\n    const { lineJoin = arcTheme.lineJoin } = attribute;\n    application.graphicService.transformAABBBounds(attribute, aabbBounds, arcTheme, lineJoin === 'miter', this);\n\n    return aabbBounds;\n  }\n\n  protected updateArcAABBBoundsImprecise(\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ): IAABBBounds {\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = attribute;\n    const { outerPadding = arcTheme.outerPadding, innerPadding = arcTheme.innerPadding } = attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n    if (outerRadius < innerRadius) {\n      outerRadius = innerRadius;\n    }\n\n    aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius);\n\n    return aabbBounds;\n  }\n  protected updateArcAABBBoundsAccurate(\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ): IAABBBounds {\n    let { outerRadius = arcTheme.outerRadius, innerRadius = arcTheme.innerRadius } = attribute;\n    const { outerPadding = arcTheme.outerPadding, innerPadding = arcTheme.innerPadding } = attribute;\n    outerRadius += outerPadding;\n    innerRadius -= innerPadding;\n    if (outerRadius < innerRadius) {\n      // 不用解构，避免性能问题\n      const temp = outerRadius;\n      outerRadius = innerRadius;\n      innerRadius = temp;\n    }\n    let { endAngle = arcTheme.endAngle, startAngle = arcTheme.startAngle } = attribute;\n\n    if (startAngle > endAngle) {\n      const temp = startAngle;\n      startAngle = endAngle;\n      endAngle = temp;\n    }\n\n    if (outerRadius <= epsilon) {\n      aabbBounds.set(0, 0, 0, 0);\n    } else if (Math.abs(endAngle - startAngle) > pi2 - epsilon) {\n      aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius);\n    } else {\n      // 直接内外两个radius叠加即可，不需要更精确\n      circleBounds(startAngle, endAngle, outerRadius, aabbBounds);\n      circleBounds(startAngle, endAngle, innerRadius, aabbBounds);\n    }\n\n    return aabbBounds;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, ARC_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, ARC_UPDATE_TAG_KEY);\n  }\n\n  toCustomPath() {\n    const x = 0;\n    const y = 0;\n\n    const attribute = this.attribute;\n    const { startAngle, endAngle } = this.getParsedAngle();\n    let innerRadius = attribute.innerRadius - (attribute.innerPadding || 0);\n    let outerRadius = attribute.outerRadius - (attribute.outerPadding || 0);\n    const deltaAngle = abs(endAngle - startAngle);\n    const clockwise: boolean = endAngle > startAngle;\n\n    if (outerRadius < innerRadius) {\n      const temp = outerRadius;\n      outerRadius = innerRadius;\n      innerRadius = temp;\n    }\n\n    const path = new CustomPath2D();\n\n    if (outerRadius <= epsilon) {\n      path.moveTo(x, y);\n    } else if (deltaAngle >= pi2 - epsilon) {\n      // 是个完整的圆环\n      // Or is it a circle or annulus?\n      path.moveTo(x + outerRadius * cos(startAngle), y + outerRadius * sin(startAngle));\n      path.arc(x, y, outerRadius, startAngle, endAngle, !clockwise);\n      if (innerRadius > epsilon) {\n        path.moveTo(x + innerRadius * cos(endAngle), y + innerRadius * sin(endAngle));\n        path.arc(x, y, innerRadius, endAngle, startAngle, clockwise);\n      }\n    } else {\n      const xors = outerRadius * cos(startAngle);\n      const yors = outerRadius * sin(startAngle);\n      const xire = innerRadius * cos(endAngle);\n      const yire = innerRadius * sin(endAngle);\n\n      path.moveTo(x + xors, y + yors);\n      path.arc(x, y, outerRadius, startAngle, endAngle, !clockwise);\n      path.lineTo(x + xire, y + yire);\n      path.arc(x, y, innerRadius, endAngle, startAngle, clockwise);\n      path.closePath();\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Arc({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Arc.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArc(attributes: IArcGraphicAttribute): IArc {\n  return new Arc(attributes);\n}\n\n// addAttributeToPrototype(DefaultCircleStyle, Circle, PURE_STYLE_KEY);\n"]}

package/es/graphic/arc3d.d.ts

@@ -1,4 +1,4 @@
-import type { AABBBounds } from '@visactor/vutils';
+import type { IAABBBounds } from '@visactor/vutils';
 import type { GraphicType, IArc3d, IArc3dGraphicAttribute } from '../interface';
 import { Arc } from './arc';
 export declare class Arc3d extends Arc implements IArc3d {
@@ -36,7 +36,7 @@ export declare class Arc3d extends Arc implements IArc3d {
         cap: number;
     };
     constructor(params: IArc3dGraphicAttribute);
-    protected doUpdateAABBBounds(): AABBBounds;
+    protected updateAABBBounds(attribute: IArc3dGraphicAttribute, arcTheme: Required<IArc3dGraphicAttribute>, aabbBounds: IAABBBounds): import("@visactor/vutils").IBounds;
     getNoWorkAnimateAttr(): Record<string, number>;
 }
 export declare function createArc3d(attributes: IArc3dGraphicAttribute): IArc3d;

package/es/graphic/arc3d.js

@@ -1,11 +1,7 @@
 import { Arc } from "./arc";
 
-import { getTheme } from "./theme";
-
 import { application } from "../application";
 
-import { parsePadding } from "../common/utils";
-
 import { ARC3D_NUMBER_TYPE } from "./constants";
 
 import { NOWORK_ANIMATE_ATTR } from "./graphic";
@@ -14,12 +10,13 @@ export class Arc3d extends Arc {
     constructor(params) {
         super(params), this.type = "arc3d", this.numberType = ARC3D_NUMBER_TYPE;
     }
-    doUpdateAABBBounds() {
-        const polygonTheme = getTheme(this).arc;
-        this._AABBBounds.clear();
-        const attribute = this.attribute, bounds = application.graphicService.updateArc3dAABBBounds(attribute, getTheme(this).polygon, this._AABBBounds, this), {boundsPadding: boundsPadding = polygonTheme.boundsPadding} = attribute, paddingArray = parsePadding(boundsPadding);
-        return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), 
-        this._AABBBounds;
+    updateAABBBounds(attribute, arcTheme, aabbBounds) {
+        const stage = this.stage;
+        if (!stage || !stage.camera) return aabbBounds;
+        const {outerRadius: outerRadius = arcTheme.outerRadius, height: height = 0} = attribute, r = outerRadius + height;
+        return aabbBounds.setValue(-r, -r, r, r), application.graphicService.updateTempAABBBounds(aabbBounds), 
+        application.graphicService.transformAABBBounds(attribute, aabbBounds, arcTheme, !1, this), 
+        aabbBounds;
     }
     getNoWorkAnimateAttr() {
         return Arc3d.NOWORK_ANIMATE_ATTR;

package/es/graphic/arc3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/arc3d.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,OAAO,KAAM,SAAQ,GAAG;IAS5B,YAAY,MAA8B;QACxC,KAAK,CAAC,MAAM,CAAC,CAAC;QAThB,SAAI,GAAgB,OAAO,CAAC;QAU1B,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC;IACtC,CAAC;IAES,kBAAkB;QAC1B,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;QACxC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEzB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,CAAC,qBAAqB,CAC7D,SAAS,EACT,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAc,EAC7B,IAAI,CAAC,WAAW,EAChB,IAAI,CACS,CAAC;QAEhB,MAAM,EAAE,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;QACjE,MAAM,YAAY,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,YAAY,EAAE;YAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE3B,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC,mBAAmB,CAAC;IACnC,CAAC;;AAnCM,yBAAmB,mBACxB,GAAG,EAAE,CAAC,IACH,mBAAmB,EACtB;AAmCJ,MAAM,UAAU,WAAW,CAAC,UAAkC;IAC5D,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;AAC/B,CAAC","file":"arc3d.js","sourcesContent":["import type { AABBBounds } from '@visactor/vutils';\nimport type { GraphicType, IArc3d, IArc3dGraphicAttribute } from '../interface';\nimport { Arc } from './arc';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { parsePadding } from '../common/utils';\nimport { ARC3D_NUMBER_TYPE } from './constants';\nimport { NOWORK_ANIMATE_ATTR } from './graphic';\n\nexport class Arc3d extends Arc implements IArc3d {\n  type: GraphicType = 'arc3d';\n  declare attribute: IArc3dGraphicAttribute;\n\n  static NOWORK_ANIMATE_ATTR = {\n    cap: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  constructor(params: IArc3dGraphicAttribute) {\n    super(params);\n    this.numberType = ARC3D_NUMBER_TYPE;\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    const polygonTheme = getTheme(this).arc;\n    this._AABBBounds.clear();\n\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateArc3dAABBBounds(\n      attribute,\n      getTheme(this).polygon as any,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n\n    const { boundsPadding = polygonTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      bounds.expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n\n    return this._AABBBounds;\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Arc3d.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArc3d(attributes: IArc3dGraphicAttribute): IArc3d {\n  return new Arc3d(attributes);\n}\n"]}
+{"version":3,"sources":["../src/graphic/arc3d.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,OAAO,KAAM,SAAQ,GAAG;IAS5B,YAAY,MAA8B;QACxC,KAAK,CAAC,MAAM,CAAC,CAAC;QAThB,SAAI,GAAgB,OAAO,CAAC;QAU1B,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC;IACtC,CAAC;IAES,gBAAgB,CACxB,SAAiC,EACjC,QAA0C,EAC1C,UAAuB;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC3B,OAAO,UAAU,CAAC;SACnB;QAGD,MAAM,EAAE,WAAW,GAAG,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;QACrE,MAAM,CAAC,GAAG,WAAW,GAAG,MAAM,CAAC;QAC/B,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAyBlC,WAAW,CAAC,cAAc,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC5D,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7F,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC,mBAAmB,CAAC;IACnC,CAAC;;AAvDM,yBAAmB,mBACxB,GAAG,EAAE,CAAC,IACH,mBAAmB,EACtB;AAuDJ,MAAM,UAAU,WAAW,CAAC,UAAkC;IAC5D,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;AAC/B,CAAC","file":"arc3d.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport type { GraphicType, IArc3d, IArc3dGraphicAttribute } from '../interface';\nimport { Arc } from './arc';\nimport { application } from '../application';\nimport { ARC3D_NUMBER_TYPE } from './constants';\nimport { NOWORK_ANIMATE_ATTR } from './graphic';\n\nexport class Arc3d extends Arc implements IArc3d {\n  type: GraphicType = 'arc3d';\n  declare attribute: IArc3dGraphicAttribute;\n\n  static NOWORK_ANIMATE_ATTR = {\n    cap: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  constructor(params: IArc3dGraphicAttribute) {\n    super(params);\n    this.numberType = ARC3D_NUMBER_TYPE;\n  }\n\n  protected updateAABBBounds(\n    attribute: IArc3dGraphicAttribute,\n    arcTheme: Required<IArc3dGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    const stage = this.stage;\n    if (!stage || !stage.camera) {\n      return aabbBounds;\n    }\n\n    // 当做一个立方体计算\n    const { outerRadius = arcTheme.outerRadius, height = 0 } = attribute;\n    const r = outerRadius + height;\n    aabbBounds.setValue(-r, -r, r, r);\n    // const matrix = getExtraModelMatrix(graphic.globalTransMatrix, 1, graphic);\n    // const { outerRadius=arcTheme.outerRadius, height=0 } = attribute;\n    // const points = [\n    //   {x: -outerRadius, y: -outerRadius, z: 0 },\n    //   {x: outerRadius, y: -outerRadius, z: 0 },\n    //   {x: outerRadius, y: outerRadius, z: 0 },\n    //   {x: -outerRadius, y: outerRadius, z: 0 },\n    //   {x: -outerRadius, y: -outerRadius, z: height },\n    //   {x: outerRadius, y: -outerRadius, z: height },\n    //   {x: outerRadius, y: outerRadius, z: height },\n    //   {x: -outerRadius, y: outerRadius, z: height },\n    // ]\n    // const outP: vec3 = [0, 0, 0];\n    // points.forEach(item => {\n    //   let x = item.x;\n    //   let y = item.y;\n    //   if (stage.camera) {\n    //     transformMat4(outP, [item.x, item.y, item.z], matrix);\n    //     const data = stage.camera.vp(outP[0], outP[1], outP[2]);\n    //     x = data.x;\n    //     y = data.y;\n    //   }\n    //   aabbBounds.add(x, y);\n    // });\n    application.graphicService.updateTempAABBBounds(aabbBounds);\n    application.graphicService.transformAABBBounds(attribute, aabbBounds, arcTheme, false, this);\n    return aabbBounds;\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Arc3d.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArc3d(attributes: IArc3dGraphicAttribute): IArc3d {\n  return new Arc3d(attributes);\n}\n"]}

package/es/graphic/area.d.ts

@@ -1,4 +1,4 @@
-import type { AABBBounds } from '@visactor/vutils';
+import type { IAABBBounds } from '@visactor/vutils';
 import type { IArea, IAreaCacheItem, IAreaGraphicAttribute } from '../interface';
 import { Graphic } from './graphic';
 import { CustomPath2D } from '../common/custom-path2d';
@@ -40,9 +40,11 @@ export declare class Area extends Graphic<IAreaGraphicAttribute> implements IAre
     constructor(params: IAreaGraphicAttribute);
     isValid(): boolean;
     private _isValid;
-    protected doUpdateAABBBounds(): AABBBounds;
+    getGraphicTheme(): Required<IAreaGraphicAttribute>;
+    protected updateAABBBounds(attribute: IAreaGraphicAttribute, areaTheme: Required<IAreaGraphicAttribute>, aabbBounds: IAABBBounds): import("@visactor/vutils").IBounds;
+    protected updateAreaAABBBoundsByPoints(attribute: IAreaGraphicAttribute, areaTheme: Required<IAreaGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IArea): IAABBBounds;
+    protected updateAreaAABBBoundsBySegments(attribute: IAreaGraphicAttribute, areaTheme: Required<IAreaGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IArea): IAABBBounds;
     protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void;
-    getDefaultAttribute(name: string): any;
     protected needUpdateTags(keys: string[]): boolean;
     protected needUpdateTag(key: string): boolean;
     toCustomPath(): CustomPath2D;

package/es/graphic/area.js

@@ -2,7 +2,7 @@ import { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from "./graphic"
 
 import { CustomPath2D } from "../common/custom-path2d";
 
-import { parsePadding, pointsInterpolation } from "../common/utils";
+import { pointsInterpolation } from "../common/utils";
 
 import { getTheme } from "./theme";
 
@@ -10,7 +10,7 @@ import { application } from "../application";
 
 import { AREA_NUMBER_TYPE } from "./constants";
 
-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 ];
 
 export class Area extends Graphic {
     constructor(params) {
@@ -24,19 +24,36 @@ export class Area extends Graphic {
         const {points: points, segments: segments} = this.attribute;
         return segments ? 0 !== segments.length : !!points && 0 !== points.length;
     }
-    doUpdateAABBBounds() {
-        const areaTheme = getTheme(this).area;
-        this._AABBBounds.clear();
-        const attribute = this.attribute, bounds = application.graphicService.updateAreaAABBBounds(attribute, getTheme(this).area, this._AABBBounds, this), {boundsPadding: boundsPadding = areaTheme.boundsPadding} = attribute, paddingArray = parsePadding(boundsPadding);
-        return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), 
-        bounds;
+    getGraphicTheme() {
+        return getTheme(this).area;
+    }
+    updateAABBBounds(attribute, areaTheme, aabbBounds) {
+        if (!application.graphicService.validCheck(attribute, areaTheme, aabbBounds, this)) return aabbBounds;
+        this.updatePathProxyAABBBounds(aabbBounds) || (attribute.segments ? this.updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds) : this.updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds)), 
+        application.graphicService.updateTempAABBBounds(aabbBounds);
+        const {lineJoin: lineJoin = areaTheme.lineJoin} = attribute;
+        return application.graphicService.transformAABBBounds(attribute, aabbBounds, areaTheme, "miter" === lineJoin, this), 
+        aabbBounds;
+    }
+    updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic) {
+        const {points: points = areaTheme.points} = attribute, b = aabbBounds;
+        return points.forEach((p => {
+            var _a, _b;
+            b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
+        })), b;
+    }
+    updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds, graphic) {
+        const {segments: segments = areaTheme.segments} = attribute, b = aabbBounds;
+        return segments.forEach((s => {
+            s.points.forEach((p => {
+                var _a, _b;
+                b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
+            }));
+        })), b;
     }
     _interpolate(key, ratio, lastStepVal, nextStepVal, nextAttributes) {
         "points" === key && (nextAttributes.points = pointsInterpolation(lastStepVal, nextStepVal, ratio));
     }
-    getDefaultAttribute(name) {
-        return getTheme(this).area[name];
-    }
     needUpdateTags(keys) {
         return super.needUpdateTags(keys, AREA_UPDATE_TAG_KEY);
     }

package/es/graphic/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { AABBBounds, IPointLike } from '@visactor/vutils';\nimport type { IArea, IAreaCacheItem, IAreaGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { parsePadding, pointsInterpolation } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { AREA_NUMBER_TYPE } from './constants';\n\nconst AREA_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', ...GRAPHIC_UPDATE_TAG_KEY];\n\nexport class Area extends Graphic<IAreaGraphicAttribute> implements IArea {\n  type: 'area' = 'area';\n\n  static NOWORK_ANIMATE_ATTR = {\n    segments: 1,\n    curveType: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  cache?: IAreaCacheItem;\n\n  constructor(params: IAreaGraphicAttribute) {\n    super(params);\n    this.numberType = AREA_NUMBER_TYPE;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    if (this.pathProxy) {\n      return true;\n    }\n    const { points, segments } = this.attribute;\n    if (segments) {\n      if (segments.length === 0) {\n        return false;\n      }\n      return true;\n    } else if (points) {\n      if (points.length === 0) {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    const areaTheme = getTheme(this).area;\n    this._AABBBounds.clear();\n\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateAreaAABBBounds(\n      attribute,\n      getTheme(this).area,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n\n    const { boundsPadding = areaTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      bounds.expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n  // private tryUpdateAABBBoundsByPoints(): AABBBounds {\n  //   const areaTheme = getTheme(this).area;\n  //   const { points = areaTheme.points } = this.attribute;\n  //   const b = this._AABBBounds;\n  //   points.forEach(p => {\n  //     b.add(p.x, p.y);\n  //     b.add(p.x1 ?? p.x, p.y1 ?? p.y); //面积图特殊性：由三个值构成，横向面积图，x1会省略；纵向面积图，y1会省略\n  //   });\n  //   const {\n  //     x = areaTheme.x,\n  //     y = areaTheme.y,\n  //     dx = areaTheme.dx,\n  //     dy = areaTheme.dy,\n  //     scaleX = areaTheme.scaleX,\n  //     scaleY = areaTheme.scaleY,\n  //     angle = areaTheme.angle\n  //   } = this.attribute;\n  //   // 合并shadowRoot的bounds\n  //   this.combindShadowAABBBounds(this._AABBBounds);\n  //   // TODO 加上锚点\n  //   transformBounds(b, x, y, scaleX, scaleY, angle);\n  //   this._AABBBounds.translate(dx, dy);\n  //   return b;\n  // }\n  // private tryUpdateAABBBoundsBySegments(): AABBBounds {\n  //   const areaTheme = getTheme(this).area;\n  //   const { segments = areaTheme.segments } = this.attribute;\n  //   const b = this._AABBBounds;\n  //   segments.forEach(s => {\n  //     s.points.forEach(p => {\n  //       b.add(p.x, p.y);\n  //       b.add(p.x1 ?? p.x, p.y1 ?? p.y); //面积图特殊性：由三个值构成，横向面积图，x1会省略；纵向面积图，y1会省略\n  //     });\n  //   });\n  //   const {\n  //     x = areaTheme.x,\n  //     y = areaTheme.y,\n  //     dx = areaTheme.dx,\n  //     dy = areaTheme.dy,\n  //     scaleX = areaTheme.scaleX,\n  //     scaleY = areaTheme.scaleY,\n  //     angle = areaTheme.angle\n  //   } = this.attribute;\n  //   // 合并shadowRoot的bounds\n  //   this.combindShadowAABBBounds(this._AABBBounds);\n  //   // TODO 加上锚点\n  //   transformBounds(b, x, y, scaleX, scaleY, angle);\n  //   this._AABBBounds.translate(dx, dy);\n  //   return b;\n  // }\n\n  protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void {\n    if (key === 'points') {\n      (nextAttributes as any).points = pointsInterpolation(lastStepVal, nextStepVal, ratio);\n    }\n  }\n\n  getDefaultAttribute(name: string) {\n    const areaTheme = getTheme(this).area;\n    return areaTheme[name];\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, AREA_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, AREA_UPDATE_TAG_KEY);\n  }\n\n  toCustomPath() {\n    const path = new CustomPath2D();\n    const attribute = this.attribute;\n    const segments = attribute.segments;\n\n    const parsePoints = (points: IPointLike[]) => {\n      if (points && points.length) {\n        let isFirst = true;\n        const basePoints: IPointLike[] = [];\n        points.forEach(point => {\n          if (point.defined === false) {\n            return;\n          }\n          if (isFirst) {\n            path.moveTo(point.x, point.y);\n          } else {\n            path.lineTo(point.x, point.y);\n          }\n          basePoints.push({ x: point.x1 ?? point.x, y: point.y1 ?? point.y });\n\n          isFirst = false;\n        });\n\n        if (basePoints.length) {\n          for (let i = basePoints.length - 1; i >= 0; i--) {\n            path.lineTo(basePoints[i].x, basePoints[i].y);\n          }\n\n          path.closePath();\n        }\n      }\n    };\n\n    if (attribute.points) {\n      parsePoints(attribute.points);\n    } else if (segments && segments.length) {\n      segments.forEach(seg => {\n        parsePoints(seg.points);\n      });\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Area({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Area.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArea(attributes: IAreaGraphicAttribute): IArea {\n  return new Area(attributes);\n}\n"]}
+{"version":3,"sources":["../src/graphic/area.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,mBAAmB,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,sBAAsB,CAAC,CAAC;AAE3G,MAAM,OAAO,IAAK,SAAQ,OAA8B;IAWtD,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;QAXhB,SAAI,GAAW,MAAM,CAAC;QAYpB,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;IACrC,CAAC;IAED,OAAO;QACL,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC5C,CAAC;IACO,QAAQ;QACd,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC5C,IAAI,QAAQ,EAAE;YACZ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,MAAM,EAAE;YACjB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,eAAe;QACb,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IAC7B,CAAC;IAES,gBAAgB,CACxB,SAAgC,EAChC,SAA0C,EAC1C,UAAuB;QAEvB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YAClF,OAAO,UAAU,CAAC;SACnB;QACD,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAAE;YAC/C,SAAS,CAAC,QAAQ;gBAChB,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;gBACvE,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;SACzE;QACD,WAAW,CAAC,cAAc,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAW5D,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;QACpD,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,KAAK,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7G,OAAO,UAAU,CAAC;IACpB,CAAC;IAES,4BAA4B,CACpC,SAAgC,EAChC,SAA0C,EAC1C,UAAuB,EACvB,OAAe;QAEf,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;QAChD,MAAM,CAAC,GAAG,UAAU,CAAC;QACrB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;YACjB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,EAAE,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IACS,8BAA8B,CACtC,SAAgC,EAChC,SAA0C,EAC1C,UAAuB,EACvB,OAAe;QAEf,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;QACpD,MAAM,CAAC,GAAG,UAAU,CAAC;QACrB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChB,CAAC,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,EAAE,MAAA,CAAC,CAAC,EAAE,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IAES,YAAY,CAAC,GAAW,EAAE,KAAa,EAAE,WAAgB,EAAE,WAAgB,EAAE,cAAmB;QACxG,IAAI,GAAG,KAAK,QAAQ,EAAE;YACnB,cAAsB,CAAC,MAAM,GAAG,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;SACvF;IACH,CAAC;IAES,cAAc,CAAC,IAAc;QACrC,OAAO,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC;IACS,aAAa,CAAC,GAAW;QACjC,OAAO,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IACvD,CAAC;IAED,YAAY;QACV,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QAEpC,MAAM,WAAW,GAAG,CAAC,MAAoB,EAAE,EAAE;YAC3C,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;gBAC3B,IAAI,OAAO,GAAG,IAAI,CAAC;gBACnB,MAAM,UAAU,GAAiB,EAAE,CAAC;gBACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;oBACrB,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,EAAE;wBAC3B,OAAO;qBACR;oBACD,IAAI,OAAO,EAAE;wBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;qBAC/B;yBAAM;wBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;qBAC/B;oBACD,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAA,KAAK,CAAC,EAAE,mCAAI,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,MAAA,KAAK,CAAC,EAAE,mCAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBAEpE,OAAO,GAAG,KAAK,CAAC;gBAClB,CAAC,CAAC,CAAC;gBAEH,IAAI,UAAU,CAAC,MAAM,EAAE;oBACrB,KAAK,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBAC/C;oBAED,IAAI,CAAC,SAAS,EAAE,CAAC;iBAClB;aACF;QACH,CAAC,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC/B;aAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YACtC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,OAAO,IAAI,IAAI,mBAAM,IAAI,CAAC,SAAS,EAAG,CAAC;IACzC,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;;AAlKM,wBAAmB,mBACxB,QAAQ,EAAE,CAAC,EACX,SAAS,EAAE,CAAC,IACT,mBAAmB,EACtB;AAiKJ,MAAM,UAAU,UAAU,CAAC,UAAiC;IAC1D,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC","file":"area.js","sourcesContent":["import type { IAABBBounds, IPointLike } from '@visactor/vutils';\nimport type { IArea, IAreaCacheItem, IAreaGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { pointsInterpolation } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { AREA_NUMBER_TYPE } from './constants';\n\nconst AREA_UPDATE_TAG_KEY = ['segments', 'points', 'curveType', 'curveTension', ...GRAPHIC_UPDATE_TAG_KEY];\n\nexport class Area extends Graphic<IAreaGraphicAttribute> implements IArea {\n  type: 'area' = 'area';\n\n  static NOWORK_ANIMATE_ATTR = {\n    segments: 1,\n    curveType: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  cache?: IAreaCacheItem;\n\n  constructor(params: IAreaGraphicAttribute) {\n    super(params);\n    this.numberType = AREA_NUMBER_TYPE;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    if (this.pathProxy) {\n      return true;\n    }\n    const { points, segments } = this.attribute;\n    if (segments) {\n      if (segments.length === 0) {\n        return false;\n      }\n      return true;\n    } else if (points) {\n      if (points.length === 0) {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n\n  getGraphicTheme(): Required<IAreaGraphicAttribute> {\n    return getTheme(this).area;\n  }\n\n  protected updateAABBBounds(\n    attribute: IAreaGraphicAttribute,\n    areaTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    if (!application.graphicService.validCheck(attribute, areaTheme, aabbBounds, this)) {\n      return aabbBounds;\n    }\n    if (!this.updatePathProxyAABBBounds(aabbBounds)) {\n      attribute.segments\n        ? this.updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds)\n        : this.updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds);\n    }\n    application.graphicService.updateTempAABBBounds(aabbBounds);\n    // if (!this._rectBoundsContribitions) {\n    //   this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || [];\n    // }\n    // this._rectBoundsContribitions.length &&\n    //   this._rectBoundsContribitions.forEach(c => {\n    //     c.updateBounds(attribute, areaTheme, tb1, graphic);\n    //     aabbBounds.union(tb1);\n    //     tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n    //   });\n\n    const { lineJoin = areaTheme.lineJoin } = attribute;\n    application.graphicService.transformAABBBounds(attribute, aabbBounds, areaTheme, lineJoin === 'miter', this);\n    return aabbBounds;\n  }\n\n  protected updateAreaAABBBoundsByPoints(\n    attribute: IAreaGraphicAttribute,\n    areaTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArea\n  ): IAABBBounds {\n    const { points = areaTheme.points } = attribute;\n    const b = aabbBounds;\n    points.forEach(p => {\n      b.add(p.x, p.y);\n      b.add(p.x1 ?? p.x, p.y1 ?? p.y); //面积图特殊性：由三个值构成，横向面积图，x1会省略；纵向面积图，y1会省略\n    });\n    return b;\n  }\n  protected updateAreaAABBBoundsBySegments(\n    attribute: IAreaGraphicAttribute,\n    areaTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArea\n  ): IAABBBounds {\n    const { segments = areaTheme.segments } = attribute;\n    const b = aabbBounds;\n    segments.forEach(s => {\n      s.points.forEach(p => {\n        b.add(p.x, p.y);\n        b.add(p.x1 ?? p.x, p.y1 ?? p.y); //面积图特殊性：由三个值构成，横向面积图，x1会省略；纵向面积图，y1会省略\n      });\n    });\n    return b;\n  }\n\n  protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void {\n    if (key === 'points') {\n      (nextAttributes as any).points = pointsInterpolation(lastStepVal, nextStepVal, ratio);\n    }\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return super.needUpdateTags(keys, AREA_UPDATE_TAG_KEY);\n  }\n  protected needUpdateTag(key: string): boolean {\n    return super.needUpdateTag(key, AREA_UPDATE_TAG_KEY);\n  }\n\n  toCustomPath() {\n    const path = new CustomPath2D();\n    const attribute = this.attribute;\n    const segments = attribute.segments;\n\n    const parsePoints = (points: IPointLike[]) => {\n      if (points && points.length) {\n        let isFirst = true;\n        const basePoints: IPointLike[] = [];\n        points.forEach(point => {\n          if (point.defined === false) {\n            return;\n          }\n          if (isFirst) {\n            path.moveTo(point.x, point.y);\n          } else {\n            path.lineTo(point.x, point.y);\n          }\n          basePoints.push({ x: point.x1 ?? point.x, y: point.y1 ?? point.y });\n\n          isFirst = false;\n        });\n\n        if (basePoints.length) {\n          for (let i = basePoints.length - 1; i >= 0; i--) {\n            path.lineTo(basePoints[i].x, basePoints[i].y);\n          }\n\n          path.closePath();\n        }\n      }\n    };\n\n    if (attribute.points) {\n      parsePoints(attribute.points);\n    } else if (segments && segments.length) {\n      segments.forEach(seg => {\n        parsePoints(seg.points);\n      });\n    }\n\n    return path;\n  }\n\n  clone() {\n    return new Area({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Area.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createArea(attributes: IAreaGraphicAttribute): IArea {\n  return new Area(attributes);\n}\n"]}

package/es/graphic/builtin-symbol/index.d.ts

@@ -1,5 +1,5 @@
 import type { ISymbolClass } from '../../interface';
-export declare const builtinSymbols: (import("./circle").CircleSymbol | import("./cross").CrossSymbol | import("./diamond").DiamondSymbol | import("./square").SquareSymbol | import("./triangle-up").TriangleUpSymbol | import("./star").StarSymbol | import("./arrow").ArrowSymbol | import("./wedge").WedgeSymbol | import("./stroke").StrokeSymbol | import("./wye").WyeSymbol | import("./triangle-left").TriangleLeftSymbol | import("./triangle-right").TriangleRightSymbol | import("./triangle-down").TriangleDownSymbol | import("./arrow2-left").Arrow2LeftSymbol | import("./arrow2-right").Arrow2RightSymbol | import("./arrow2-up").Arrow2UpSymbol | import("./arrow2-down").Arrow2DownSymbol | import("./line-v").LineVSymbol | import("./line-h").LineHSymbol | import("./close").CloseSymbol | import("./rect").RectSymbol)[];
+export declare const builtinSymbols: (import("./circle").CircleSymbol | import("./cross").CrossSymbol | import("./diamond").DiamondSymbol | import("./square").SquareSymbol | import("./triangle-up").TriangleUpSymbol | import("./star").StarSymbol | import("./arrow").ArrowSymbol | import("./wedge").WedgeSymbol | import("./stroke").StrokeSymbol | import("./wye").WyeSymbol | import("./triangle-left").TriangleLeftSymbol | import("./triangle-right").TriangleRightSymbol | import("./triangle-down").TriangleDownSymbol | import("./thin-triangle").ThinTriangleSymbol | import("./arrow2-left").Arrow2LeftSymbol | import("./arrow2-right").Arrow2RightSymbol | import("./arrow2-up").Arrow2UpSymbol | import("./arrow2-down").Arrow2DownSymbol | import("./line-v").LineVSymbol | import("./line-h").LineHSymbol | import("./close").CloseSymbol | import("./rect").RectSymbol)[];
 export declare const builtinSymbolsMap: Record<string, ISymbolClass>;
 export declare const builtInSymbolStrMap: Record<string, string>;
 export * from './utils';

package/es/graphic/builtin-symbol/thin-triangle.d.ts

@@ -1,7 +1,7 @@
 import type { IContext2d, SymbolType, ISymbolClass } from '../../interface';
-import { TriangleUpSymbol } from './triangle-up';
+import { BaseSymbol } from './base';
 export declare function thinTriangle(ctx: IContext2d, r: number, x: number, y: number): boolean;
-export declare class ThinTriangleSymbol extends TriangleUpSymbol implements ISymbolClass {
+export declare class ThinTriangleSymbol extends BaseSymbol implements ISymbolClass {
     type: SymbolType;
     pathStr: string;
     draw(ctx: IContext2d, size: number, x: number, y: number): boolean;

package/es/graphic/builtin-symbol/thin-triangle.js

@@ -1,6 +1,6 @@
 import { sqrt } from "@visactor/vutils";
 
-import { TriangleUpSymbol } from "./triangle-up";
+import { BaseSymbol } from "./base";
 
 const sqrt3 = sqrt(3);
 
@@ -10,7 +10,7 @@ export function thinTriangle(ctx, r, x, y) {
     ctx.closePath(), !0;
 }
 
-export class ThinTriangleSymbol extends TriangleUpSymbol {
+export class ThinTriangleSymbol extends BaseSymbol {
     constructor() {
         super(...arguments), this.type = "thinTriangle", this.pathStr = "M0,-0.5773502691896257L-0.5,0.28867513459481287L0.5,0.28867513459481287Z";
     }

package/es/graphic/builtin-symbol/thin-triangle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/builtin-symbol/thin-triangle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAqB5D,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEtB,MAAM,UAAU,YAAY,CAAC,GAAe,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;IAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACpB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IAAxD;;QACE,SAAI,GAAe,cAAc,CAAC;QAClC,YAAO,GAAW,0EAA0E,CAAC;IAW/F,CAAC;IATC,IAAI,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACtD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC;QAC3B,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,UAAU,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;QAC5E,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;QACpC,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;CACF;AAED,eAAe,IAAI,kBAAkB,EAAE,CAAC","file":"thin-triangle.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport { sqrt } from '@visactor/vutils';\nimport type { IContext2d, SymbolType, ISymbolClass } from '../../interface';\nimport { trianglUp, TriangleUpSymbol } from './triangle-up';\n\n/**\n * \n *Copyright 2010-2021 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// 借鉴自d3\n// https://github.com/d3/d3-shape/blob/main/src/symbol/triangle.js\n\nconst sqrt3 = sqrt(3);\n\nexport function thinTriangle(ctx: IContext2d, r: number, x: number, y: number) {\n  const h = r * sqrt3;\n  ctx.moveTo(x, y + (-h / 3) * 2);\n  ctx.lineTo(r + x, y + h);\n  ctx.lineTo(x - r, y + h);\n  ctx.closePath();\n  return true;\n}\n\nexport class ThinTriangleSymbol extends TriangleUpSymbol implements ISymbolClass {\n  type: SymbolType = 'thinTriangle';\n  pathStr: string = 'M0,-0.5773502691896257L-0.5,0.28867513459481287L0.5,0.28867513459481287Z';\n\n  draw(ctx: IContext2d, size: number, x: number, y: number) {\n    const r = size / 2 / sqrt3;\n    return thinTriangle(ctx, r, x, y);\n  }\n\n  drawOffset(ctx: IContext2d, size: number, x: number, y: number, offset: number) {\n    const r = size / 2 / sqrt3 + offset;\n    return thinTriangle(ctx, r, x, y);\n  }\n}\n\nexport default new ThinTriangleSymbol();\n"]}
+{"version":3,"sources":["../src/graphic/builtin-symbol/thin-triangle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAqBpC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEtB,MAAM,UAAU,YAAY,CAAC,GAAe,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;IAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACpB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IAAlD;;QACE,SAAI,GAAe,cAAc,CAAC;QAClC,YAAO,GAAW,0EAA0E,CAAC;IAW/F,CAAC;IATC,IAAI,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACtD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC;QAC3B,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,UAAU,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;QAC5E,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;QACpC,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;CACF;AAED,eAAe,IAAI,kBAAkB,EAAE,CAAC","file":"thin-triangle.js","sourcesContent":["import { sqrt } from '@visactor/vutils';\nimport type { IContext2d, SymbolType, ISymbolClass } from '../../interface';\nimport { BaseSymbol } from './base';\n\n/**\n * \n *Copyright 2010-2021 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// 借鉴自d3\n// https://github.com/d3/d3-shape/blob/main/src/symbol/triangle.js\n\nconst sqrt3 = sqrt(3);\n\nexport function thinTriangle(ctx: IContext2d, r: number, x: number, y: number) {\n  const h = r * sqrt3;\n  ctx.moveTo(x, y + (-h / 3) * 2);\n  ctx.lineTo(r + x, y + h);\n  ctx.lineTo(x - r, y + h);\n  ctx.closePath();\n  return true;\n}\n\nexport class ThinTriangleSymbol extends BaseSymbol implements ISymbolClass {\n  type: SymbolType = 'thinTriangle';\n  pathStr: string = 'M0,-0.5773502691896257L-0.5,0.28867513459481287L0.5,0.28867513459481287Z';\n\n  draw(ctx: IContext2d, size: number, x: number, y: number) {\n    const r = size / 2 / sqrt3;\n    return thinTriangle(ctx, r, x, y);\n  }\n\n  drawOffset(ctx: IContext2d, size: number, x: number, y: number, offset: number) {\n    const r = size / 2 / sqrt3 + offset;\n    return thinTriangle(ctx, r, x, y);\n  }\n}\n\nexport default new ThinTriangleSymbol();\n"]}

package/es/graphic/builtin-symbol/triangle-down.d.ts

@@ -1,7 +1,6 @@
 import type { IContext2d, SymbolType, ISymbolClass } from '../../interface';
 import { BaseSymbol } from './base';
-export declare function trianglDown(ctx: IContext2d, r: number, x: number, y: number): boolean;
-export declare function trianglDownOffset(ctx: IContext2d, r: number, x: number, y: number, offset: number): boolean;
+export declare function trianglDownOffset(ctx: IContext2d, r: number, x: number, y: number, offset?: number): boolean;
 export declare class TriangleDownSymbol extends BaseSymbol implements ISymbolClass {
     type: SymbolType;
     pathStr: string;

package/es/graphic/builtin-symbol/triangle-down.js

@@ -1,11 +1,6 @@
 import { BaseSymbol } from "./base";
 
-export function trianglDown(ctx, r, x, y) {
-    return ctx.moveTo(x - r, y - r), ctx.lineTo(x + r, y - r), ctx.lineTo(x, y + r), 
-    ctx.closePath(), !0;
-}
-
-export function trianglDownOffset(ctx, r, x, y, offset) {
+export function trianglDownOffset(ctx, r, x, y, offset = 0) {
     return ctx.moveTo(x - r - 2 * offset, y - r - offset), ctx.lineTo(x + r + 2 * offset, y - r - offset), 
     ctx.lineTo(x, y + r + 2 * offset), ctx.closePath(), !0;
 }
@@ -15,7 +10,7 @@ export class TriangleDownSymbol extends BaseSymbol {
         super(...arguments), this.type = "triangleDown", this.pathStr = "M-0.5,-0.5 L0.5,-0.5 L0,0.5 Z";
     }
     draw(ctx, size, x, y) {
-        return trianglDown(ctx, size / 2, x, y);
+        return trianglDownOffset(ctx, size / 2, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
         return trianglDownOffset(ctx, size / 2, x, y, offset);

package/es/graphic/builtin-symbol/triangle-down.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/builtin-symbol/triangle-down.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAqBpC,MAAM,UAAU,WAAW,CAAC,GAAe,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;IAC1E,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACrB,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAe,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;IAChG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;IAClC,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAGD,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IAAlD;;QACE,SAAI,GAAe,cAAc,CAAC;QAClC,YAAO,GAAW,+BAA+B,CAAC;IAWpD,CAAC;IATC,IAAI,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACtD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,UAAU,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;QAC5E,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;CACF;AAED,eAAe,IAAI,kBAAkB,EAAE,CAAC","file":"triangle-down.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport type { IContext2d, SymbolType, ISymbolClass } from '../../interface';\nimport { BaseSymbol } from './base';\n\n/**\n * \n *Copyright 2010-2021 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// 借鉴自d3\n// https://github.com/d3/d3-shape/blob/main/src/symbol/triangle.js\n\nexport function trianglDown(ctx: IContext2d, r: number, x: number, y: number) {\n  ctx.moveTo(x - r, y - r);\n  ctx.lineTo(x + r, y - r);\n  ctx.lineTo(x, y + r);\n  ctx.closePath();\n  return true;\n}\n\nexport function trianglDownOffset(ctx: IContext2d, r: number, x: number, y: number, offset: number) {\n  ctx.moveTo(x - r - offset * 2, y - r - offset);\n  ctx.lineTo(x + r + offset * 2, y - r - offset);\n  ctx.lineTo(x, y + r + offset * 2);\n  ctx.closePath();\n  return true;\n}\n\n// 以中心为锚点，size为circle外接正方形的面积\nexport class TriangleDownSymbol extends BaseSymbol implements ISymbolClass {\n  type: SymbolType = 'triangleDown';\n  pathStr: string = 'M-0.5,-0.5 L0.5,-0.5 L0,0.5 Z';\n\n  draw(ctx: IContext2d, size: number, x: number, y: number) {\n    const r = size / 2;\n    return trianglDown(ctx, r, x, y);\n  }\n\n  drawOffset(ctx: IContext2d, size: number, x: number, y: number, offset: number) {\n    const r = size / 2;\n    return trianglDownOffset(ctx, r, x, y, offset);\n  }\n}\n\nexport default new TriangleDownSymbol();\n"]}
+{"version":3,"sources":["../src/graphic/builtin-symbol/triangle-down.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAoBpC,MAAM,UAAU,iBAAiB,CAAC,GAAe,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,SAAiB,CAAC;IACpG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;IAClC,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAGD,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IAAlD;;QACE,SAAI,GAAe,cAAc,CAAC;QAClC,YAAO,GAAW,+BAA+B,CAAC;IAWpD,CAAC;IATC,IAAI,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACtD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,UAAU,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;QAC5E,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;CACF;AAED,eAAe,IAAI,kBAAkB,EAAE,CAAC","file":"triangle-down.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport type { IContext2d, SymbolType, ISymbolClass } from '../../interface';\nimport { BaseSymbol } from './base';\n\n/**\n * \n *Copyright 2010-2021 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// 借鉴自d3\n// https://github.com/d3/d3-shape/blob/main/src/symbol/triangle.js\nexport function trianglDownOffset(ctx: IContext2d, r: number, x: number, y: number, offset: number = 0) {\n  ctx.moveTo(x - r - offset * 2, y - r - offset);\n  ctx.lineTo(x + r + offset * 2, y - r - offset);\n  ctx.lineTo(x, y + r + offset * 2);\n  ctx.closePath();\n  return true;\n}\n\n// 以中心为锚点，size为circle外接正方形的面积\nexport class TriangleDownSymbol extends BaseSymbol implements ISymbolClass {\n  type: SymbolType = 'triangleDown';\n  pathStr: string = 'M-0.5,-0.5 L0.5,-0.5 L0,0.5 Z';\n\n  draw(ctx: IContext2d, size: number, x: number, y: number) {\n    const r = size / 2;\n    return trianglDownOffset(ctx, r, x, y);\n  }\n\n  drawOffset(ctx: IContext2d, size: number, x: number, y: number, offset: number) {\n    const r = size / 2;\n    return trianglDownOffset(ctx, r, x, y, offset);\n  }\n}\n\nexport default new TriangleDownSymbol();\n"]}

package/es/graphic/builtin-symbol/triangle-left.d.ts

@@ -1,6 +1,5 @@
 import type { IContext2d, SymbolType, ISymbolClass } from '../../interface';
 import { BaseSymbol } from './base';
-export declare function trianglLeft(ctx: IContext2d, r: number, x: number, y: number): boolean;
 export declare function trianglLeftOffset(ctx: IContext2d, r: number, x: number, y: number, offset: number): boolean;
 export declare class TriangleLeftSymbol extends BaseSymbol implements ISymbolClass {
     type: SymbolType;

package/es/graphic/builtin-symbol/triangle-left.js

@@ -1,10 +1,5 @@
 import { BaseSymbol } from "./base";
 
-export function trianglLeft(ctx, r, x, y) {
-    return ctx.moveTo(-r + x, y), ctx.lineTo(r + x, r + y), ctx.lineTo(r + x, y - r), 
-    ctx.closePath(), !0;
-}
-
 export function trianglLeftOffset(ctx, r, x, y, offset) {
     return ctx.moveTo(-r + x - 2 * offset, y), ctx.lineTo(r + x + offset, r + y + 2 * offset), 
     ctx.lineTo(r + x + offset, y - r - 2 * offset), ctx.closePath(), !0;
@@ -15,7 +10,7 @@ export class TriangleLeftSymbol extends BaseSymbol {
         super(...arguments), this.type = "triangleLeft", this.pathStr = "M-0.5,0 L0.5,0.5 L0.5,-0.5 Z";
     }
     draw(ctx, size, x, y) {
-        return trianglLeft(ctx, size / 2, x, y);
+        return trianglLeftOffset(ctx, size / 2, x, y, 0);
     }
     drawOffset(ctx, size, x, y, offset) {
         return trianglLeftOffset(ctx, size / 2, x, y, offset);