@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/cjs/render/contributions/render/richtext-render.js

@@ -10,14 +10,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasRichTextRender = void 0;
 
-const inversify_1 = require("inversify"), common_1 = require("../../../common"), graphic_1 = require("../../../graphic"), utils_1 = require("./utils");
+const inversify_1 = require("inversify"), rect_1 = require("../../../common/shape/rect"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), utils_1 = require("./utils");
 
 let DefaultCanvasRichTextRender = class {
     constructor() {
-        this.numberType = graphic_1.RICHTEXT_NUMBER_TYPE;
+        this.numberType = constants_1.RICHTEXT_NUMBER_TYPE;
     }
     drawShape(richtext, context, x, y, drawContext) {
-        const richtextAttribute = (0, graphic_1.getTheme)(richtext).richtext, {width: width = richtextAttribute.width, height: height = richtextAttribute.height, opacity: opacity = richtextAttribute.opacity, fillOpacity: fillOpacity = richtextAttribute.fillOpacity, visible: visible = richtextAttribute.visible} = richtext.attribute;
+        const richtextAttribute = (0, theme_1.getTheme)(richtext).richtext, {width: width = richtextAttribute.width, height: height = richtextAttribute.height, opacity: opacity = richtextAttribute.opacity, fillOpacity: fillOpacity = richtextAttribute.fillOpacity, visible: visible = richtextAttribute.visible} = richtext.attribute;
         if (!richtext.valid || !visible) return;
         if (!(0, utils_1.fillVisible)(opacity, fillOpacity)) return;
         context.translate(x, y);
@@ -25,11 +25,11 @@ let DefaultCanvasRichTextRender = class {
     }
     drawIcon(icon, context, x, y, baseline) {
         var _a;
-        const richtextIconAttribute = (0, graphic_1.getTheme)(icon).richtextIcon, {width: width = richtextIconAttribute.width, height: height = richtextIconAttribute.height, opacity: opacity = richtextIconAttribute.opacity, image: url, backgroundFill: backgroundFill = richtextIconAttribute.backgroundFill, backgroundFillColor: backgroundFillColor = richtextIconAttribute.backgroundFillColor, backgroundFillOpacity: backgroundFillOpacity = richtextIconAttribute.backgroundFillOpacity, backgroundStroke: backgroundStroke = richtextIconAttribute.backgroundStroke, backgroundStrokeColor: backgroundStrokeColor = richtextIconAttribute.backgroundStrokeColor, backgroundStrokeOpacity: backgroundStrokeOpacity = richtextIconAttribute.backgroundStrokeOpacity, backgroundRadius: backgroundRadius = richtextIconAttribute.backgroundRadius, margin: margin} = icon.attribute, {backgroundWidth: backgroundWidth = width, backgroundHeight: backgroundHeight = height} = icon.attribute;
+        const richtextIconAttribute = (0, theme_1.getTheme)(icon).richtextIcon, {width: width = richtextIconAttribute.width, height: height = richtextIconAttribute.height, opacity: opacity = richtextIconAttribute.opacity, image: url, backgroundFill: backgroundFill = richtextIconAttribute.backgroundFill, backgroundFillColor: backgroundFillColor = richtextIconAttribute.backgroundFillColor, backgroundFillOpacity: backgroundFillOpacity = richtextIconAttribute.backgroundFillOpacity, backgroundStroke: backgroundStroke = richtextIconAttribute.backgroundStroke, backgroundStrokeColor: backgroundStrokeColor = richtextIconAttribute.backgroundStrokeColor, backgroundStrokeOpacity: backgroundStrokeOpacity = richtextIconAttribute.backgroundStrokeOpacity, backgroundRadius: backgroundRadius = richtextIconAttribute.backgroundRadius, margin: margin} = icon.attribute, {backgroundWidth: backgroundWidth = width, backgroundHeight: backgroundHeight = height} = icon.attribute;
         if (margin && (x += icon._marginArray[3], y += icon._marginArray[0]), icon._hovered) {
             const expandX = (backgroundWidth - width) / 2, expandY = (backgroundHeight - height) / 2;
             0 === backgroundRadius ? (context.beginPath(), context.rect(x - expandX, y - expandY, backgroundWidth, backgroundHeight)) : (context.beginPath(), 
-            (0, common_1.createRectPath)(context, x - expandX, y - expandY, backgroundWidth, backgroundHeight, backgroundRadius)), 
+            (0, rect_1.createRectPath)(context, x - expandX, y - expandY, backgroundWidth, backgroundHeight, backgroundRadius)), 
             backgroundFill && (context.globalAlpha = backgroundFillOpacity, context.fillStyle = backgroundFillColor, 
             context.fill()), backgroundStroke && (context.globalAlpha = backgroundStrokeOpacity, 
             context.strokeStyle = backgroundStrokeColor, context.stroke());
@@ -41,7 +41,7 @@ let DefaultCanvasRichTextRender = class {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const richtextAttribute = (0, graphic_1.getTheme)(richtext).richtext;
+        const richtextAttribute = (0, theme_1.getTheme)(richtext).richtext;
         let {x: x = richtextAttribute.x, y: y = richtextAttribute.y} = richtext.attribute;
         if (richtext.transMatrix.onlyTranslate()) {
             const point = richtext.getOffsetXY(richtextAttribute);

package/cjs/render/contributions/render/richtext-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/richtext-render.ts"],"names":[],"mappings":"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","file":"richtext-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { createRectPath, parsePadding } from '../../../common';\nimport { getTheme, RICHTEXT_NUMBER_TYPE } from '../../../graphic';\nimport { IContext2d, IRichText, IRichTextIcon } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender } from './graphic-render';\nimport { fillVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasRichTextRender implements IGraphicRender {\n  type: 'richtext';\n  numberType: number = RICHTEXT_NUMBER_TYPE;\n\n  drawShape(richtext: IRichText, context: IContext2d, x: number, y: number, drawContext: IDrawContext) {\n    const richtextAttribute = getTheme(richtext).richtext;\n    const {\n      width = richtextAttribute.width,\n      height = richtextAttribute.height,\n      opacity = richtextAttribute.opacity,\n      fillOpacity = richtextAttribute.fillOpacity,\n      visible = richtextAttribute.visible\n    } = richtext.attribute;\n\n    if (!(richtext.valid && visible)) {\n      return;\n    }\n\n    const fVisible = fillVisible(opacity, fillOpacity);\n    if (!fVisible) {\n      return;\n    }\n\n    context.translate(x, y);\n    const frame = richtext.getFrameCache();\n    frame.draw(context, this.drawIcon);\n  }\n\n  drawIcon(icon: IRichTextIcon, context: IContext2d, x: number, y: number, baseline: number) {\n    const richtextIconAttribute = getTheme(icon).richtextIcon;\n\n    const {\n      width = richtextIconAttribute.width,\n      height = richtextIconAttribute.height,\n      opacity = richtextIconAttribute.opacity,\n      image: url,\n      backgroundFill = richtextIconAttribute.backgroundFill,\n      backgroundFillColor = richtextIconAttribute.backgroundFillColor,\n      backgroundFillOpacity = richtextIconAttribute.backgroundFillOpacity,\n      backgroundStroke = richtextIconAttribute.backgroundStroke,\n      backgroundStrokeColor = richtextIconAttribute.backgroundStrokeColor,\n      backgroundStrokeOpacity = richtextIconAttribute.backgroundStrokeOpacity,\n      backgroundRadius = richtextIconAttribute.backgroundRadius,\n      margin\n    } = icon.attribute;\n\n    const { backgroundWidth = width, backgroundHeight = height } = icon.attribute;\n\n    if (margin) {\n      x += icon._marginArray[3];\n      y += icon._marginArray[0];\n    }\n\n    // y -= height / 2 - baseline;\n\n    // 绘制background\n    if (icon._hovered) {\n      const expandX = (backgroundWidth - width) / 2;\n      const expandY = (backgroundHeight - height) / 2;\n\n      if (backgroundRadius === 0) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(x - expandX, y - expandY, backgroundWidth, backgroundHeight);\n      } else {\n        context.beginPath();\n        createRectPath(context, x - expandX, y - expandY, backgroundWidth, backgroundHeight, backgroundRadius);\n      }\n      if (backgroundFill) {\n        // context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.globalAlpha = backgroundFillOpacity;\n        context.fillStyle = backgroundFillColor as string;\n        context.fill();\n      }\n      if (backgroundStroke) {\n        // context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.globalAlpha = backgroundStrokeOpacity;\n        context.strokeStyle = backgroundStrokeColor as string;\n        context.stroke();\n      }\n    }\n\n    // 绘制图标\n    const res = url && icon?.resources?.get(url);\n    if (!res || res.state !== 'success') {\n      return;\n    }\n    // context.setCommonStyle(icon, icon.attribute, x, y, iconAttribute);\n    context.globalAlpha = opacity;\n    context.drawImage(res.data, x, y, width, height);\n  }\n\n  draw(richtext: IRichText, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const richtextAttribute = getTheme(richtext).richtext;\n    let { x = richtextAttribute.x, y = richtextAttribute.y } = richtext.attribute;\n\n    if (!richtext.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(richtext.transMatrix, true);\n    } else {\n      const point = richtext.getOffsetXY(richtextAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    this.drawShape(richtext, context, x, y, drawContext);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/richtext-render.ts"],"names":[],"mappings":"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","file":"richtext-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { getTheme } from '../../../graphic/theme';\nimport { RICHTEXT_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IContext2d, IRichText, IRichTextIcon } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender } from './graphic-render';\nimport { fillVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasRichTextRender implements IGraphicRender {\n  type: 'richtext';\n  numberType: number = RICHTEXT_NUMBER_TYPE;\n\n  drawShape(richtext: IRichText, context: IContext2d, x: number, y: number, drawContext: IDrawContext) {\n    const richtextAttribute = getTheme(richtext).richtext;\n    const {\n      width = richtextAttribute.width,\n      height = richtextAttribute.height,\n      opacity = richtextAttribute.opacity,\n      fillOpacity = richtextAttribute.fillOpacity,\n      visible = richtextAttribute.visible\n    } = richtext.attribute;\n\n    if (!(richtext.valid && visible)) {\n      return;\n    }\n\n    const fVisible = fillVisible(opacity, fillOpacity);\n    if (!fVisible) {\n      return;\n    }\n\n    context.translate(x, y);\n    const frame = richtext.getFrameCache();\n    frame.draw(context, this.drawIcon);\n  }\n\n  drawIcon(icon: IRichTextIcon, context: IContext2d, x: number, y: number, baseline: number) {\n    const richtextIconAttribute = getTheme(icon).richtextIcon;\n\n    const {\n      width = richtextIconAttribute.width,\n      height = richtextIconAttribute.height,\n      opacity = richtextIconAttribute.opacity,\n      image: url,\n      backgroundFill = richtextIconAttribute.backgroundFill,\n      backgroundFillColor = richtextIconAttribute.backgroundFillColor,\n      backgroundFillOpacity = richtextIconAttribute.backgroundFillOpacity,\n      backgroundStroke = richtextIconAttribute.backgroundStroke,\n      backgroundStrokeColor = richtextIconAttribute.backgroundStrokeColor,\n      backgroundStrokeOpacity = richtextIconAttribute.backgroundStrokeOpacity,\n      backgroundRadius = richtextIconAttribute.backgroundRadius,\n      margin\n    } = icon.attribute;\n\n    const { backgroundWidth = width, backgroundHeight = height } = icon.attribute;\n\n    if (margin) {\n      x += icon._marginArray[3];\n      y += icon._marginArray[0];\n    }\n\n    // y -= height / 2 - baseline;\n\n    // 绘制background\n    if (icon._hovered) {\n      const expandX = (backgroundWidth - width) / 2;\n      const expandY = (backgroundHeight - height) / 2;\n\n      if (backgroundRadius === 0) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(x - expandX, y - expandY, backgroundWidth, backgroundHeight);\n      } else {\n        context.beginPath();\n        createRectPath(context, x - expandX, y - expandY, backgroundWidth, backgroundHeight, backgroundRadius);\n      }\n      if (backgroundFill) {\n        // context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.globalAlpha = backgroundFillOpacity;\n        context.fillStyle = backgroundFillColor as string;\n        context.fill();\n      }\n      if (backgroundStroke) {\n        // context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.globalAlpha = backgroundStrokeOpacity;\n        context.strokeStyle = backgroundStrokeColor as string;\n        context.stroke();\n      }\n    }\n\n    // 绘制图标\n    const res = url && icon?.resources?.get(url);\n    if (!res || res.state !== 'success') {\n      return;\n    }\n    // context.setCommonStyle(icon, icon.attribute, x, y, iconAttribute);\n    context.globalAlpha = opacity;\n    context.drawImage(res.data, x, y, width, height);\n  }\n\n  draw(richtext: IRichText, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const richtextAttribute = getTheme(richtext).richtext;\n    let { x = richtextAttribute.x, y = richtextAttribute.y } = richtext.attribute;\n\n    if (!richtext.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(richtext.transMatrix, true);\n    } else {\n      const point = richtext.getOffsetXY(richtextAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    this.drawShape(richtext, context, x, y, drawContext);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

package/cjs/render/contributions/render/symbol-render.d.ts

@@ -1,4 +1,4 @@
-import { ContributionProvider } from '../../../common';
+import { ContributionProvider } from '../../../common/contribution-provider';
 import { IGraphicAttribute, IContext2d, IMarkAttribute, ISymbol, IThemeAttribute } from '../../../interface';
 import { IDrawContext, IRenderService } from '../../render-service';
 import { BaseRender } from './base-render';

package/cjs/render/contributions/render/symbol-render.js

@@ -16,15 +16,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasSymbolRender = void 0;
 
-const modules_1 = require("../../../modules"), inversify_1 = require("inversify"), common_1 = require("../../../common"), graphic_1 = require("../../../graphic"), base_render_1 = require("./base-render"), base_contribution_render_1 = require("./contributions/base-contribution-render"), symbol_contribution_render_1 = require("./contributions/symbol-contribution-render"), utils_1 = require("./utils");
+const matrix_allocate_1 = require("../../../allocator/matrix-allocate"), inversify_1 = require("inversify"), contribution_provider_1 = require("../../../common/contribution-provider"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), base_render_1 = require("./base-render"), base_contribution_render_1 = require("./contributions/base-contribution-render"), symbol_contribution_render_1 = require("./contributions/symbol-contribution-render"), utils_1 = require("./utils");
 
 let DefaultCanvasSymbolRender = class extends base_render_1.BaseRender {
     constructor(symbolRenderContribitions) {
-        super(), this.symbolRenderContribitions = symbolRenderContribitions, this.numberType = graphic_1.SYMBOL_NUMBER_TYPE;
+        super(), this.symbolRenderContribitions = symbolRenderContribitions, this.numberType = constants_1.SYMBOL_NUMBER_TYPE;
     }
     drawShape(symbol, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
-        const symbolAttribute = (0, graphic_1.getTheme)(symbol, null == params ? void 0 : params.theme).symbol, {size: size = symbolAttribute.size, fill: fill = (null == symbolAttribute.fill ? !!symbol.attribute.fillColor : symbolAttribute.fill), background: background, fillOpacity: fillOpacity = symbolAttribute.fillOpacity, strokeOpacity: strokeOpacity = symbolAttribute.strokeOpacity, opacity: opacity = symbolAttribute.opacity, lineWidth: lineWidth = symbolAttribute.lineWidth, stroke: stroke = (null == symbolAttribute.stroke ? !!symbol.attribute.strokeColor : symbolAttribute.stroke), visible: visible = symbolAttribute.visible} = symbol.attribute, fVisible = (0, 
+        const symbolAttribute = (0, theme_1.getTheme)(symbol, null == params ? void 0 : params.theme).symbol, {size: size = symbolAttribute.size, fill: fill = symbolAttribute.fill, background: background, fillOpacity: fillOpacity = symbolAttribute.fillOpacity, strokeOpacity: strokeOpacity = symbolAttribute.strokeOpacity, opacity: opacity = symbolAttribute.opacity, lineWidth: lineWidth = symbolAttribute.lineWidth, stroke: stroke = symbolAttribute.stroke, visible: visible = symbolAttribute.visible} = symbol.attribute, fVisible = (0, 
         utils_1.fillVisible)(opacity, fillOpacity), sVisible = (0, utils_1.strokeVisible)(opacity, strokeOpacity), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!symbol.valid || !visible) return;
@@ -52,14 +52,15 @@ let DefaultCanvasSymbolRender = class extends base_render_1.BaseRender {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const symbolAttribute = (0, graphic_1.getTheme)(symbol, null == params ? void 0 : params.theme).symbol, data = this.transform(symbol, symbolAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        const symbolAttribute = (0, theme_1.getTheme)(symbol, null == params ? void 0 : params.theme).symbol, data = this.transform(symbol, symbolAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
         this.z = z, (0, utils_1.drawPathProxy)(symbol, context, x, y, drawContext, params) || (this.drawShape(symbol, context, x, y, drawContext, params), 
-        this.z = 0, context.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(context.modelMatrix), 
+        this.z = 0, context.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(context.modelMatrix), 
         context.modelMatrix = lastModelMatrix), context.highPerformanceRestore();
     }
 };
 
 DefaultCanvasSymbolRender = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(symbol_contribution_render_1.SymbolRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasSymbolRender), 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
+inversify_1.named)(symbol_contribution_render_1.SymbolRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasSymbolRender), 
 exports.DefaultCanvasSymbolRender = DefaultCanvasSymbolRender;
 //# sourceMappingURL=symbol-render.js.map

package/cjs/render/contributions/render/symbol-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":"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","file":"symbol-render.js","sourcesContent":["import { mat4Allocate } from '../../../modules';\nimport { inject, injectable, named } from 'inversify';\nimport { ContributionProvider } from '../../../common';\nimport { getTheme, SYMBOL_NUMBER_TYPE } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, ISymbol, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { ISymbolRenderContribution, SymbolRenderContribution } from './contributions/symbol-contribution-render';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n  declare z: number;\n\n  protected _symbolRenderContribitions: ISymbolRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(SymbolRenderContribution)\n    protected readonly symbolRenderContribitions: ContributionProvider<ISymbolRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      fill = symbolAttribute.fill == null ? !!symbol.attribute.fillColor : symbolAttribute.fill,\n      background,\n      fillOpacity = symbolAttribute.fillOpacity,\n      strokeOpacity = symbolAttribute.strokeOpacity,\n      opacity = symbolAttribute.opacity,\n      lineWidth = symbolAttribute.lineWidth,\n      stroke = symbolAttribute.stroke == null ? !!symbol.attribute.strokeColor : symbolAttribute.stroke,\n      visible = symbolAttribute.visible\n    } = symbol.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(symbol.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n    if (keepDirIn3d && context.camera && context.project) {\n      const p = context.project(x, y, z);\n      const camera = context.camera;\n      context.camera = null;\n      if (parsedPath.draw(context, size, p.x, p.y) === false) {\n        context.closePath();\n      }\n      context.camera = camera;\n    } else {\n      if (parsedPath.draw(context, size, x, y, z) === false) {\n        context.closePath();\n      }\n    }\n\n    if (!this._symbolRenderContribitions) {\n      this._symbolRenderContribitions = this.symbolRenderContribitions.getContributions() || [];\n      this._symbolRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        context.stroke();\n      }\n    }\n\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // const transMatrix = symbol.transMatrix;\n    // const onlyTranslate = transMatrix.onlyTranslate();\n    // // 只有translate，那么不设置矩阵，通过xy进行偏移\n    // if (onlyTranslate) {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   context.setTransformForCurrent();\n    // } else {\n    //   // 如果存在translate，那么存在三种情况：不需要设置2d矩阵，需要设置2d矩阵，需要修改2d矩阵然后设置\n    //   // 1. 如果通过3d变换绘制，那么也不需要设置矩阵\n    //   // 2. 如果缩放等操作依然通过\n\n    //   const { keepDirIn3d = symbolAttribute.keepDirIn3d, scaleX, scaleY, z } = symbol.attribute;\n    //   if (context.camera && context.project) {\n    //     // 如果保持3d视角，那么需要设置2d矩阵，但是需要进行修改，因为通过投影改变位置，但是需要进行2d缩放和旋转变换\n    //     if (keepDirIn3d) {\n    //       const p = context.project(x, y, z);\n    //       context.translate(p.x, p.y, false);\n    //       context.scale(scaleX, scaleY, false);\n    //       context.rotate(scaleX, false)\n    //       context.translate(-p.x, -p.y, false);\n    //       context.setTransformForCurrent();\n    //     } else { // 不保持3d视角，所有变换均通过3d矩阵完成，不需要2d的矩阵\n    //       context.setTransform(1, 0, 0, 1, 0, 0, true);\n    //     }\n    //   } else {\n    //     // 直接设置矩阵即可\n    //     // 性能较差\n    //     x = 0;\n    //     y = 0;\n    //     context.transformFromMatrix(symbol.transMatrix, true);\n    //   }\n    // }\n\n    const data = this.transform(symbol, symbolAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(symbol, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(symbol, context, x, y, drawContext, params);\n    this.z = 0;\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wEAAkE;AAClE,yCAAsD;AACtD,iFAA6E;AAC7E,kDAAkD;AAClD,0DAAgE;AAGhE,+CAA2C;AAC3C,uFAAsF;AACtF,2FAAiH;AAEjH,mCAAwF;AAGjF,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,wBAAmB;IAOhE,YAGqB,yBAA0E;QAE7F,KAAK,EAAE,CAAC;QAFW,8BAAyB,GAAzB,yBAAyB,CAAiD;QAR/F,eAAU,GAAW,8BAAkB,CAAC;IAWxC,CAAC;IAED,SAAS,CACP,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAGZ,MAAM,eAAe,GAAG,IAAA,gBAAQ,EAAC,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,MAAM,CAAC;QAE/D,MAAM,EACJ,IAAI,GAAG,eAAe,CAAC,IAAI,EAC3B,IAAI,GAAG,eAAe,CAAC,IAAI,EAC3B,UAAU,EACV,WAAW,GAAG,eAAe,CAAC,WAAW,EACzC,aAAa,GAAG,eAAe,CAAC,aAAa,EAC7C,OAAO,GAAG,eAAe,CAAC,OAAO,EACjC,SAAS,GAAG,eAAe,CAAC,SAAS,EACrC,MAAM,GAAG,eAAe,CAAC,MAAM,EAC/B,OAAO,GAAG,eAAe,CAAC,OAAO,EAClC,GAAG,MAAM,CAAC,SAAS,CAAC;QAGrB,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAA,iBAAS,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAE9C,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,EAAE;YAC9B,OAAO;SACR;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,QAAQ,IAAI,UAAU,CAAC,EAAE;YACvC,OAAO;SACR;QAGD,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,IAAI,UAAU,CAAC,EAAE;YAC/D,OAAO;SACR;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QAE1C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,MAAM,EAAE,WAAW,GAAG,eAAe,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QACvE,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,CAAC,mCAAI,CAAC,CAAC;QACtB,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,WAAW,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACpD,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;YACtB,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;gBACtD,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;YACD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;SACzB;aAAM;YACL,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE;gBACrD,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;SACF;QAED,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE;YACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;YAC1F,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;SACnE;QACD,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,qDAA0B,CAAC,gBAAgB,EAAE;gBAE1D,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;aAC7G;QACH,CAAC,CAAC,CAAC;QAYH,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAE5F,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;aACpD;iBAAM,IAAI,QAAQ,EAAE;gBACnB,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;gBACxE,OAAO,CAAC,IAAI,EAAE,CAAC;aAChB;SACF;QACD,IAAI,QAAQ,EAAE;YACZ,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;aACtD;iBAAM,IAAI,QAAQ,EAAE;gBACnB,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;gBACxE,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;QAED,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,qDAA0B,CAAC,eAAe,EAAE;gBACzD,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;aAC7G;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAe,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC/G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAG9B,MAAM,eAAe,GAAG,IAAA,gBAAQ,EAAC,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,MAAM,CAAC;QAuC/D,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAE1C,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,IAAA,qBAAa,EAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;YAC7D,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACjC,OAAO;SACR;QAED,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,OAAO,CAAC,WAAW,KAAK,eAAe,EAAE;YAC3C,8BAAY,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACxC;QACD,OAAO,CAAC,WAAW,GAAG,eAAe,CAAC;QAEtC,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACnC,CAAC;CACF,CAAA;AA5MY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;IASR,WAAA,IAAA,kBAAM,EAAC,4CAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,iBAAK,EAAC,qDAAwB,CAAC,CAAA;;GATvB,yBAAyB,CA4MrC;AA5MY,8DAAyB","file":"symbol-render.js","sourcesContent":["import { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { inject, injectable, named } from 'inversify';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { getTheme } from '../../../graphic/theme';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, ISymbol, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { ISymbolRenderContribution, SymbolRenderContribution } from './contributions/symbol-contribution-render';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\n\n@injectable()\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n  declare z: number;\n\n  protected _symbolRenderContribitions: ISymbolRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(SymbolRenderContribution)\n    protected readonly symbolRenderContribitions: ContributionProvider<ISymbolRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      fill = symbolAttribute.fill,\n      background,\n      fillOpacity = symbolAttribute.fillOpacity,\n      strokeOpacity = symbolAttribute.strokeOpacity,\n      opacity = symbolAttribute.opacity,\n      lineWidth = symbolAttribute.lineWidth,\n      stroke = symbolAttribute.stroke,\n      visible = symbolAttribute.visible\n    } = symbol.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(symbol.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n    if (keepDirIn3d && context.camera && context.project) {\n      const p = context.project(x, y, z);\n      const camera = context.camera;\n      context.camera = null;\n      if (parsedPath.draw(context, size, p.x, p.y) === false) {\n        context.closePath();\n      }\n      context.camera = camera;\n    } else {\n      if (parsedPath.draw(context, size, x, y, z) === false) {\n        context.closePath();\n      }\n    }\n\n    if (!this._symbolRenderContribitions) {\n      this._symbolRenderContribitions = this.symbolRenderContribitions.getContributions() || [];\n      this._symbolRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(symbol, symbol.attribute, symbolAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(symbol, symbol.attribute, x, y, symbolAttribute);\n        context.stroke();\n      }\n    }\n\n    this._symbolRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        c.drawShape(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // const transMatrix = symbol.transMatrix;\n    // const onlyTranslate = transMatrix.onlyTranslate();\n    // // 只有translate，那么不设置矩阵，通过xy进行偏移\n    // if (onlyTranslate) {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   context.setTransformForCurrent();\n    // } else {\n    //   // 如果存在translate，那么存在三种情况：不需要设置2d矩阵，需要设置2d矩阵，需要修改2d矩阵然后设置\n    //   // 1. 如果通过3d变换绘制，那么也不需要设置矩阵\n    //   // 2. 如果缩放等操作依然通过\n\n    //   const { keepDirIn3d = symbolAttribute.keepDirIn3d, scaleX, scaleY, z } = symbol.attribute;\n    //   if (context.camera && context.project) {\n    //     // 如果保持3d视角，那么需要设置2d矩阵，但是需要进行修改，因为通过投影改变位置，但是需要进行2d缩放和旋转变换\n    //     if (keepDirIn3d) {\n    //       const p = context.project(x, y, z);\n    //       context.translate(p.x, p.y, false);\n    //       context.scale(scaleX, scaleY, false);\n    //       context.rotate(scaleX, false)\n    //       context.translate(-p.x, -p.y, false);\n    //       context.setTransformForCurrent();\n    //     } else { // 不保持3d视角，所有变换均通过3d矩阵完成，不需要2d的矩阵\n    //       context.setTransform(1, 0, 0, 1, 0, 0, true);\n    //     }\n    //   } else {\n    //     // 直接设置矩阵即可\n    //     // 性能较差\n    //     x = 0;\n    //     y = 0;\n    //     context.transformFromMatrix(symbol.transMatrix, true);\n    //   }\n    // }\n\n    const data = this.transform(symbol, symbolAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(symbol, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(symbol, context, x, y, drawContext, params);\n    this.z = 0;\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

package/cjs/render/contributions/render/text-render.js

@@ -10,14 +10,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasTextRender = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), common_1 = require("../../../common"), utils_1 = require("./utils"), base_render_1 = require("./base-render");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), text_1 = require("../../../common/text"), utils_1 = require("./utils"), base_render_1 = require("./base-render");
 
 let DefaultCanvasTextRender = class extends base_render_1.BaseRender {
     constructor() {
-        super(...arguments), this.numberType = graphic_1.TEXT_NUMBER_TYPE;
+        super(...arguments), this.numberType = constants_1.TEXT_NUMBER_TYPE;
     }
     drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const textAttribute = (0, graphic_1.getTheme)(text, null == params ? void 0 : params.theme).text, {text: str, fill: fill = (null == textAttribute.fill ? !!text.attribute.fillColor : textAttribute.fill), stroke: stroke = (null == textAttribute.stroke ? !!text.attribute.strokeColor : textAttribute.stroke), fillOpacity: fillOpacity = textAttribute.fillOpacity, strokeOpacity: strokeOpacity = textAttribute.strokeOpacity, opacity: opacity = textAttribute.opacity, lineWidth: lineWidth = textAttribute.lineWidth, visible: visible = textAttribute.visible, underline: underline = textAttribute.underline, lineThrough: lineThrough = textAttribute.lineThrough, keepDirIn3d: keepDirIn3d = textAttribute.keepDirIn3d} = text.attribute, fVisible = (0, 
+        const textAttribute = (0, theme_1.getTheme)(text, null == params ? void 0 : params.theme).text, {text: str, fill: fill = textAttribute.fill, stroke: stroke = textAttribute.stroke, fillOpacity: fillOpacity = textAttribute.fillOpacity, strokeOpacity: strokeOpacity = textAttribute.strokeOpacity, opacity: opacity = textAttribute.opacity, lineWidth: lineWidth = textAttribute.lineWidth, visible: visible = textAttribute.visible, underline: underline = textAttribute.underline, lineThrough: lineThrough = textAttribute.lineThrough, keepDirIn3d: keepDirIn3d = textAttribute.keepDirIn3d} = text.attribute, fVisible = (0, 
         utils_1.fillVisible)(opacity, fillOpacity), sVisible = (0, utils_1.strokeVisible)(opacity, strokeOpacity), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!text.valid || !visible) return;
@@ -51,16 +51,16 @@ let DefaultCanvasTextRender = class extends base_render_1.BaseRender {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const textAttribute = (0, graphic_1.getTheme)(text, null == params ? void 0 : params.theme).text, {keepDirIn3d: keepDirIn3d = textAttribute.keepDirIn3d} = text.attribute, computed3dMatrix = !keepDirIn3d, data = this.transform(text, textAttribute, context, computed3dMatrix), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        const textAttribute = (0, theme_1.getTheme)(text, null == params ? void 0 : params.theme).text, {keepDirIn3d: keepDirIn3d = textAttribute.keepDirIn3d} = text.attribute, computed3dMatrix = !keepDirIn3d, data = this.transform(text, textAttribute, context, computed3dMatrix), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
         this.z = z, this.drawShape(text, context, x, y, drawContext, params), this.z = 0, 
         context.modelMatrix = lastModelMatrix, context.highPerformanceRestore();
     }
     drawUnderLine(underline, lineThrough, text, x, y, z, textAttribute, context) {
         if (lineThrough + underline <= 0) return;
-        const {textAlign: textAlign = textAttribute.textAlign, textBaseline: textBaseline = textAttribute.textBaseline, fontSize: fontSize = textAttribute.fontSize, fillColor: fillColor = textAttribute.fillColor, opacity: opacity = textAttribute.opacity, fillOpacity: fillOpacity = textAttribute.fillOpacity} = text.attribute, w = text.clipedWidth, offsetX = (0, 
-        common_1.textDrawOffsetX)(textAlign, w), offsetY = (0, common_1.textLayoutOffsetY)(textBaseline, fontSize), attribute = {
+        const {textAlign: textAlign = textAttribute.textAlign, textBaseline: textBaseline = textAttribute.textBaseline, fontSize: fontSize = textAttribute.fontSize, fill: fill = textAttribute.fill, opacity: opacity = textAttribute.opacity, fillOpacity: fillOpacity = textAttribute.fillOpacity} = text.attribute, w = text.clipedWidth, offsetX = (0, 
+        text_1.textDrawOffsetX)(textAlign, w), offsetY = (0, text_1.textLayoutOffsetY)(textBaseline, fontSize), attribute = {
             lineWidth: 0,
-            strokeColor: fillColor,
+            strokeColor: fill,
             opacity: opacity,
             strokeOpacity: fillOpacity
         };
@@ -79,10 +79,10 @@ let DefaultCanvasTextRender = class extends base_render_1.BaseRender {
     }
     drawMultiUnderLine(underline, lineThrough, text, x, y, z, w, textAttribute, context) {
         if (lineThrough + underline <= 0) return;
-        const {textAlign: textAlign = textAttribute.textAlign, fontSize: fontSize = textAttribute.fontSize, fillColor: fillColor = textAttribute.fillColor, opacity: opacity = textAttribute.opacity, fillOpacity: fillOpacity = textAttribute.fillOpacity} = text.attribute, offsetX = (0, 
-        common_1.textDrawOffsetX)(textAlign, w), offsetY = (0, common_1.textLayoutOffsetY)("alphabetic", fontSize), attribute = {
+        const {textAlign: textAlign = textAttribute.textAlign, fontSize: fontSize = textAttribute.fontSize, fill: fill = textAttribute.fill, opacity: opacity = textAttribute.opacity, fillOpacity: fillOpacity = textAttribute.fillOpacity} = text.attribute, offsetX = (0, 
+        text_1.textDrawOffsetX)(textAlign, w), offsetY = (0, text_1.textLayoutOffsetY)("alphabetic", fontSize), attribute = {
             lineWidth: 0,
-            strokeColor: fillColor,
+            strokeColor: fill,
             opacity: opacity,
             strokeOpacity: fillOpacity
         };

package/cjs/render/contributions/render/text-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/text-render.ts"],"names":[],"mappings":"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","file":"text-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { getTheme, TEXT_NUMBER_TYPE } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { textDrawOffsetX, textLayoutOffsetY } from '../../../common';\nimport { IText, ITextGraphicAttribute } from '../../../interface/graphic/text';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { BaseRender } from './base-render';\n\n@injectable()\nexport class DefaultCanvasTextRender extends BaseRender<IText> implements IGraphicRender {\n  type: 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n  z: number;\n\n  drawShape(\n    text: IText,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const {\n      text: str,\n      fill = textAttribute.fill == null ? !!text.attribute.fillColor : textAttribute.fill,\n      stroke = textAttribute.stroke == null ? !!text.attribute.strokeColor : textAttribute.stroke,\n      fillOpacity = textAttribute.fillOpacity,\n      strokeOpacity = textAttribute.strokeOpacity,\n      opacity = textAttribute.opacity,\n      lineWidth = textAttribute.lineWidth,\n      visible = textAttribute.visible,\n      underline = textAttribute.underline,\n      lineThrough = textAttribute.lineThrough,\n      keepDirIn3d = textAttribute.keepDirIn3d\n    } = text.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(text.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || fVisible || sVisible)) {\n      return;\n    }\n    // 文字如果需要变换，那就需要将3dmatrix转成context的2dmatrix\n    const transform3dMatrixToContextMatrix = !keepDirIn3d;\n\n    const z = this.z || 0;\n\n    context.beginPath();\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(text, text.attribute, textAttribute);\n\n    transform3dMatrixToContextMatrix && this.transformUseContext2d(text, textAttribute, z, context);\n    if (Array.isArray(str)) {\n      context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);\n      const { multilineLayout } = text;\n      if (!multilineLayout) {\n        context.highPerformanceRestore();\n        return;\n      } // 如果不存在的话，需要render层自行布局\n      const { xOffset, yOffset } = multilineLayout.bbox;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, x, y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n          });\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, x, y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n            this.drawMultiUnderLine(\n              underline,\n              lineThrough,\n              text,\n              (line.leftOffset || 0) + x, // 中下划线都是从文字左侧开始，因此不需要+xOffset\n              (line.topOffset || 0) + yOffset + y,\n              z,\n              line.width,\n              textAttribute,\n              context\n            );\n          });\n        }\n      }\n    } else {\n      context.setTextStyle(text.attribute, textAttribute, z);\n      const t = text.clipedText as string;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, x, y, textAttribute);\n          context.strokeText(t, x, y, z);\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, x, y, textAttribute);\n          context.fillText(t, x, y, z);\n          this.drawUnderLine(underline, lineThrough, text, x, y, z, textAttribute, context);\n        }\n      }\n    }\n    transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context);\n  }\n\n  draw(text: IText, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    const textAttribute = getTheme(text, params?.theme).text;\n\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n    const data = this.transform(text, textAttribute, context, computed3dMatrix);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(text, context, x, y, drawContext, params);\n    this.z = 0;\n\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n\n  drawUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    x: number,\n    y: number,\n    z: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      textBaseline = textAttribute.textBaseline,\n      fontSize = textAttribute.fontSize,\n      fillColor = textAttribute.fillColor,\n      opacity = textAttribute.opacity,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n    const w = text.clipedWidth;\n    const offsetX = textDrawOffsetX(textAlign, w);\n    const offsetY = textLayoutOffsetY(textBaseline, fontSize);\n    const attribute = { lineWidth: 0, strokeColor: fillColor, opacity, strokeOpacity: fillOpacity };\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize / 2;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n\n  drawMultiUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    x: number,\n    y: number,\n    z: number,\n    w: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      fontSize = textAttribute.fontSize,\n      fillColor = textAttribute.fillColor,\n      opacity = textAttribute.opacity,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n\n    const offsetX = textDrawOffsetX(textAlign, w);\n    const offsetY = textLayoutOffsetY('alphabetic', fontSize);\n    const attribute = { lineWidth: 0, strokeColor: fillColor, opacity, strokeOpacity: fillOpacity };\n    let deltaY = -3;\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize + deltaY;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n    deltaY = -1;\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize / 2 + deltaY;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/text-render.ts"],"names":[],"mappings":"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","file":"text-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { TEXT_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { textDrawOffsetX, textLayoutOffsetY } from '../../../common/text';\nimport { IText, ITextGraphicAttribute } from '../../../interface/graphic/text';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { BaseRender } from './base-render';\n\n@injectable()\nexport class DefaultCanvasTextRender extends BaseRender<IText> implements IGraphicRender {\n  type: 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n  z: number;\n\n  drawShape(\n    text: IText,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const {\n      text: str,\n      fill = textAttribute.fill,\n      stroke = textAttribute.stroke,\n      fillOpacity = textAttribute.fillOpacity,\n      strokeOpacity = textAttribute.strokeOpacity,\n      opacity = textAttribute.opacity,\n      lineWidth = textAttribute.lineWidth,\n      visible = textAttribute.visible,\n      underline = textAttribute.underline,\n      lineThrough = textAttribute.lineThrough,\n      keepDirIn3d = textAttribute.keepDirIn3d\n    } = text.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(text.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || fVisible || sVisible)) {\n      return;\n    }\n    // 文字如果需要变换，那就需要将3dmatrix转成context的2dmatrix\n    const transform3dMatrixToContextMatrix = !keepDirIn3d;\n\n    const z = this.z || 0;\n\n    context.beginPath();\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(text, text.attribute, textAttribute);\n\n    transform3dMatrixToContextMatrix && this.transformUseContext2d(text, textAttribute, z, context);\n    if (Array.isArray(str)) {\n      context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);\n      const { multilineLayout } = text;\n      if (!multilineLayout) {\n        context.highPerformanceRestore();\n        return;\n      } // 如果不存在的话，需要render层自行布局\n      const { xOffset, yOffset } = multilineLayout.bbox;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, x, y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n          });\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, x, y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n            this.drawMultiUnderLine(\n              underline,\n              lineThrough,\n              text,\n              (line.leftOffset || 0) + x, // 中下划线都是从文字左侧开始，因此不需要+xOffset\n              (line.topOffset || 0) + yOffset + y,\n              z,\n              line.width,\n              textAttribute,\n              context\n            );\n          });\n        }\n      }\n    } else {\n      context.setTextStyle(text.attribute, textAttribute, z);\n      const t = text.clipedText as string;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, x, y, textAttribute);\n          context.strokeText(t, x, y, z);\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, x, y, textAttribute);\n          context.fillText(t, x, y, z);\n          this.drawUnderLine(underline, lineThrough, text, x, y, z, textAttribute, context);\n        }\n      }\n    }\n    transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context);\n  }\n\n  draw(text: IText, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    const textAttribute = getTheme(text, params?.theme).text;\n\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n    const data = this.transform(text, textAttribute, context, computed3dMatrix);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(text, context, x, y, drawContext, params);\n    this.z = 0;\n\n    context.modelMatrix = lastModelMatrix;\n\n    context.highPerformanceRestore();\n  }\n\n  drawUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    x: number,\n    y: number,\n    z: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      textBaseline = textAttribute.textBaseline,\n      fontSize = textAttribute.fontSize,\n      fill = textAttribute.fill,\n      opacity = textAttribute.opacity,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n    const w = text.clipedWidth;\n    const offsetX = textDrawOffsetX(textAlign, w);\n    const offsetY = textLayoutOffsetY(textBaseline, fontSize);\n    const attribute = { lineWidth: 0, strokeColor: fill, opacity, strokeOpacity: fillOpacity };\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize / 2;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n\n  drawMultiUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    x: number,\n    y: number,\n    z: number,\n    w: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      fontSize = textAttribute.fontSize,\n      fill = textAttribute.fill,\n      opacity = textAttribute.opacity,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n\n    const offsetX = textDrawOffsetX(textAlign, w);\n    const offsetY = textLayoutOffsetY('alphabetic', fontSize);\n    const attribute = { lineWidth: 0, strokeColor: fill, opacity, strokeOpacity: fillOpacity };\n    let deltaY = -3;\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize + deltaY;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n    deltaY = -1;\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, x, y, textAttribute);\n      context.beginPath();\n      const dy = y + offsetY + fontSize / 2 + deltaY;\n      context.moveTo(x + offsetX, dy, z);\n      context.lineTo(x + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n}\n"]}

package/cjs/render/contributions/render/utils.d.ts

@@ -1,10 +1,20 @@
 import { IDrawContext } from '../../../render/render-service';
-import { IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute } from '../../../interface';
+import { IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute, IFillType, IStrokeType, IArc, IPath2D } from '../../../interface';
 import { IGraphicRenderDrawParams } from './graphic-render';
-export declare function runFill(fill: boolean): boolean;
-export declare function runStroke(stroke: number | boolean | boolean[], lineWidth: number): boolean;
+export declare function runFill(fill: IFillType): boolean;
+export declare function runStroke(stroke: IStrokeType | IStrokeType[], lineWidth: number): boolean;
 export declare function fillVisible(opacity: number, fillOpacity: number): boolean;
 export declare function rectFillVisible(opacity: number, fillOpacity: number, width: number, height: number): boolean;
 export declare function strokeVisible(opacity: number, strokeOpacity: number): boolean;
 export declare function rectStrokeVisible(opacity: number, strokeOpacity: number, width: number, height: number): boolean;
 export declare function drawPathProxy(graphic: IGraphic, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): boolean;
+export declare function intersect(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): number[];
+export declare function cornerTangents(x0: number, y0: number, x1: number, y1: number, r1: number, rc: number, clockwise: number): {
+    cx: number;
+    cy: number;
+    x01: number;
+    y01: number;
+    x11: number;
+    y11: number;
+};
+export declare function drawArcPath(arc: IArc, context: IContext2d | IPath2D, cx: number, cy: number, outerRadius: number, innerRadius: number, partStroke?: (boolean | string)[]): boolean;

package/cjs/render/contributions/render/utils.js

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.drawPathProxy = exports.rectStrokeVisible = exports.strokeVisible = exports.rectFillVisible = exports.fillVisible = exports.runStroke = exports.runFill = void 0;
+}), exports.drawArcPath = exports.cornerTangents = exports.intersect = exports.drawPathProxy = exports.rectStrokeVisible = exports.strokeVisible = exports.rectFillVisible = exports.fillVisible = exports.runStroke = exports.runFill = void 0;
 
-const vutils_1 = require("@visactor/vutils"), common_1 = require("../../../common"), theme_1 = require("../../../graphic/theme");
+const vutils_1 = require("@visactor/vutils"), render_command_list_1 = require("../../../common/render-command-list"), theme_1 = require("../../../graphic/theme");
 
 function runFill(fill) {
-    return fill;
+    return !!fill;
 }
 
 function runStroke(stroke, lineWidth) {
     let s;
-    return s = (0, vutils_1.isArray)(stroke) ? stroke.some((item => item)) : stroke, 
+    return s = (0, vutils_1.isArray)(stroke) ? stroke.some((item => item || void 0 === item)) : !!stroke, 
     s && lineWidth > 0;
 }
 
@@ -34,19 +34,117 @@ function rectStrokeVisible(opacity, strokeOpacity, width, height) {
 
 function drawPathProxy(graphic, context, x, y, drawContext, params, fillCb, strokeCb) {
     if (!graphic.pathProxy) return !1;
-    const themeAttributes = (0, theme_1.getTheme)(graphic, null == params ? void 0 : params.theme)[graphic.type], {fill: fill = (null == themeAttributes.fill ? !!graphic.attribute.fillColor : themeAttributes.fill), stroke: stroke = (null == themeAttributes.stroke ? !!graphic.attribute.strokeColor : themeAttributes.stroke), opacity: opacity = themeAttributes.opacity, fillOpacity: fillOpacity = themeAttributes.fillOpacity, lineWidth: lineWidth = themeAttributes.lineWidth, strokeOpacity: strokeOpacity = themeAttributes.strokeOpacity, visible: visible = themeAttributes.visible} = graphic.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
+    const themeAttributes = (0, theme_1.getTheme)(graphic, null == params ? void 0 : params.theme)[graphic.type], {fill: fill = themeAttributes.fill, stroke: stroke = themeAttributes.stroke, opacity: opacity = themeAttributes.opacity, fillOpacity: fillOpacity = themeAttributes.fillOpacity, lineWidth: lineWidth = themeAttributes.lineWidth, strokeOpacity: strokeOpacity = themeAttributes.strokeOpacity, visible: visible = themeAttributes.visible} = graphic.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
     if (!visible) return !0;
     if (!doFill && !doStroke) return !0;
     if (!(fVisible || sVisible || fillCb || strokeCb)) return !0;
     context.beginPath();
     const path = "function" == typeof graphic.pathProxy ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;
-    return (0, common_1.renderCommandList)(path.commandList, context, x, y), context.setShadowStyle && context.setShadowStyle(graphic, graphic.attribute, themeAttributes), 
+    return (0, render_command_list_1.renderCommandList)(path.commandList, context, x, y), 
+    context.setShadowStyle && context.setShadowStyle(graphic, graphic.attribute, themeAttributes), 
     doStroke && (strokeCb ? strokeCb(context, graphic.attribute, themeAttributes) : sVisible && (context.setStrokeStyle(graphic, graphic.attribute, x, y, themeAttributes), 
     context.stroke())), doFill && (fillCb ? fillCb(context, graphic.attribute, themeAttributes) : fVisible && (context.setCommonStyle(graphic, graphic.attribute, x, y, themeAttributes), 
     context.fill())), !0;
 }
 
+function intersect(x0, y0, x1, y1, x2, y2, x3, y3) {
+    const x10 = x1 - x0, y10 = y1 - y0, x32 = x3 - x2, y32 = y3 - y2;
+    let t = y32 * x10 - x32 * y10;
+    return t * t < vutils_1.epsilon ? [] : (t = (x32 * (y0 - y2) - y32 * (x0 - x2)) / t, 
+    [ x0 + t * x10, y0 + t * y10 ]);
+}
+
+function cornerTangents(x0, y0, x1, y1, r1, rc, clockwise) {
+    const x01 = x0 - x1, y01 = y0 - y1, lo = (clockwise ? rc : -rc) / Math.sqrt(x01 * x01 + y01 * y01), ox = lo * y01, oy = -lo * x01, x11 = x0 + ox, y11 = y0 + oy, x10 = x1 + ox, y10 = y1 + oy, x00 = (x11 + x10) / 2, y00 = (y11 + y10) / 2, dx = x10 - x11, dy = y10 - y11, d2 = dx * dx + dy * dy, r = r1 - rc, D = x11 * y10 - x10 * y11, d = (dy < 0 ? -1 : 1) * Math.sqrt(Math.max(0, r * r * d2 - D * D));
+    let cx0 = (D * dy - dx * d) / d2, cy0 = (-D * dx - dy * d) / d2;
+    const cx1 = (D * dy + dx * d) / d2, cy1 = (-D * dx + dy * d) / d2, dx0 = cx0 - x00, dy0 = cy0 - y00, dx1 = cx1 - x00, dy1 = cy1 - y00;
+    return dx0 * dx0 + dy0 * dy0 > dx1 * dx1 + dy1 * dy1 && (cx0 = cx1, cy0 = cy1), 
+    {
+        cx: cx0,
+        cy: cy0,
+        x01: -ox,
+        y01: -oy,
+        x11: cx0 * (r1 / r - 1),
+        y11: cy0 * (r1 / r - 1)
+    };
+}
+
+function drawArcPath(arc, context, cx, cy, outerRadius, innerRadius, partStroke) {
+    const {startAngle: startAngle, endAngle: endAngle} = arc.getParsedAngle(), deltaAngle = (0, 
+    vutils_1.abs)(endAngle - startAngle), clockwise = endAngle > startAngle;
+    let collapsedToLine = !1;
+    if (outerRadius < innerRadius) {
+        const temp = outerRadius;
+        outerRadius = innerRadius, innerRadius = temp;
+    }
+    if (outerRadius <= vutils_1.epsilon) context.moveTo(cx, cy); else if (deltaAngle >= vutils_1.pi2 - vutils_1.epsilon) context.moveTo(cx + outerRadius * (0, 
+    vutils_1.cos)(startAngle), cy + outerRadius * (0, vutils_1.sin)(startAngle)), context.arc(cx, cy, outerRadius, startAngle, endAngle, !clockwise), 
+    innerRadius > vutils_1.epsilon && (context.moveTo(cx + innerRadius * (0, vutils_1.cos)(endAngle), cy + innerRadius * (0, 
+    vutils_1.sin)(endAngle)), context.arc(cx, cy, innerRadius, endAngle, startAngle, clockwise)); else {
+        const cornerRadius = arc.getParsedCornerRadius(), {outerDeltaAngle: outerDeltaAngle, innerDeltaAngle: innerDeltaAngle, outerStartAngle: outerStartAngle, outerEndAngle: outerEndAngle, innerEndAngle: innerEndAngle, innerStartAngle: innerStartAngle} = arc.getParsePadAngle(startAngle, endAngle), outerCornerRadiusStart = cornerRadius, outerCornerRadiusEnd = cornerRadius, innerCornerRadiusEnd = cornerRadius, innerCornerRadiusStart = cornerRadius, maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart), maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
+        let limitedOcr = maxOuterCornerRadius, limitedIcr = maxInnerCornerRadius;
+        const xors = outerRadius * (0, vutils_1.cos)(outerStartAngle), yors = outerRadius * (0, 
+        vutils_1.sin)(outerStartAngle), xire = innerRadius * (0, vutils_1.cos)(innerEndAngle), yire = innerRadius * (0, 
+        vutils_1.sin)(innerEndAngle);
+        let xore, yore, xirs, yirs;
+        if ((maxInnerCornerRadius > vutils_1.epsilon || maxOuterCornerRadius > vutils_1.epsilon) && (xore = outerRadius * (0, 
+        vutils_1.cos)(outerEndAngle), yore = outerRadius * (0, vutils_1.sin)(outerEndAngle), 
+        xirs = innerRadius * (0, vutils_1.cos)(innerStartAngle), yirs = innerRadius * (0, 
+        vutils_1.sin)(innerStartAngle), deltaAngle < vutils_1.pi)) {
+            const oc = intersect(xors, yors, xirs, yirs, xore, yore, xire, yire);
+            if (oc) {
+                const ax = xors - oc[0], ay = yors - oc[1], bx = xore - oc[0], by = yore - oc[1], kc = 1 / (0, 
+                vutils_1.sin)((0, vutils_1.acos)((ax * bx + ay * by) / ((0, vutils_1.sqrt)(ax * ax + ay * ay) * (0, 
+                vutils_1.sqrt)(bx * bx + by * by))) / 2), lc = (0, vutils_1.sqrt)(oc[0] * oc[0] + oc[1] * oc[1]);
+                limitedIcr = (0, vutils_1.min)(maxInnerCornerRadius, (innerRadius - lc) / (kc - 1)), 
+                limitedOcr = (0, vutils_1.min)(maxOuterCornerRadius, (outerRadius - lc) / (kc + 1));
+            }
+        }
+        if (outerDeltaAngle < .001) partStroke && (partStroke[3] || partStroke[1]) && context.moveTo(cx + xors, cy + yors), 
+        collapsedToLine = !0; else if (limitedOcr > vutils_1.epsilon) {
+            const cornerRadiusStart = (0, vutils_1.min)(outerCornerRadiusStart, limitedOcr), cornerRadiusEnd = (0, 
+            vutils_1.min)(outerCornerRadiusEnd, limitedOcr), t0 = cornerTangents(xirs, yirs, xors, yors, outerRadius, cornerRadiusStart, Number(clockwise)), t1 = cornerTangents(xore, yore, xire, yire, outerRadius, cornerRadiusEnd, Number(clockwise));
+            limitedOcr < maxOuterCornerRadius && cornerRadiusStart === cornerRadiusEnd ? !partStroke || partStroke[0] ? (context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
+            context.arc(cx + t0.cx, cy + t0.cy, limitedOcr, (0, vutils_1.atan2)(t0.y01, t0.x01), (0, 
+            vutils_1.atan2)(t1.y01, t1.x01), !clockwise)) : context.moveTo(cx + t0.cx + limitedOcr * (0, 
+            vutils_1.cos)((0, vutils_1.atan2)(t1.y01, t1.x01)), cy + t0.cy + limitedOcr * (0, 
+            vutils_1.sin)((0, vutils_1.atan2)(t1.y01, t1.x01))) : !partStroke || partStroke[0] ? (context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
+            cornerRadiusStart > 0 && context.arc(cx + t0.cx, cy + t0.cy, cornerRadiusStart, (0, 
+            vutils_1.atan2)(t0.y01, t0.x01), (0, vutils_1.atan2)(t0.y11, t0.x11), !clockwise), 
+            context.arc(cx, cy, outerRadius, (0, vutils_1.atan2)(t0.cy + t0.y11, t0.cx + t0.x11), (0, 
+            vutils_1.atan2)(t1.cy + t1.y11, t1.cx + t1.x11), !clockwise), cornerRadiusEnd > 0 && context.arc(cx + t1.cx, cy + t1.cy, cornerRadiusEnd, (0, 
+            vutils_1.atan2)(t1.y11, t1.x11), (0, vutils_1.atan2)(t1.y01, t1.x01), !clockwise)) : cornerRadiusEnd > 0 ? context.moveTo(cx + t1.cx + cornerRadiusEnd * (0, 
+            vutils_1.cos)((0, vutils_1.atan2)(t1.y01, t1.x01)), cy + t1.cy + cornerRadiusEnd * (0, 
+            vutils_1.sin)((0, vutils_1.atan2)(t1.y01, t1.x01))) : context.moveTo(cx + xore, cy + outerRadius * (0, 
+            vutils_1.sin)(outerEndAngle));
+        } else partStroke && !partStroke[0] || (context.moveTo(cx + xors, cy + yors), context.arc(cx, cy, outerRadius, outerStartAngle, outerEndAngle, !clockwise));
+        if (!(innerRadius > vutils_1.epsilon) || innerDeltaAngle < .001) !partStroke || partStroke[1] ? context.lineTo(cx + xire, cy + yire) : context.moveTo(cx + xire, cy + yire), 
+        collapsedToLine = !0; else if (limitedIcr > vutils_1.epsilon) {
+            const cornerRadiusStart = (0, vutils_1.min)(innerCornerRadiusStart, limitedIcr), cornerRadiusEnd = (0, 
+            vutils_1.min)(innerCornerRadiusEnd, limitedIcr), t0 = cornerTangents(xire, yire, xore, yore, innerRadius, -cornerRadiusEnd, Number(clockwise)), t1 = cornerTangents(xors, yors, xirs, yirs, innerRadius, -cornerRadiusStart, Number(clockwise));
+            if (!partStroke || partStroke[1] ? context.lineTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01) : context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
+            limitedIcr < maxInnerCornerRadius && cornerRadiusStart === cornerRadiusEnd) {
+                const arcEndAngle = (0, vutils_1.atan2)(t1.y01, t1.x01);
+                !partStroke || partStroke[2] ? context.arc(cx + t0.cx, cy + t0.cy, limitedIcr, (0, 
+                vutils_1.atan2)(t0.y01, t0.x01), arcEndAngle, !clockwise) : context.moveTo(cx + t0.cx + (0, 
+                vutils_1.cos)(arcEndAngle), cy + t0.cy + (0, vutils_1.sin)(arcEndAngle));
+            } else !partStroke || partStroke[2] ? (cornerRadiusEnd > 0 && context.arc(cx + t0.cx, cy + t0.cy, cornerRadiusEnd, (0, 
+            vutils_1.atan2)(t0.y01, t0.x01), (0, vutils_1.atan2)(t0.y11, t0.x11), !clockwise), 
+            context.arc(cx, cy, innerRadius, (0, vutils_1.atan2)(t0.cy + t0.y11, t0.cx + t0.x11), (0, 
+            vutils_1.atan2)(t1.cy + t1.y11, t1.cx + t1.x11), clockwise), cornerRadiusStart > 0 && context.arc(cx + t1.cx, cy + t1.cy, cornerRadiusStart, (0, 
+            vutils_1.atan2)(t1.y11, t1.x11), (0, vutils_1.atan2)(t1.y01, t1.x01), !clockwise)) : cornerRadiusStart > 0 ? context.moveTo(cx + t1.cx + cornerRadiusStart * (0, 
+            vutils_1.cos)((0, vutils_1.atan2)(t1.y01, t1.x01)), cy + t1.cy + cornerRadiusStart * (0, 
+            vutils_1.sin)((0, vutils_1.atan2)(t1.y01, t1.x01))) : context.moveTo(cx + xirs, cy + yirs);
+        } else !partStroke || partStroke[1] ? context.lineTo(cx + xire, cy + yire) : context.moveTo(cx + xire, cy + yire), 
+        !partStroke || partStroke[2] ? context.arc(cx, cy, innerRadius, innerEndAngle, innerStartAngle, clockwise) : context.moveTo(cx + innerRadius * (0, 
+        vutils_1.cos)(innerStartAngle), cy + innerRadius * (0, vutils_1.sin)(innerStartAngle));
+    }
+    return partStroke ? partStroke[3] && context.lineTo(cx + outerRadius * (0, vutils_1.cos)(endAngle), cy + outerRadius * (0, 
+    vutils_1.cos)(endAngle)) : context.closePath(), collapsedToLine;
+}
+
 exports.runFill = runFill, exports.runStroke = runStroke, exports.fillVisible = fillVisible, 
 exports.rectFillVisible = rectFillVisible, exports.strokeVisible = strokeVisible, 
-exports.rectStrokeVisible = rectStrokeVisible, exports.drawPathProxy = drawPathProxy;
+exports.rectStrokeVisible = rectStrokeVisible, exports.drawPathProxy = drawPathProxy, 
+exports.intersect = intersect, exports.cornerTangents = cornerTangents, exports.drawArcPath = drawArcPath;
 //# sourceMappingURL=utils.js.map