@visactor/vrender 0.9.0 → 0.9.1-circular.0

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

@@ -16,21 +16,21 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPathRender = void 0;
 
-const inversify_1 = require("inversify"), common_1 = require("../../../common"), graphic_1 = require("../../../graphic"), utils_1 = require("./utils"), path_contribution_render_1 = require("./contributions/path-contribution-render"), base_contribution_render_1 = require("./contributions/base-contribution-render"), base_render_1 = require("./base-render"), modules_1 = require("../../../modules");
+const inversify_1 = require("inversify"), contribution_provider_1 = require("../../../common/contribution-provider"), render_command_list_1 = require("../../../common/render-command-list"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), utils_1 = require("./utils"), path_contribution_render_1 = require("./contributions/path-contribution-render"), base_contribution_render_1 = require("./contributions/base-contribution-render"), base_render_1 = require("./base-render"), matrix_allocate_1 = require("../../../allocator/matrix-allocate");
 
 let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
     constructor(pathRenderContribitions) {
-        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = graphic_1.PATH_NUMBER_TYPE;
+        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = constants_1.PATH_NUMBER_TYPE;
     }
     drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b;
-        const pathAttribute = (0, graphic_1.getTheme)(path, null == params ? void 0 : params.theme).path, {fill: fill = (null == pathAttribute.fill ? !!path.attribute.fillColor : pathAttribute.fill), stroke: stroke = (null == pathAttribute.stroke ? !!path.attribute.strokeColor : pathAttribute.stroke), fillOpacity: fillOpacity = pathAttribute.fillOpacity, strokeOpacity: strokeOpacity = pathAttribute.strokeOpacity, opacity: opacity = pathAttribute.opacity, background: background, lineWidth: lineWidth = pathAttribute.lineWidth, visible: visible = pathAttribute.visible} = path.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, fVisible = (0, 
+        const pathAttribute = (0, theme_1.getTheme)(path, null == params ? void 0 : params.theme).path, {fill: fill = pathAttribute.fill, stroke: stroke = pathAttribute.stroke, fillOpacity: fillOpacity = pathAttribute.fillOpacity, strokeOpacity: strokeOpacity = pathAttribute.strokeOpacity, opacity: opacity = pathAttribute.opacity, background: background, lineWidth: lineWidth = pathAttribute.lineWidth, visible: visible = pathAttribute.visible} = path.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, 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 (path.valid && visible && (doFill || doStroke || background) && (fVisible || sVisible || fillCb || strokeCb || background)) {
-            if (context.beginPath(), path.pathShape) (0, common_1.renderCommandList)(path.pathShape.commandList, context, x, y, 1, 1, z); else {
+            if (context.beginPath(), path.pathShape) (0, render_command_list_1.renderCommandList)(path.pathShape.commandList, context, x, y, 1, 1, z); else {
                 const path2D = null !== (_b = path.attribute.path) && void 0 !== _b ? _b : pathAttribute.path;
-                (0, common_1.renderCommandList)(path2D.commandList, context, x, y, 1, 1, z);
+                (0, render_command_list_1.renderCommandList)(path2D.commandList, context, x, y, 1, 1, z);
             }
             this._pathRenderContribitions || (this._pathRenderContribitions = this.pathRenderContribitions.getContributions() || [], 
             this._pathRenderContribitions.sort(((a, b) => b.order - a.order))), this._pathRenderContribitions.forEach((c => {
@@ -47,14 +47,15 @@ let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const pathAttribute = (0, graphic_1.getTheme)(path, null == params ? void 0 : params.theme).path, data = this.transform(path, pathAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        const pathAttribute = (0, theme_1.getTheme)(path, null == params ? void 0 : params.theme).path, data = this.transform(path, pathAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
         this.z = z, (0, utils_1.drawPathProxy)(path, context, x, y, drawContext, params) || (this.drawShape(path, 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();
     }
 };
 
 DefaultCanvasPathRender = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(path_contribution_render_1.PathRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPathRender), 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
+inversify_1.named)(path_contribution_render_1.PathRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPathRender), 
 exports.DefaultCanvasPathRender = DefaultCanvasPathRender;
 //# sourceMappingURL=path-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/path-render.ts"],"names":[],"mappings":"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","file":"path-render.js","sourcesContent":["import { inject, injectable, named } from 'inversify';\nimport { ContributionProvider, renderCommandList } from '../../../common';\nimport {\n  IPath,\n  ICustomPath2D,\n  IContext2d,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IMarkAttribute\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { getModelMatrix, getTheme, multiplyMat4Mat4, PATH_NUMBER_TYPE, shouldUseMat4 } from '../../../graphic';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPathRenderContribution, PathRenderContribution } from './contributions/path-contribution-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { BaseRender } from './base-render';\nimport { mat4Allocate } from '../../../modules';\n\n@injectable()\nexport class DefaultCanvasPathRender extends BaseRender<IPath> implements IGraphicRender {\n  type: 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n  declare z: number;\n\n  protected _pathRenderContribitions: IPathRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PathRenderContribution)\n    protected readonly pathRenderContribitions: ContributionProvider<IPathRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    path: IPath,\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 pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path, params?.theme).path;\n    const {\n      fill = pathAttribute.fill == null ? !!path.attribute.fillColor : pathAttribute.fill,\n      stroke = pathAttribute.stroke == null ? !!path.attribute.strokeColor : pathAttribute.stroke,\n      fillOpacity = pathAttribute.fillOpacity,\n      strokeOpacity = pathAttribute.strokeOpacity,\n      opacity = pathAttribute.opacity,\n      background,\n      lineWidth = pathAttribute.lineWidth,\n      visible = pathAttribute.visible\n    } = path.attribute;\n\n    const z = this.z ?? 0;\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 (!(path.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    context.beginPath();\n    if (path.pathShape) {\n      renderCommandList((path.pathShape as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    } else {\n      const path2D = path.attribute.path ?? pathAttribute.path;\n      renderCommandList((path2D as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    }\n\n    if (!this._pathRenderContribitions) {\n      this._pathRenderContribitions = this.pathRenderContribitions.getContributions() || [];\n      this._pathRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._pathRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(path, path.attribute, pathAttribute);\n\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, path.attribute, pathAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(path, path.attribute, x, y, pathAttribute);\n        context.stroke();\n      }\n    }\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, path.attribute, pathAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(path, path.attribute, x, y, pathAttribute);\n        context.fill();\n      }\n    }\n\n    this._pathRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(path: IPath, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path, params?.theme).path;\n\n    const data = this.transform(path, pathAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(path, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(path, 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/path-render.ts"],"names":[],"mappings":"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","file":"path-render.js","sourcesContent":["import { inject, injectable, named } from 'inversify';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { renderCommandList } from '../../../common/render-command-list';\nimport {\n  IPath,\n  ICustomPath2D,\n  IContext2d,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IMarkAttribute\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { getTheme } from '../../../graphic/theme';\nimport { PATH_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPathRenderContribution, PathRenderContribution } from './contributions/path-contribution-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { BaseRender } from './base-render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\n\n@injectable()\nexport class DefaultCanvasPathRender extends BaseRender<IPath> implements IGraphicRender {\n  type: 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n  declare z: number;\n\n  protected _pathRenderContribitions: IPathRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PathRenderContribution)\n    protected readonly pathRenderContribitions: ContributionProvider<IPathRenderContribution>\n  ) {\n    super();\n  }\n\n  drawShape(\n    path: IPath,\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 pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path, params?.theme).path;\n    const {\n      fill = pathAttribute.fill,\n      stroke = pathAttribute.stroke,\n      fillOpacity = pathAttribute.fillOpacity,\n      strokeOpacity = pathAttribute.strokeOpacity,\n      opacity = pathAttribute.opacity,\n      background,\n      lineWidth = pathAttribute.lineWidth,\n      visible = pathAttribute.visible\n    } = path.attribute;\n\n    const z = this.z ?? 0;\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 (!(path.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    context.beginPath();\n    if (path.pathShape) {\n      renderCommandList((path.pathShape as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    } else {\n      const path2D = path.attribute.path ?? pathAttribute.path;\n      renderCommandList((path2D as ICustomPath2D).commandList, context, x, y, 1, 1, z);\n    }\n\n    if (!this._pathRenderContribitions) {\n      this._pathRenderContribitions = this.pathRenderContribitions.getContributions() || [];\n      this._pathRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._pathRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(path, path.attribute, pathAttribute);\n\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, path.attribute, pathAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(path, path.attribute, x, y, pathAttribute);\n        context.stroke();\n      }\n    }\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, path.attribute, pathAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(path, path.attribute, x, y, pathAttribute);\n        context.fill();\n      }\n    }\n\n    this._pathRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(path: IPath, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path, params?.theme).path;\n\n    const data = this.transform(path, pathAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    if (drawPathProxy(path, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(path, 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/polygon-render.d.ts

@@ -2,7 +2,7 @@ import { IGraphicAttribute, IContext2d, IMarkAttribute, IPolygon, IThemeAttribut
 import { IDrawContext, IRenderService } from '../../render-service';
 import { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';
 import { IPolygonRenderContribution } from './contributions/polygon-contribution-render';
-import { ContributionProvider } from '../../../common';
+import { ContributionProvider } from '../../../common/contribution-provider';
 export declare class DefaultCanvasPolygonRender implements IGraphicRender {
     protected readonly polygonRenderContribitions: ContributionProvider<IPolygonRenderContribution>;
     type: 'polygon';

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

@@ -16,14 +16,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPolygonRender = void 0;
 
-const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), polygon_1 = require("../../../common/polygon"), utils_1 = require("./utils"), polygon_contribution_render_1 = require("./contributions/polygon-contribution-render"), common_1 = require("../../../common"), base_contribution_render_1 = require("./contributions/base-contribution-render");
+const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), polygon_1 = require("../../../common/polygon"), utils_1 = require("./utils"), polygon_contribution_render_1 = require("./contributions/polygon-contribution-render"), contribution_provider_1 = require("../../../common/contribution-provider"), base_contribution_render_1 = require("./contributions/base-contribution-render");
 
 let DefaultCanvasPolygonRender = class {
     constructor(polygonRenderContribitions) {
-        this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = graphic_1.POLYGON_NUMBER_TYPE;
+        this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = constants_1.POLYGON_NUMBER_TYPE;
     }
     drawShape(polygon, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const polygonAttribute = (0, graphic_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon, {points: points = polygonAttribute.points, fill: fill = (null == polygonAttribute.fill ? !!polygon.attribute.fillColor : polygonAttribute.fill), stroke: stroke = (null == polygonAttribute.stroke ? !!polygon.attribute.strokeColor : polygonAttribute.stroke), borderRadius: borderRadius = polygonAttribute.borderRadius, fillOpacity: fillOpacity = polygonAttribute.fillOpacity, background: background, strokeOpacity: strokeOpacity = polygonAttribute.strokeOpacity, lineWidth: lineWidth = polygonAttribute.lineWidth, opacity: opacity = polygonAttribute.opacity, visible: visible = polygonAttribute.visible} = polygon.attribute, fVisible = (0, 
+        const polygonAttribute = (0, theme_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon, {points: points = polygonAttribute.points, fill: fill = polygonAttribute.fill, stroke: stroke = polygonAttribute.stroke, borderRadius: borderRadius = polygonAttribute.borderRadius, fillOpacity: fillOpacity = polygonAttribute.fillOpacity, background: background, strokeOpacity: strokeOpacity = polygonAttribute.strokeOpacity, lineWidth: lineWidth = polygonAttribute.lineWidth, opacity: opacity = polygonAttribute.opacity, visible: visible = polygonAttribute.visible} = polygon.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);
         polygon.valid && visible && (doFill || doStroke || background) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), 
@@ -44,7 +44,7 @@ let DefaultCanvasPolygonRender = class {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const polygonAttribute = (0, graphic_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon;
+        const polygonAttribute = (0, theme_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon;
         let {x: x = polygonAttribute.x, y: y = polygonAttribute.y} = polygon.attribute;
         if (polygon.transMatrix.onlyTranslate()) {
             const point = polygon.getOffsetXY(polygonAttribute);
@@ -56,6 +56,7 @@ let DefaultCanvasPolygonRender = class {
 };
 
 DefaultCanvasPolygonRender = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(polygon_contribution_render_1.PolygonRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPolygonRender), 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
+inversify_1.named)(polygon_contribution_render_1.PolygonRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasPolygonRender), 
 exports.DefaultCanvasPolygonRender = DefaultCanvasPolygonRender;
 //# sourceMappingURL=polygon-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAqD;AACrD,yCAAsD;AACtD,8CAAiE;AAIjE,qDAA0E;AAC1E,mCAAwF;AACxF,6FAAoH;AACpH,4CAAuD;AACvD,uFAAsF;AAG/E,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAMrC,YAGqB,0BAA4E;QAA5E,+BAA0B,GAA1B,0BAA0B,CAAkD;QAPjG,eAAU,GAAW,6BAAmB,CAAC;IAQtC,CAAC;IAEJ,SAAS,CACP,OAAiB,EACjB,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;QAGZ,MAAM,gBAAgB,GAAG,IAAA,kBAAQ,EAAC,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,OAAO,CAAC;QAClE,MAAM,EACJ,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAChC,IAAI,GAAG,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAC5F,MAAM,GAAG,gBAAgB,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EACpG,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAC5C,WAAW,GAAG,gBAAgB,CAAC,WAAW,EAC1C,UAAU,EACV,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAC9C,SAAS,GAAG,gBAAgB,CAAC,SAAS,EACtC,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAClC,OAAO,GAAG,gBAAgB,CAAC,OAAO,EACnC,GAAG,OAAO,CAAC,SAAS,CAAC;QAGtB,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,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,EAAE;YAC/B,OAAO;SACR;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,QAAQ,IAAI,UAAU,CAAC,EAAE;YACvC,OAAO;SACR;QAED,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,IAAI,UAAU,CAAC,EAAE;YAC/D,OAAO;SACR;QACD,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,IAAK,YAAuB,IAAI,CAAC,IAAI,CAAC,IAAA,gBAAO,EAAC,YAAY,CAAC,IAAe,YAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;YAChH,IAAA,qBAAW,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC7E;aAAM;YAEL,IAAA,4BAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;SAClG;QAED,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE;YACrC,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;YAC5F,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;SACpE;QACD,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC3C,IAAI,CAAC,CAAC,IAAI,KAAK,qDAA0B,CAAC,gBAAgB,EAAE;gBAE1D,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;aAC/G;QACH,CAAC,CAAC,CAAC;QAGH,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAE/F,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;aACtD;iBAAM,IAAI,WAAW,EAAE;gBAEtB,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;gBAC3E,OAAO,CAAC,IAAI,EAAE,CAAC;aAChB;SACF;QACD,IAAI,QAAQ,EAAE;YACZ,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;aACxD;iBAAM,IAAI,aAAa,EAAE;gBAExB,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;gBAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;QAED,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC3C,IAAI,CAAC,CAAC,IAAI,KAAK,qDAA0B,CAAC,eAAe,EAAE;gBAEzD,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;aAC/G;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAiB,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QACjH,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAG9B,MAAM,gBAAgB,GAAG,IAAA,kBAAQ,EAAC,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,OAAO,CAAC;QAClE,IAAI,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAE3E,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAExC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YACpD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,OAAO,CAAC,sBAAsB,EAAE,CAAC;SAClC;QACD,IAAI,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;YAC9D,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACjC,OAAO;SACR;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE5D,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACnC,CAAC;CACF,CAAA;AAlJY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAQR,WAAA,IAAA,kBAAM,EAAC,6BAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,iBAAK,EAAC,uDAAyB,CAAC,CAAA;;GARxB,0BAA0B,CAkJtC;AAlJY,gEAA0B","file":"polygon-render.js","sourcesContent":["import { isArray, isNumber } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme, POLYGON_NUMBER_TYPE } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPolygon, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPolygonRenderContribution, PolygonRenderContribution } from './contributions/polygon-contribution-render';\nimport { ContributionProvider } from '../../../common';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPolygonRender implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  protected _polygonRenderContribitions: IPolygonRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PolygonRenderContribution)\n    protected readonly polygonRenderContribitions: ContributionProvider<IPolygonRenderContribution>\n  ) {}\n\n  drawShape(\n    polygon: IPolygon,\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 polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      fill = polygonAttribute.fill == null ? !!polygon.attribute.fillColor : polygonAttribute.fill,\n      stroke = polygonAttribute.stroke == null ? !!polygon.attribute.strokeColor : polygonAttribute.stroke,\n      borderRadius = polygonAttribute.borderRadius,\n      fillOpacity = polygonAttribute.fillOpacity,\n      background,\n      strokeOpacity = polygonAttribute.strokeOpacity,\n      lineWidth = polygonAttribute.lineWidth,\n      opacity = polygonAttribute.opacity,\n      visible = polygonAttribute.visible\n    } = polygon.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 (!(polygon.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n    context.beginPath();\n\n    if ((borderRadius as number) <= 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, borderRadius);\n    }\n    // polygon 默认闭合\n    context.closePath();\n\n    if (!this._polygonRenderContribitions) {\n      this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [];\n      this._polygonRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, polygon.attribute, polygonAttribute);\n      } else if (fillOpacity) {\n        // 存在fill\n        context.setCommonStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, polygon.attribute, polygonAttribute);\n      } else if (strokeOpacity) {\n        // 存在stroke\n        context.setStrokeStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.stroke();\n      }\n    }\n\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      context.setTransformForCurrent();\n    }\n    if (drawPathProxy(polygon, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(polygon, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":"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","file":"polygon-render.js","sourcesContent":["import { isArray, isNumber } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPolygon, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPolygonRenderContribution, PolygonRenderContribution } from './contributions/polygon-contribution-render';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPolygonRender implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  protected _polygonRenderContribitions: IPolygonRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PolygonRenderContribution)\n    protected readonly polygonRenderContribitions: ContributionProvider<IPolygonRenderContribution>\n  ) {}\n\n  drawShape(\n    polygon: IPolygon,\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 polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      fill = polygonAttribute.fill,\n      stroke = polygonAttribute.stroke,\n      borderRadius = polygonAttribute.borderRadius,\n      fillOpacity = polygonAttribute.fillOpacity,\n      background,\n      strokeOpacity = polygonAttribute.strokeOpacity,\n      lineWidth = polygonAttribute.lineWidth,\n      opacity = polygonAttribute.opacity,\n      visible = polygonAttribute.visible\n    } = polygon.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 (!(polygon.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n    context.beginPath();\n\n    if ((borderRadius as number) <= 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, borderRadius);\n    }\n    // polygon 默认闭合\n    context.closePath();\n\n    if (!this._polygonRenderContribitions) {\n      this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [];\n      this._polygonRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, polygon.attribute, polygonAttribute);\n      } else if (fillOpacity) {\n        // 存在fill\n        context.setCommonStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, polygon.attribute, polygonAttribute);\n      } else if (strokeOpacity) {\n        // 存在stroke\n        context.setStrokeStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.stroke();\n      }\n    }\n\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      context.setTransformForCurrent();\n    }\n    if (drawPathProxy(polygon, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(polygon, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

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

@@ -10,15 +10,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPyramid3dRender = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), utils_1 = require("./utils"), color_string_1 = require("../../../color-string"), modules_1 = require("../../../modules"), base_render_1 = require("./base-render");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), utils_1 = require("./utils"), color_string_1 = require("../../../color-string"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), base_render_1 = require("./base-render");
 
 let DefaultCanvasPyramid3dRender = class extends base_render_1.BaseRender {
     constructor() {
-        super(...arguments), this.type = "pyramid3d", this.numberType = graphic_1.PYRAMID3D_NUMBER_TYPE;
+        super(...arguments), this.type = "pyramid3d", this.numberType = constants_1.PYRAMID3D_NUMBER_TYPE;
     }
     drawShape(pyramid3d, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
-        const pyramidAttribute = (0, graphic_1.getTheme)(pyramid3d, null == params ? void 0 : params.theme).polygon, {fill: fill = (null == pyramidAttribute.fill ? !!pyramid3d.attribute.fillColor : pyramidAttribute.fill), stroke: stroke = (null == pyramidAttribute.stroke ? !!pyramid3d.attribute.strokeColor : pyramidAttribute.stroke), opacity: opacity = pyramidAttribute.opacity, fillOpacity: fillOpacity = pyramidAttribute.fillOpacity, lineWidth: lineWidth = pyramidAttribute.lineWidth, strokeOpacity: strokeOpacity = pyramidAttribute.strokeOpacity, visible: visible = pyramidAttribute.visible, points: points, face: face = [ !0, !0, !0, !0, !0, !0 ]} = pyramid3d.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, fVisible = (0, 
+        const pyramidAttribute = (0, theme_1.getTheme)(pyramid3d, null == params ? void 0 : params.theme).polygon, {fill: fill = pyramidAttribute.fill, stroke: stroke = pyramidAttribute.stroke, opacity: opacity = pyramidAttribute.opacity, fillOpacity: fillOpacity = pyramidAttribute.fillOpacity, lineWidth: lineWidth = pyramidAttribute.lineWidth, strokeOpacity: strokeOpacity = pyramidAttribute.strokeOpacity, visible: visible = pyramidAttribute.visible, points: points, face: face = [ !0, !0, !0, !0, !0, !0 ]} = pyramid3d.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, 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 (!pyramid3d.valid || !visible || 4 !== points.length) return;
@@ -27,8 +27,8 @@ let DefaultCanvasPyramid3dRender = class extends base_render_1.BaseRender {
         const {light: light, camera: camera} = drawContext.stage || {}, face3d = pyramid3d.findFace();
         if (!1 !== fill) {
             context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);
-            let {fillColor: fillColor = pyramidAttribute.fillColor} = pyramid3d.attribute;
-            "string" != typeof fillColor && (fillColor = "black"), this.fill(x, y, z, face3d, face, fillColor, context, light, camera, pyramid3d, pyramidAttribute, fillCb);
+            let fc = fill;
+            "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, face, fc, context, light, camera, pyramid3d, pyramidAttribute, fillCb);
         }
         !1 !== stroke && (context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute), 
         this.stroke(x, y, z, face3d, context));
@@ -87,8 +87,8 @@ let DefaultCanvasPyramid3dRender = class extends base_render_1.BaseRender {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const pyramid3dAttribute = (0, graphic_1.getTheme)(pyramid3d).polygon, data = this.transform(pyramid3d, pyramid3dAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        this.z = z, this.drawShape(pyramid3d, context, x, y, drawContext), this.z = 0, context.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(context.modelMatrix), 
+        const pyramid3dAttribute = (0, theme_1.getTheme)(pyramid3d).polygon, data = this.transform(pyramid3d, pyramid3dAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        this.z = z, this.drawShape(pyramid3d, context, x, y, drawContext), this.z = 0, context.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(context.modelMatrix), 
         context.modelMatrix = lastModelMatrix, context.highPerformanceRestore();
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/pyramid3d-render.ts"],"names":[],"mappings":"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","file":"pyramid3d-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport {\n  getExtraModelMatrix,\n  getTheme,\n  multiplyMat4Mat3,\n  multiplyMat4Mat4,\n  PYRAMID3D_NUMBER_TYPE\n} from '../../../graphic';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IDirectionLight,\n  IMarkAttribute,\n  IPyramid3d,\n  IFace3d,\n  IThemeAttribute,\n  vec3,\n  ICamera,\n  IPolygonItem\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { colorString } from '../../../color-string';\nimport { max, min } from '@visactor/vutils';\nimport { mat4Allocate } from '../../../modules';\nimport { BaseRender } from './base-render';\n\n@injectable()\nexport class DefaultCanvasPyramid3dRender extends BaseRender<IPyramid3d> implements IGraphicRender {\n  type = 'pyramid3d';\n  numberType: number = PYRAMID3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    pyramid3d: IPyramid3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const pyramidAttribute = getTheme(pyramid3d, params?.theme).polygon;\n    const {\n      fill = pyramidAttribute.fill == null ? !!pyramid3d.attribute.fillColor : pyramidAttribute.fill,\n      stroke = pyramidAttribute.stroke == null ? !!pyramid3d.attribute.strokeColor : pyramidAttribute.stroke,\n      opacity = pyramidAttribute.opacity,\n      fillOpacity = pyramidAttribute.fillOpacity,\n      lineWidth = pyramidAttribute.lineWidth,\n      strokeOpacity = pyramidAttribute.strokeOpacity,\n      visible = pyramidAttribute.visible,\n      points,\n      face = [true, true, true, true, true, true]\n    } = pyramid3d.attribute;\n\n    const z = this.z ?? 0;\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 (!(pyramid3d.valid && visible && points.length === 4)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb)) {\n      return;\n    }\n\n    const { light, camera } = drawContext.stage || {};\n\n    const face3d = pyramid3d.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      let { fillColor = pyramidAttribute.fillColor } = pyramid3d.attribute;\n      if (typeof fillColor !== 'string') {\n        fillColor = 'black';\n      }\n      this.fill(x, y, z, face3d, face, fillColor, context, light, camera, pyramid3d, pyramidAttribute, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  stroke(x: number, y: number, z: number, face3d: IFace3d, context: IContext2d) {\n    const vertices = face3d.vertices;\n    face3d.edges.forEach(p => {\n      const p1 = vertices[p[0]];\n      const p2 = vertices[p[1]];\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.stroke();\n    });\n  }\n  fill(\n    x: number,\n    y: number,\n    z: number,\n    face3d: IFace3d,\n    faces: [boolean, boolean, boolean, boolean, boolean, boolean],\n    fillColor: string,\n    context: IContext2d,\n    light: IDirectionLight,\n    camera: ICamera,\n    pyramid3d: IPyramid3d,\n    pyramid3dAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const rgbArray = colorString.get(fillColor).value;\n\n    // 上下左右前后\n    // 0,1,2,3,4,5\n    const vertices = face3d.vertices;\n    // 计算每个顶点的view\n    const viewdVerticesZ = vertices.map(v => {\n      return context.view(v[0], v[1], v[2])[2];\n    });\n    // 排序\n    const sortFace: { faceIdx: number; polygon: IPolygonItem }[] = [];\n    face3d.polygons.forEach((p, i) => {\n      if (!faces[i]) {\n        return;\n      }\n      sortFace.push({\n        faceIdx: i,\n        polygon: p\n      });\n      // 设置ave_z进行排序\n      const { polygon, normal } = p;\n\n      const z1 = viewdVerticesZ[polygon[0]];\n      const z2 = viewdVerticesZ[polygon[1]];\n      const z3 = viewdVerticesZ[polygon[2]];\n      const z4 = viewdVerticesZ[polygon[3]];\n\n      p.ave_z = z1 + z2 + z3 + z4;\n    });\n    sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z);\n    sortFace.forEach(item => {\n      const { polygon, normal } = item.polygon;\n\n      const p1 = vertices[polygon[0]];\n      const p2 = vertices[polygon[1]];\n      const p3 = vertices[polygon[2]];\n      const p4 = vertices[polygon[3]];\n\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      const v3 = {\n        x: x + p3[0],\n        y: y + p3[1],\n        z: z + p3[2]\n      };\n      const v4 = {\n        x: x + p4[0],\n        y: y + p4[1],\n        z: z + p4[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.lineTo(v3.x, v3.y, v3.z);\n      context.lineTo(v4.x, v4.y, v4.z);\n      context.closePath();\n      if (fillCb) {\n        fillCb(context, pyramid3d.attribute, pyramid3dAttribute);\n      } else {\n        context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor;\n        context.fill();\n      }\n    });\n  }\n\n  draw(pyramid3d: IPyramid3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    context.highPerformanceSave();\n    const pyramid3dAttribute = getTheme(pyramid3d).polygon;\n    const data = this.transform(pyramid3d, pyramid3dAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(pyramid3d, context, x, y, drawContext);\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/pyramid3d-render.ts"],"names":[],"mappings":"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","file":"pyramid3d-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { PYRAMID3D_NUMBER_TYPE } from '../../../graphic/constants';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IDirectionLight,\n  IMarkAttribute,\n  IPyramid3d,\n  IFace3d,\n  IThemeAttribute,\n  ICamera,\n  IPolygonItem\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { colorString } from '../../../color-string';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BaseRender } from './base-render';\n\n@injectable()\nexport class DefaultCanvasPyramid3dRender extends BaseRender<IPyramid3d> implements IGraphicRender {\n  type = 'pyramid3d';\n  numberType: number = PYRAMID3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    pyramid3d: IPyramid3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const pyramidAttribute = getTheme(pyramid3d, params?.theme).polygon;\n    const {\n      fill = pyramidAttribute.fill,\n      stroke = pyramidAttribute.stroke,\n      opacity = pyramidAttribute.opacity,\n      fillOpacity = pyramidAttribute.fillOpacity,\n      lineWidth = pyramidAttribute.lineWidth,\n      strokeOpacity = pyramidAttribute.strokeOpacity,\n      visible = pyramidAttribute.visible,\n      points,\n      face = [true, true, true, true, true, true]\n    } = pyramid3d.attribute;\n\n    const z = this.z ?? 0;\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 (!(pyramid3d.valid && visible && points.length === 4)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb)) {\n      return;\n    }\n\n    const { light, camera } = drawContext.stage || {};\n\n    const face3d = pyramid3d.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      let fc = fill;\n      if (typeof fc !== 'string') {\n        fc = 'black';\n      }\n      this.fill(x, y, z, face3d, face, fc, context, light, camera, pyramid3d, pyramidAttribute, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  stroke(x: number, y: number, z: number, face3d: IFace3d, context: IContext2d) {\n    const vertices = face3d.vertices;\n    face3d.edges.forEach(p => {\n      const p1 = vertices[p[0]];\n      const p2 = vertices[p[1]];\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.stroke();\n    });\n  }\n  fill(\n    x: number,\n    y: number,\n    z: number,\n    face3d: IFace3d,\n    faces: [boolean, boolean, boolean, boolean, boolean, boolean],\n    fillColor: string,\n    context: IContext2d,\n    light: IDirectionLight,\n    camera: ICamera,\n    pyramid3d: IPyramid3d,\n    pyramid3dAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const rgbArray = colorString.get(fillColor).value;\n\n    // 上下左右前后\n    // 0,1,2,3,4,5\n    const vertices = face3d.vertices;\n    // 计算每个顶点的view\n    const viewdVerticesZ = vertices.map(v => {\n      return context.view(v[0], v[1], v[2])[2];\n    });\n    // 排序\n    const sortFace: { faceIdx: number; polygon: IPolygonItem }[] = [];\n    face3d.polygons.forEach((p, i) => {\n      if (!faces[i]) {\n        return;\n      }\n      sortFace.push({\n        faceIdx: i,\n        polygon: p\n      });\n      // 设置ave_z进行排序\n      const { polygon, normal } = p;\n\n      const z1 = viewdVerticesZ[polygon[0]];\n      const z2 = viewdVerticesZ[polygon[1]];\n      const z3 = viewdVerticesZ[polygon[2]];\n      const z4 = viewdVerticesZ[polygon[3]];\n\n      p.ave_z = z1 + z2 + z3 + z4;\n    });\n    sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z);\n    sortFace.forEach(item => {\n      const { polygon, normal } = item.polygon;\n\n      const p1 = vertices[polygon[0]];\n      const p2 = vertices[polygon[1]];\n      const p3 = vertices[polygon[2]];\n      const p4 = vertices[polygon[3]];\n\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      const v3 = {\n        x: x + p3[0],\n        y: y + p3[1],\n        z: z + p3[2]\n      };\n      const v4 = {\n        x: x + p4[0],\n        y: y + p4[1],\n        z: z + p4[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.lineTo(v3.x, v3.y, v3.z);\n      context.lineTo(v4.x, v4.y, v4.z);\n      context.closePath();\n      if (fillCb) {\n        fillCb(context, pyramid3d.attribute, pyramid3dAttribute);\n      } else {\n        context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor;\n        context.fill();\n      }\n    });\n  }\n\n  draw(pyramid3d: IPyramid3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    context.highPerformanceSave();\n    const pyramid3dAttribute = getTheme(pyramid3d).polygon;\n    const data = this.transform(pyramid3d, pyramid3dAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(pyramid3d, context, x, y, drawContext);\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/rect-render.d.ts

@@ -1,4 +1,4 @@
-import { ContributionProvider } from '../../../common';
+import { ContributionProvider } from '../../../common/contribution-provider';
 import { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';
 import { IDrawContext, IRenderService } from '../../render-service';
 import { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';

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

@@ -16,21 +16,21 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasRectRender = void 0;
 
-const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), common_1 = require("../../../common"), rect_contribution_render_1 = require("./contributions/rect-contribution-render"), utils_1 = require("./utils"), base_contribution_render_1 = require("./contributions/base-contribution-render");
+const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), rect_1 = require("../../../common/shape/rect"), contribution_provider_1 = require("../../../common/contribution-provider"), rect_contribution_render_1 = require("./contributions/rect-contribution-render"), utils_1 = require("./utils"), base_contribution_render_1 = require("./contributions/base-contribution-render");
 
 let DefaultCanvasRectRender = class {
     constructor(rectRenderContribitions) {
-        this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = graphic_1.RECT_NUMBER_TYPE;
+        this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = constants_1.RECT_NUMBER_TYPE;
     }
     drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const rectAttribute = (0, graphic_1.getTheme)(rect, null == params ? void 0 : params.theme).rect, {fill: fill = (null == rectAttribute.fill ? !!rect.attribute.fillColor : rectAttribute.fill), background: background, stroke: stroke = (null == rectAttribute.stroke ? !!rect.attribute.strokeColor : rectAttribute.stroke), width: width = rectAttribute.width, height: height = rectAttribute.height, borderRadius: borderRadius = rectAttribute.borderRadius, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, fVisible = (0, 
+        const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect, {fill: fill = rectAttribute.fill, background: background, stroke: stroke = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, borderRadius: borderRadius = rectAttribute.borderRadius, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, fVisible = (0, 
         utils_1.rectFillVisible)(opacity, fillOpacity, width, height), sVisible = (0, utils_1.rectStrokeVisible)(opacity, strokeOpacity, width, height), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!rect.valid || !visible) return;
         if (!(doFill || doStroke || background)) return;
         if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
         0 === borderRadius || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (context.beginPath(), 
-        context.rect(x, y, width, height)) : (context.beginPath(), (0, common_1.createRectPath)(context, x, y, width, height, borderRadius)), 
+        context.rect(x, y, width, height)) : (context.beginPath(), (0, rect_1.createRectPath)(context, x, y, width, height, borderRadius)), 
         this._rectRenderContribitions || (this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [], 
         this._rectRenderContribitions.sort(((a, b) => b.order - a.order)));
         const doFillOrStroke = {
@@ -50,7 +50,7 @@ let DefaultCanvasRectRender = class {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const rectAttribute = (0, graphic_1.getTheme)(rect, null == params ? void 0 : params.theme).rect;
+        const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect;
         let {x: x = rectAttribute.x, y: y = rectAttribute.y} = rect.attribute;
         if (rect.transMatrix.onlyTranslate()) {
             const point = rect.getOffsetXY(rectAttribute);
@@ -62,6 +62,7 @@ let DefaultCanvasRectRender = class {
 };
 
 DefaultCanvasRectRender = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(rect_contribution_render_1.RectRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasRectRender), 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
+inversify_1.named)(rect_contribution_render_1.RectRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasRectRender), 
 exports.DefaultCanvasRectRender = DefaultCanvasRectRender;
 //# sourceMappingURL=rect-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/rect-render.ts"],"names":[],"mappings":"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","file":"rect-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme, RECT_NUMBER_TYPE } from '../../../graphic';\nimport { ContributionProvider, createRectPath } from '../../../common';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { IRectRenderContribution, RectRenderContribution } from './contributions/rect-contribution-render';\nimport { drawPathProxy, rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasRectRender implements IGraphicRender {\n  type = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  protected _rectRenderContribitions: IRectRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(RectRenderContribution)\n    protected readonly rectRenderContribitions: ContributionProvider<IRectRenderContribution>\n  ) {}\n\n  drawShape(\n    rect: IRect,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    const {\n      fill = rectAttribute.fill == null ? !!rect.attribute.fillColor : rectAttribute.fill,\n      background,\n      stroke = rectAttribute.stroke == null ? !!rect.attribute.strokeColor : rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      borderRadius = rectAttribute.borderRadius,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible\n    } = rect.attribute;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.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    if (borderRadius === 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, borderRadius);\n    }\n\n    if (!this._rectRenderContribitions) {\n      this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [];\n      this._rectRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    this._rectRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(\n          rect,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          rectAttribute,\n          fillCb,\n          strokeCb,\n          doFillOrStroke\n        );\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, rect.attribute, rectAttribute);\n      } else if (fVisible) {\n        // 存在fill\n        context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.fill();\n      }\n    }\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, rect.attribute, rectAttribute);\n      } else if (sVisible) {\n        // 存在stroke\n        context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.stroke();\n      }\n    }\n\n    this._rectRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    if (drawPathProxy(rect, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(rect, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/rect-render.ts"],"names":[],"mappings":"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","file":"rect-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { IRectRenderContribution, RectRenderContribution } from './contributions/rect-contribution-render';\nimport { drawPathProxy, rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasRectRender implements IGraphicRender {\n  type = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  protected _rectRenderContribitions: IRectRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(RectRenderContribution)\n    protected readonly rectRenderContribitions: ContributionProvider<IRectRenderContribution>\n  ) {}\n\n  drawShape(\n    rect: IRect,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    const {\n      fill = rectAttribute.fill,\n      background,\n      stroke = rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      borderRadius = rectAttribute.borderRadius,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible\n    } = rect.attribute;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.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    if (borderRadius === 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, borderRadius);\n    }\n\n    if (!this._rectRenderContribitions) {\n      this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [];\n      this._rectRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    this._rectRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(\n          rect,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          rectAttribute,\n          fillCb,\n          strokeCb,\n          doFillOrStroke\n        );\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, rect.attribute, rectAttribute);\n      } else if (fVisible) {\n        // 存在fill\n        context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.fill();\n      }\n    }\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, rect.attribute, rectAttribute);\n      } else if (sVisible) {\n        // 存在stroke\n        context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n        context.stroke();\n      }\n    }\n\n    this._rectRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    if (drawPathProxy(rect, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(rect, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

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

@@ -10,15 +10,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasRect3dRender = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), utils_1 = require("./utils"), color_string_1 = require("../../../color-string"), modules_1 = require("../../../modules"), base_render_1 = require("./base-render");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), utils_1 = require("./utils"), color_string_1 = require("../../../color-string"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), base_render_1 = require("./base-render"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasRect3dRender = class extends base_render_1.BaseRender {
     constructor() {
-        super(...arguments), this.type = "rect3d", this.numberType = graphic_1.RECT3D_NUMBER_TYPE;
+        super(...arguments), this.type = "rect3d", this.numberType = constants_1.RECT3D_NUMBER_TYPE;
     }
     drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
-        const rectAttribute = (0, graphic_1.getTheme)(rect, null == params ? void 0 : params.theme).rect3d, {fill: fill = (null == rectAttribute.fill ? !!rect.attribute.fillColor : rectAttribute.fill), stroke: stroke = (null == rectAttribute.stroke ? !!rect.attribute.strokeColor : rectAttribute.stroke), width: width = rectAttribute.width, height: height = rectAttribute.height, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, fVisible = (0, 
+        const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect3d, {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, fVisible = (0, 
         utils_1.rectFillVisible)(opacity, fillOpacity, width, height), sVisible = (0, utils_1.rectStrokeVisible)(opacity, strokeOpacity, width, height), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!rect.valid || !visible) return;
@@ -27,8 +27,8 @@ let DefaultCanvasRect3dRender = class extends base_render_1.BaseRender {
         const {light: light, camera: camera} = drawContext.stage || {}, face3d = rect.findFace();
         if (!1 !== fill) {
             context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);
-            let {fillColor: fillColor = rectAttribute.fillColor} = rect.attribute;
-            "string" != typeof fillColor && (fillColor = "black"), this.fill(x, y, z, face3d, fillColor, context, light, fillCb);
+            let fc = fill;
+            "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, fc, context, light, fillCb);
         }
         !1 !== stroke && (context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute), 
         this.stroke(x, y, z, face3d, context));
@@ -86,8 +86,8 @@ let DefaultCanvasRect3dRender = class extends base_render_1.BaseRender {
         const {context: context} = drawContext;
         if (!context) return;
         context.highPerformanceSave();
-        const rectAttribute = (0, graphic_1.getTheme)(rect).rect, data = this.transform(rect, rectAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        this.z = z, this.drawShape(rect, context, x, y, drawContext), this.z = 0, context.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(context.modelMatrix), 
+        const rectAttribute = (0, theme_1.getTheme)(rect).rect, data = this.transform(rect, rectAttribute, context), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        this.z = z, this.drawShape(rect, context, x, y, drawContext), this.z = 0, context.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(context.modelMatrix), 
         context.modelMatrix = lastModelMatrix, context.highPerformanceRestore();
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/rect3d-render.ts"],"names":[],"mappings":"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","file":"rect3d-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport {\n  getExtraModelMatrix,\n  getTheme,\n  multiplyMat4Mat3,\n  multiplyMat4Mat4,\n  RECT3D_NUMBER_TYPE\n} from '../../../graphic';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IDirectionLight,\n  IFace3d,\n  IMarkAttribute,\n  IPolygonItem,\n  IRect3d,\n  IThemeAttribute,\n  vec3\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { colorString } from '../../../color-string';\nimport { mat4Allocate } from '../../../modules';\nimport { BaseRender } from './base-render';\n@injectable()\nexport class DefaultCanvasRect3dRender extends BaseRender<IRect3d> implements IGraphicRender {\n  type = 'rect3d';\n  numberType: number = RECT3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    rect: IRect3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect3d;\n    const {\n      fill = rectAttribute.fill == null ? !!rect.attribute.fillColor : rectAttribute.fill,\n      stroke = rectAttribute.stroke == null ? !!rect.attribute.strokeColor : rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible\n    } = rect.attribute;\n\n    const z = this.z ?? 0;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb)) {\n      return;\n    }\n\n    const { light, camera } = drawContext.stage || {};\n    const face3d = rect.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n      let { fillColor = rectAttribute.fillColor } = rect.attribute;\n      if (typeof fillColor !== 'string') {\n        fillColor = 'black';\n      }\n      this.fill(x, y, z, face3d, fillColor, context, light, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  stroke(x: number, y: number, z: number, face3d: IFace3d, context: IContext2d) {\n    const vertices = face3d.vertices;\n    face3d.edges.forEach(edge => {\n      const p1 = vertices[edge[0]];\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const p2 = vertices[edge[1]];\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.stroke();\n    });\n  }\n  fill(\n    x: number,\n    y: number,\n    z: number,\n    face3d: IFace3d,\n    fillColor: string,\n    context: IContext2d,\n    light: IDirectionLight,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const rgbArray = colorString.get(fillColor).value;\n    // 上下左右前后\n    // 0,1,2,3,4,5\n    const vertices = face3d.vertices;\n    // 计算每个顶点的view\n    const viewdVerticesZ = vertices.map(v => {\n      return context.view(v[0], v[1], v[2])[2];\n    });\n    // 排序\n    const sortFace: { faceIdx: number; polygon: IPolygonItem }[] = [];\n    face3d.polygons.forEach((p, i) => {\n      sortFace.push({\n        faceIdx: i,\n        polygon: p\n      });\n      // 设置ave_z进行排序\n      const { polygon, normal } = p;\n\n      const z1 = viewdVerticesZ[polygon[0]];\n      const z2 = viewdVerticesZ[polygon[1]];\n      const z3 = viewdVerticesZ[polygon[2]];\n      const z4 = viewdVerticesZ[polygon[3]];\n\n      p.ave_z = z1 + z2 + z3 + z4;\n    });\n    sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z);\n\n    sortFace.forEach(item => {\n      const { polygon, normal } = item.polygon;\n\n      const p1 = vertices[polygon[0]];\n      const p2 = vertices[polygon[1]];\n      const p3 = vertices[polygon[2]];\n      const p4 = vertices[polygon[3]];\n\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      const v3 = {\n        x: x + p3[0],\n        y: y + p3[1],\n        z: z + p3[2]\n      };\n      const v4 = {\n        x: x + p4[0],\n        y: y + p4[1],\n        z: z + p4[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.lineTo(v3.x, v3.y, v3.z);\n      context.lineTo(v4.x, v4.y, v4.z);\n      context.closePath();\n      if (fillCb) {\n        fillCb(context, null, null);\n      } else {\n        context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor;\n        context.fill();\n      }\n    });\n  }\n\n  draw(rect: IRect3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n\n    const data = this.transform(rect, rectAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(rect, context, x, y, drawContext);\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/rect3d-render.ts"],"names":[],"mappings":"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","file":"rect3d-render.js","sourcesContent":["import { injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IDirectionLight,\n  IFace3d,\n  IMarkAttribute,\n  IPolygonItem,\n  IRect3d,\n  IThemeAttribute,\n  vec3\n} from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { colorString } from '../../../color-string';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BaseRender } from './base-render';\nimport { RECT3D_NUMBER_TYPE } from '../../../graphic/constants';\n@injectable()\nexport class DefaultCanvasRect3dRender extends BaseRender<IRect3d> implements IGraphicRender {\n  type = 'rect3d';\n  numberType: number = RECT3D_NUMBER_TYPE;\n  declare z: number;\n\n  drawShape(\n    rect: IRect3d,\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 rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect, params?.theme).rect3d;\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      opacity = rectAttribute.opacity,\n      fillOpacity = rectAttribute.fillOpacity,\n      lineWidth = rectAttribute.lineWidth,\n      strokeOpacity = rectAttribute.strokeOpacity,\n      visible = rectAttribute.visible\n    } = rect.attribute;\n\n    const z = this.z ?? 0;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(rect.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb)) {\n      return;\n    }\n\n    const { light, camera } = drawContext.stage || {};\n    const face3d = rect.findFace();\n\n    if (fill !== false) {\n      context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n      let fc = fill;\n      if (typeof fc !== 'string') {\n        fc = 'black';\n      }\n      this.fill(x, y, z, face3d, fc, context, light, fillCb);\n    }\n    if (stroke !== false) {\n      context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);\n      this.stroke(x, y, z, face3d, context);\n    }\n  }\n\n  stroke(x: number, y: number, z: number, face3d: IFace3d, context: IContext2d) {\n    const vertices = face3d.vertices;\n    face3d.edges.forEach(edge => {\n      const p1 = vertices[edge[0]];\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const p2 = vertices[edge[1]];\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.stroke();\n    });\n  }\n  fill(\n    x: number,\n    y: number,\n    z: number,\n    face3d: IFace3d,\n    fillColor: string,\n    context: IContext2d,\n    light: IDirectionLight,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const rgbArray = colorString.get(fillColor).value;\n    // 上下左右前后\n    // 0,1,2,3,4,5\n    const vertices = face3d.vertices;\n    // 计算每个顶点的view\n    const viewdVerticesZ = vertices.map(v => {\n      return context.view(v[0], v[1], v[2])[2];\n    });\n    // 排序\n    const sortFace: { faceIdx: number; polygon: IPolygonItem }[] = [];\n    face3d.polygons.forEach((p, i) => {\n      sortFace.push({\n        faceIdx: i,\n        polygon: p\n      });\n      // 设置ave_z进行排序\n      const { polygon, normal } = p;\n\n      const z1 = viewdVerticesZ[polygon[0]];\n      const z2 = viewdVerticesZ[polygon[1]];\n      const z3 = viewdVerticesZ[polygon[2]];\n      const z4 = viewdVerticesZ[polygon[3]];\n\n      p.ave_z = z1 + z2 + z3 + z4;\n    });\n    sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z);\n\n    sortFace.forEach(item => {\n      const { polygon, normal } = item.polygon;\n\n      const p1 = vertices[polygon[0]];\n      const p2 = vertices[polygon[1]];\n      const p3 = vertices[polygon[2]];\n      const p4 = vertices[polygon[3]];\n\n      const v1 = {\n        x: x + p1[0],\n        y: y + p1[1],\n        z: z + p1[2]\n      };\n      const v2 = {\n        x: x + p2[0],\n        y: y + p2[1],\n        z: z + p2[2]\n      };\n      const v3 = {\n        x: x + p3[0],\n        y: y + p3[1],\n        z: z + p3[2]\n      };\n      const v4 = {\n        x: x + p4[0],\n        y: y + p4[1],\n        z: z + p4[2]\n      };\n      context.beginPath();\n      context.moveTo(v1.x, v1.y, v1.z);\n      context.lineTo(v2.x, v2.y, v2.z);\n      context.lineTo(v3.x, v3.y, v3.z);\n      context.lineTo(v4.x, v4.y, v4.z);\n      context.closePath();\n      if (fillCb) {\n        fillCb(context, null, null);\n      } else {\n        context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor;\n        context.fill();\n      }\n    });\n  }\n\n  draw(rect: IRect3d, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n\n    const data = this.transform(rect, rectAttribute, context);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.z = z;\n    this.drawShape(rect, context, x, y, drawContext);\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"]}