@visactor/vrender-core 0.19.4-alpha.4 → 0.19.4

package/cjs/render/contributions/render/incremental-draw-contribution.js

@@ -10,30 +10,6 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     return function(target, key) {
         decorator(target, key, paramIndex);
     };
-}, __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))((function(resolve, reject) {
-        function fulfilled(value) {
-            try {
-                step(generator.next(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function rejected(value) {
-            try {
-                step(generator.throw(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function step(result) {
-            var value;
-            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P((function(resolve) {
-                resolve(value);
-            }))).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    }));
 };
 
 Object.defineProperty(exports, "__esModule", {
@@ -49,106 +25,101 @@ var STATUS;
 }(STATUS || (STATUS = {}));
 
 let DefaultIncrementalDrawContribution = class extends draw_contribution_1.DefaultDrawContribution {
+    contributions;
+    lineRender;
+    areaRender;
+    drawItemInterceptorContributions;
+    rendering=!1;
+    currFrameStartAt=0;
+    currentIdx=0;
+    status=STATUS.NORMAL;
+    checkingForDrawPromise=null;
+    hooks={
+        completeDraw: new tapable_1.SyncHook([])
+    };
+    lastRenderService;
+    lastDrawContext;
+    count;
     constructor(contributions, lineRender, areaRender, drawItemInterceptorContributions) {
         super(contributions, drawItemInterceptorContributions), this.contributions = contributions, 
         this.lineRender = lineRender, this.areaRender = areaRender, this.drawItemInterceptorContributions = drawItemInterceptorContributions, 
-        this.rendering = !1, this.currFrameStartAt = 0, this.currentIdx = 0, this.status = STATUS.NORMAL, 
-        this.checkingForDrawPromise = null, this.hooks = {
-            completeDraw: new tapable_1.SyncHook([])
-        }, this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender), this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);
+        this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender), this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);
     }
-    draw(renderService, drawContext) {
-        return __awaiter(this, void 0, void 0, (function*() {
-            if (this.checkingForDrawPromise) return;
-            this.lastRenderService = renderService, this.lastDrawContext = drawContext, this.checkingForDrawPromise = this.checkForDraw(drawContext);
-            const skipDraw = yield this.checkingForDrawPromise;
-            if (this.checkingForDrawPromise = null, skipDraw) return;
-            this.currentRenderService = renderService;
-            const {context: context, viewBox: viewBox} = drawContext;
-            context && (context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0), 
-            context.save(), drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext), 
-            context.translate(viewBox.x1, viewBox.y1, !0), context.save(), renderService.renderTreeRoots.sort(((a, b) => {
-                var _a, _b;
-                return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : graphic_1.DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : graphic_1.DefaultAttribute.zIndex);
-            })).forEach((group => {
-                this.renderGroup(group, drawContext);
-            })), this.hooks.completeDraw.tap("top-draw", (() => {
-                context.restore(), context.restore(), context.draw(), context.inuse = !1, this.rendering = !1;
-            })));
-        }));
+    async draw(renderService, drawContext) {
+        if (this.checkingForDrawPromise) return;
+        this.lastRenderService = renderService, this.lastDrawContext = drawContext, this.checkingForDrawPromise = this.checkForDraw(drawContext);
+        const skipDraw = await this.checkingForDrawPromise;
+        if (this.checkingForDrawPromise = null, skipDraw) return;
+        this.currentRenderService = renderService;
+        const {context: context, viewBox: viewBox} = drawContext;
+        context && (context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0), 
+        context.save(), drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext), 
+        context.translate(viewBox.x1, viewBox.y1, !0), context.save(), renderService.renderTreeRoots.sort(((a, b) => (a.attribute.zIndex ?? graphic_1.DefaultAttribute.zIndex) - (b.attribute.zIndex ?? graphic_1.DefaultAttribute.zIndex))).forEach((group => {
+            this.renderGroup(group, drawContext);
+        })), this.hooks.completeDraw.tap("top-draw", (() => {
+            context.restore(), context.restore(), context.draw(), context.inuse = !1, this.rendering = !1;
+        })));
     }
-    _increaseRender(group, drawContext) {
-        return __awaiter(this, void 0, void 0, (function*() {
-            this.rendering = !0, yield this._renderIncrementalGroup(group, drawContext);
-        }));
+    async _increaseRender(group, drawContext) {
+        this.rendering = !0, await this._renderIncrementalGroup(group, drawContext);
     }
-    _renderIncrementalGroup(group, drawContext) {
-        return __awaiter(this, void 0, void 0, (function*() {
-            this.count = group.count, yield new Promise((resolve => {
-                this.renderItem(group, drawContext, {
-                    drawingCb: () => __awaiter(this, void 0, void 0, (function*() {
-                        if (2 !== group.count) yield (0, sort_1.foreachAsync)(group, graphic_1.DefaultAttribute.zIndex, ((item, i) => {
-                            if (this.status === STATUS.STOP) return !0;
-                            if (item.isContainer) return !1;
-                            if (i < this.currentIdx) return !1;
-                            const frameTail = this.currFrameStartAt + group.incremental;
-                            return i < frameTail && (this.currentIdx = i + 1, this.renderItem(item, drawContext)), 
-                            i === frameTail - 1 && (this.currFrameStartAt = this.currentIdx, this.waitToNextFrame());
-                        })), resolve(!1); else {
-                            const graphic = group.getChildAt(0);
-                            if (graphic.incremental && graphic.attribute.segments) for (graphic.incrementalAt || (graphic.incrementalAt = 0); graphic.incrementalAt < graphic.attribute.segments.length; ) drawContext.multiGraphicOptions = {
-                                startAtIdx: graphic.incrementalAt,
-                                length: graphic.incremental
-                            }, this.renderItem(graphic, drawContext), graphic.incrementalAt += graphic.incremental, 
-                            yield this.waitToNextFrame(); else this.renderItem(graphic, drawContext);
-                            resolve(!1);
-                        }
-                    }))
-                });
-            })), this.hooks.completeDraw.call();
-        }));
+    async _renderIncrementalGroup(group, drawContext) {
+        this.count = group.count, await new Promise((resolve => {
+            this.renderItem(group, drawContext, {
+                drawingCb: async () => {
+                    if (2 !== group.count) await (0, sort_1.foreachAsync)(group, graphic_1.DefaultAttribute.zIndex, ((item, i) => {
+                        if (this.status === STATUS.STOP) return !0;
+                        if (item.isContainer) return !1;
+                        if (i < this.currentIdx) return !1;
+                        const frameTail = this.currFrameStartAt + group.incremental;
+                        return i < frameTail && (this.currentIdx = i + 1, this.renderItem(item, drawContext)), 
+                        i === frameTail - 1 && (this.currFrameStartAt = this.currentIdx, this.waitToNextFrame());
+                    })), resolve(!1); else {
+                        const graphic = group.getChildAt(0);
+                        if (graphic.incremental && graphic.attribute.segments) for (graphic.incrementalAt || (graphic.incrementalAt = 0); graphic.incrementalAt < graphic.attribute.segments.length; ) drawContext.multiGraphicOptions = {
+                            startAtIdx: graphic.incrementalAt,
+                            length: graphic.incremental
+                        }, this.renderItem(graphic, drawContext), graphic.incrementalAt += graphic.incremental, 
+                        await this.waitToNextFrame(); else this.renderItem(graphic, drawContext);
+                        resolve(!1);
+                    }
+                }
+            });
+        })), this.hooks.completeDraw.call();
     }
-    waitToNextFrame() {
-        return __awaiter(this, void 0, void 0, (function*() {
-            return new Promise((resolve => {
-                this.global.getRequestAnimationFrame()((() => {
-                    resolve(!1);
-                }));
+    async waitToNextFrame() {
+        return new Promise((resolve => {
+            this.global.getRequestAnimationFrame()((() => {
+                resolve(!1);
             }));
         }));
     }
-    checkForDraw(drawContext) {
-        return __awaiter(this, void 0, void 0, (function*() {
-            let skip = this.rendering;
-            return drawContext.restartIncremental && (skip = !1, yield this.forceStop(), this.resetToInit()), 
-            skip;
-        }));
+    async checkForDraw(drawContext) {
+        let skip = this.rendering;
+        return drawContext.restartIncremental && (skip = !1, await this.forceStop(), this.resetToInit()), 
+        skip;
     }
-    forceStop() {
-        return __awaiter(this, void 0, void 0, (function*() {
-            this.rendering && (this.status = STATUS.STOP, yield new Promise((resolve => {
-                this.hooks.completeDraw.tap("stopCb", (() => {
-                    this.status = STATUS.NORMAL, this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter((item => "stopCb" !== item.name)), 
-                    resolve(!1);
-                }));
-            })));
-        }));
+    async forceStop() {
+        this.rendering && (this.status = STATUS.STOP, await new Promise((resolve => {
+            this.hooks.completeDraw.tap("stopCb", (() => {
+                this.status = STATUS.NORMAL, this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter((item => "stopCb" !== item.name)), 
+                resolve(!1);
+            }));
+        })));
     }
     resetToInit() {
         this.currFrameStartAt = 0, this.currentIdx = 0;
     }
-    renderGroup(group, drawContext) {
-        return __awaiter(this, void 0, void 0, (function*() {
-            if (!drawContext.break && !1 !== group.attribute.visibleAll) return group.incremental && drawContext.startAtId === group._uid ? (yield this._increaseRender(group, drawContext), 
-            void (drawContext.break = !0)) : void (yield new Promise((resolve => {
-                this.renderItem(group, drawContext, {
-                    drawingCb: () => __awaiter(this, void 0, void 0, (function*() {
-                        yield (0, sort_1.foreachAsync)(group, graphic_1.DefaultAttribute.zIndex, (item => __awaiter(this, void 0, void 0, (function*() {
-                            drawContext.break || item.isContainer && (yield this.renderGroup(item, drawContext));
-                        })))), resolve(!1);
-                    }))
-                });
-            })));
+    async renderGroup(group, drawContext) {
+        if (!drawContext.break && !1 !== group.attribute.visibleAll) return group.incremental && drawContext.startAtId === group._uid ? (await this._increaseRender(group, drawContext), 
+        void (drawContext.break = !0)) : void await new Promise((resolve => {
+            this.renderItem(group, drawContext, {
+                drawingCb: async () => {
+                    await (0, sort_1.foreachAsync)(group, graphic_1.DefaultAttribute.zIndex, (async item => {
+                        drawContext.break || item.isContainer && await this.renderGroup(item, drawContext);
+                    })), resolve(!1);
+                }
+            });
         }));
     }
 };

package/cjs/render/contributions/render/incremental-draw-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/incremental-draw-contribution.ts"],"names":[],"mappings":"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","file":"incremental-draw-contribution.js","sourcesContent":["import { injectable, inject, named, multiInject } from '../../../common/inversify-lite';\nimport type {\n  IGraphic,\n  IGroup,\n  IGlobal,\n  IRenderService,\n  IDrawContext,\n  IDrawContribution,\n  IGraphicRender,\n  IRenderSelector,\n  IDrawItemInterceptorContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { DefaultAttribute } from '../../../graphic';\nimport { LayerService } from '../../../core/constants';\nimport { DefaultDrawContribution } from './draw-contribution';\nimport { SyncHook } from '../../../tapable';\nimport { GraphicRender, RenderSelector } from './symbol';\nimport { DefaultIncrementalCanvasLineRender } from './incremental-line-render';\nimport { DefaultIncrementalCanvasAreaRender } from './incremental-area-render';\nimport { DrawItemInterceptor } from './draw-interceptor';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { foreachAsync } from '../../../common/sort';\n\nenum STATUS {\n  NORMAL = 0,\n  STOP = 1\n}\n\n/**\n * 增量渲染的contribution，基于树状结构针对图元的渲染\n * 不是单例模式\n */\n@injectable()\nexport class DefaultIncrementalDrawContribution extends DefaultDrawContribution implements IDrawContribution {\n  rendering: boolean = false;\n  protected currFrameStartAt: number = 0;\n  protected currentIdx: number = 0;\n  protected status: STATUS = STATUS.NORMAL;\n  protected checkingForDrawPromise: Promise<any> | null = null;\n  hooks = {\n    completeDraw: new SyncHook<[]>([])\n  };\n  protected lastRenderService: IRenderService;\n  protected lastDrawContext: IDrawContext;\n  protected count: number;\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(GraphicRender)\n    // protected readonly contributions: ContributionProvider<IGraphicRender>,\n    @multiInject(GraphicRender) protected readonly contributions: IGraphicRender[],\n    // @inject(RenderSelector) protected readonly renderSelector: IRenderSelector, // 根据图元类型选择对应的renderItem进行渲染\n    @inject(DefaultIncrementalCanvasLineRender) protected readonly lineRender: IGraphicRender, // 默认的lineRender\n    @inject(DefaultIncrementalCanvasAreaRender) protected readonly areaRender: IGraphicRender, // 默认的lineRender\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(DrawItemInterceptor)\n    protected readonly drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    super(contributions, drawItemInterceptorContributions);\n    this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender);\n    this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);\n  }\n\n  /**\n   *\n   * @param renderService\n   * @param drawContext restartIncremental为true表示重新执行增量渲染，为false表示不执行增量渲染\n   * @returns\n   */\n  async draw(renderService: IRenderService, drawContext: IDrawContext): Promise<void> {\n    // 入口检查是否需要重新绘制\n    if (this.checkingForDrawPromise) {\n      return;\n    }\n    this.lastRenderService = renderService;\n    this.lastDrawContext = drawContext;\n\n    this.checkingForDrawPromise = this.checkForDraw(drawContext);\n    const skipDraw = await this.checkingForDrawPromise;\n    this.checkingForDrawPromise = null;\n    if (skipDraw) {\n      return;\n    }\n\n    this.currentRenderService = renderService;\n    const { context, viewBox } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // 增量渲染不需要dirtyBounds\n    // const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(x, y, x + width, y + height);\n    // if (stage.dirtyBounds) {\n    //   const b = getRectIntersect(dirtyBounds, stage.dirtyBounds, false);\n    //   dirtyBounds.x1 = Math.floor(b.x1);\n    //   dirtyBounds.y1 = Math.floor(b.y1);\n    //   dirtyBounds.x2 = Math.ceil(b.x2);\n    //   dirtyBounds.y2 = Math.ceil(b.y2);\n    // }\n    context.inuse = true;\n    // 初始化context\n    context.clearMatrix();\n    context.setTransformForCurrent(true);\n\n    // const drawInArea =\n    //   dirtyBounds.width() * context.dpr !== context.canvas.width ||\n    //   dirtyBounds.height() * context.dpr !== context.canvas.height;\n    context.save();\n\n    // if (drawInArea) {\n    //   context.beginPath();\n    //   context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n    //   context.clip();\n    // }\n\n    // this.clearScreen(renderService, context, drawContext);\n\n    // 绘制之前需要清空画布\n    drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext);\n    // 设置translate\n    context.translate(viewBox.x1, viewBox.y1, true);\n\n    context.save();\n    renderService.renderTreeRoots\n      .sort((a, b) => {\n        return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n      })\n      .forEach(group => {\n        this.renderGroup(group as IGroup, drawContext);\n      });\n\n    this.hooks.completeDraw.tap('top-draw', () => {\n      context.restore();\n      context.restore();\n      context.draw();\n      context.inuse = false;\n      this.rendering = false;\n    });\n  }\n\n  protected async _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    this.rendering = true;\n    await this._renderIncrementalGroup(group, drawContext);\n    return;\n  }\n\n  // 默认group后只有一层节点，也就是group是叶子结点的父节点\n  protected async _renderIncrementalGroup(group: IGroup, drawContext: IDrawContext) {\n    this.count = group.count;\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          // 增量图元只支持一个，线段和面积图\n          if (group.count === 2) {\n            const graphic = group.getChildAt(0) as IGraphic;\n            if (graphic.incremental && (graphic.attribute as any).segments) {\n              if (!graphic.incrementalAt) {\n                graphic.incrementalAt = 0;\n              }\n              while (graphic.incrementalAt < (graphic.attribute as any).segments.length) {\n                drawContext.multiGraphicOptions = {\n                  startAtIdx: graphic.incrementalAt,\n                  length: graphic.incremental\n                };\n                this.renderItem(graphic, drawContext);\n                graphic.incrementalAt += graphic.incremental;\n                await this.waitToNextFrame();\n              }\n            } else {\n              this.renderItem(graphic, drawContext);\n            }\n            resolve(false);\n            return;\n          }\n          await foreachAsync(group, DefaultAttribute.zIndex, (item: IGraphic, i: number) => {\n            if (this.status === STATUS.STOP) {\n              return true;\n            }\n            if (item.isContainer) {\n              // 增量渲染group下不应该有其他的group节点\n              return false;\n            }\n            // 如果小于currentIdx，说明还没到当前的位置，那就直接跳过\n            if (i < this.currentIdx) {\n              return false;\n            }\n            const frameTail = this.currFrameStartAt + group.incremental;\n            // 绘制 currentIdx到this.lastFrameIdx + group.incremental的内容\n            if (i < frameTail) {\n              this.currentIdx = i + 1;\n              this.renderItem(item, drawContext);\n            }\n            // 下一帧\n            if (i === frameTail - 1) {\n              this.currFrameStartAt = this.currentIdx;\n              // this.lastFrameIdx = this.currentIdx;\n              return this.waitToNextFrame();\n            }\n\n            return false;\n          });\n          resolve(false);\n        }\n      });\n    });\n    this.hooks.completeDraw.call();\n  }\n\n  protected async waitToNextFrame(): Promise<boolean> {\n    return new Promise(resolve => {\n      this.global.getRequestAnimationFrame()(() => {\n        resolve(false);\n      });\n    });\n  }\n\n  /**\n   * 检查这次绘制是否跳过，以及执行一些准备\n   * 增量渲染有自己的绘制逻辑流程，外部每次触发draw，该图层不一定会执行\n   * @returns 返回true代表跳过绘制，false代表进行绘制\n   */\n  protected async checkForDraw(drawContext: IDrawContext): Promise<boolean> {\n    let skip = this.rendering;\n    if (drawContext.restartIncremental) {\n      skip = false;\n      await this.forceStop();\n      this.resetToInit();\n    }\n    return skip;\n  }\n\n  protected async forceStop() {\n    if (this.rendering) {\n      this.status = STATUS.STOP;\n      await new Promise(resolve => {\n        this.hooks.completeDraw.tap('stopCb', () => {\n          this.status = STATUS.NORMAL;\n          this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter(item => {\n            return item.name !== 'stopCb';\n          });\n          resolve(false);\n        });\n      });\n    }\n  }\n\n  protected resetToInit() {\n    this.currFrameStartAt = 0;\n    this.currentIdx = 0;\n  }\n\n  async renderGroup(group: IGroup, drawContext: IDrawContext) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && drawContext.startAtId === group._uid) {\n      await this._increaseRender(group, drawContext);\n      drawContext.break = true;\n      return;\n    }\n\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          await foreachAsync(group, DefaultAttribute.zIndex, async (item: IGraphic) => {\n            if (drawContext.break) {\n              return;\n            }\n            if (item.isContainer) {\n              await this.renderGroup(item as IGroup, drawContext);\n            } else {\n              // 增量渲染不管非_increaseRender的内容\n              return;\n            }\n          });\n          resolve(false);\n        }\n      });\n    });\n  }\n\n  // /**\n  //  * 一个每一帧都执行的脚本，用于检查和触发执行draw\n  //  */\n  // protected autoRunner() {\n\n  // }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/incremental-draw-contribution.ts"],"names":[],"mappings":"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","file":"incremental-draw-contribution.js","sourcesContent":["import { injectable, inject, named, multiInject } from '../../../common/inversify-lite';\nimport type {\n  IGraphic,\n  IGroup,\n  IGlobal,\n  IRenderService,\n  IDrawContext,\n  IDrawContribution,\n  IGraphicRender,\n  IRenderSelector,\n  IDrawItemInterceptorContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { DefaultAttribute } from '../../../graphic';\nimport { LayerService } from '../../../core/constants';\nimport { DefaultDrawContribution } from './draw-contribution';\nimport { SyncHook } from '../../../tapable';\nimport { GraphicRender, RenderSelector } from './symbol';\nimport { DefaultIncrementalCanvasLineRender } from './incremental-line-render';\nimport { DefaultIncrementalCanvasAreaRender } from './incremental-area-render';\nimport { DrawItemInterceptor } from './draw-interceptor';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { foreachAsync } from '../../../common/sort';\n\nenum STATUS {\n  NORMAL = 0,\n  STOP = 1\n}\n\n/**\n * 增量渲染的contribution，基于树状结构针对图元的渲染\n * 不是单例模式\n */\n@injectable()\nexport class DefaultIncrementalDrawContribution extends DefaultDrawContribution implements IDrawContribution {\n  rendering: boolean = false;\n  protected currFrameStartAt: number = 0;\n  protected currentIdx: number = 0;\n  protected status: STATUS = STATUS.NORMAL;\n  protected checkingForDrawPromise: Promise<any> | null = null;\n  hooks = {\n    completeDraw: new SyncHook<[]>([])\n  };\n  protected lastRenderService: IRenderService;\n  protected lastDrawContext: IDrawContext;\n  protected count: number;\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(GraphicRender)\n    // protected readonly contributions: ContributionProvider<IGraphicRender>,\n    @multiInject(GraphicRender) protected readonly contributions: IGraphicRender[],\n    // @inject(RenderSelector) protected readonly renderSelector: IRenderSelector, // 根据图元类型选择对应的renderItem进行渲染\n    @inject(DefaultIncrementalCanvasLineRender) protected readonly lineRender: IGraphicRender, // 默认的lineRender\n    @inject(DefaultIncrementalCanvasAreaRender) protected readonly areaRender: IGraphicRender, // 默认的lineRender\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(DrawItemInterceptor)\n    protected readonly drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>\n  ) {\n    super(contributions, drawItemInterceptorContributions);\n    this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender);\n    this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);\n  }\n\n  /**\n   *\n   * @param renderService\n   * @param drawContext restartIncremental为true表示重新执行增量渲染，为false表示不执行增量渲染\n   * @returns\n   */\n  async draw(renderService: IRenderService, drawContext: IDrawContext): Promise<void> {\n    // 入口检查是否需要重新绘制\n    if (this.checkingForDrawPromise) {\n      return;\n    }\n    this.lastRenderService = renderService;\n    this.lastDrawContext = drawContext;\n\n    this.checkingForDrawPromise = this.checkForDraw(drawContext);\n    const skipDraw = await this.checkingForDrawPromise;\n    this.checkingForDrawPromise = null;\n    if (skipDraw) {\n      return;\n    }\n\n    this.currentRenderService = renderService;\n    const { context, viewBox } = drawContext;\n\n    if (!context) {\n      return;\n    }\n    // 增量渲染不需要dirtyBounds\n    // const dirtyBounds: IBounds | undefined = this.dirtyBounds.setValue(x, y, x + width, y + height);\n    // if (stage.dirtyBounds) {\n    //   const b = getRectIntersect(dirtyBounds, stage.dirtyBounds, false);\n    //   dirtyBounds.x1 = Math.floor(b.x1);\n    //   dirtyBounds.y1 = Math.floor(b.y1);\n    //   dirtyBounds.x2 = Math.ceil(b.x2);\n    //   dirtyBounds.y2 = Math.ceil(b.y2);\n    // }\n    context.inuse = true;\n    // 初始化context\n    context.clearMatrix();\n    context.setTransformForCurrent(true);\n\n    // const drawInArea =\n    //   dirtyBounds.width() * context.dpr !== context.canvas.width ||\n    //   dirtyBounds.height() * context.dpr !== context.canvas.height;\n    context.save();\n\n    // if (drawInArea) {\n    //   context.beginPath();\n    //   context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height());\n    //   context.clip();\n    // }\n\n    // this.clearScreen(renderService, context, drawContext);\n\n    // 绘制之前需要清空画布\n    drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext);\n    // 设置translate\n    context.translate(viewBox.x1, viewBox.y1, true);\n\n    context.save();\n    renderService.renderTreeRoots\n      .sort((a, b) => {\n        return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n      })\n      .forEach(group => {\n        this.renderGroup(group as IGroup, drawContext);\n      });\n\n    this.hooks.completeDraw.tap('top-draw', () => {\n      context.restore();\n      context.restore();\n      context.draw();\n      context.inuse = false;\n      this.rendering = false;\n    });\n  }\n\n  protected async _increaseRender(group: IGroup, drawContext: IDrawContext) {\n    this.rendering = true;\n    await this._renderIncrementalGroup(group, drawContext);\n    return;\n  }\n\n  // 默认group后只有一层节点，也就是group是叶子结点的父节点\n  protected async _renderIncrementalGroup(group: IGroup, drawContext: IDrawContext) {\n    this.count = group.count;\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          // 增量图元只支持一个，线段和面积图\n          if (group.count === 2) {\n            const graphic = group.getChildAt(0) as IGraphic;\n            if (graphic.incremental && (graphic.attribute as any).segments) {\n              if (!graphic.incrementalAt) {\n                graphic.incrementalAt = 0;\n              }\n              while (graphic.incrementalAt < (graphic.attribute as any).segments.length) {\n                drawContext.multiGraphicOptions = {\n                  startAtIdx: graphic.incrementalAt,\n                  length: graphic.incremental\n                };\n                this.renderItem(graphic, drawContext);\n                graphic.incrementalAt += graphic.incremental;\n                await this.waitToNextFrame();\n              }\n            } else {\n              this.renderItem(graphic, drawContext);\n            }\n            resolve(false);\n            return;\n          }\n          await foreachAsync(group, DefaultAttribute.zIndex, (item: IGraphic, i: number) => {\n            if (this.status === STATUS.STOP) {\n              return true;\n            }\n            if (item.isContainer) {\n              // 增量渲染group下不应该有其他的group节点\n              return false;\n            }\n            // 如果小于currentIdx，说明还没到当前的位置，那就直接跳过\n            if (i < this.currentIdx) {\n              return false;\n            }\n            const frameTail = this.currFrameStartAt + group.incremental;\n            // 绘制 currentIdx到this.lastFrameIdx + group.incremental的内容\n            if (i < frameTail) {\n              this.currentIdx = i + 1;\n              this.renderItem(item, drawContext);\n            }\n            // 下一帧\n            if (i === frameTail - 1) {\n              this.currFrameStartAt = this.currentIdx;\n              // this.lastFrameIdx = this.currentIdx;\n              return this.waitToNextFrame();\n            }\n\n            return false;\n          });\n          resolve(false);\n        }\n      });\n    });\n    this.hooks.completeDraw.call();\n  }\n\n  protected async waitToNextFrame(): Promise<boolean> {\n    return new Promise(resolve => {\n      this.global.getRequestAnimationFrame()(() => {\n        resolve(false);\n      });\n    });\n  }\n\n  /**\n   * 检查这次绘制是否跳过，以及执行一些准备\n   * 增量渲染有自己的绘制逻辑流程，外部每次触发draw，该图层不一定会执行\n   * @returns 返回true代表跳过绘制，false代表进行绘制\n   */\n  protected async checkForDraw(drawContext: IDrawContext): Promise<boolean> {\n    let skip = this.rendering;\n    if (drawContext.restartIncremental) {\n      skip = false;\n      await this.forceStop();\n      this.resetToInit();\n    }\n    return skip;\n  }\n\n  protected async forceStop() {\n    if (this.rendering) {\n      this.status = STATUS.STOP;\n      await new Promise(resolve => {\n        this.hooks.completeDraw.tap('stopCb', () => {\n          this.status = STATUS.NORMAL;\n          this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter(item => {\n            return item.name !== 'stopCb';\n          });\n          resolve(false);\n        });\n      });\n    }\n  }\n\n  protected resetToInit() {\n    this.currFrameStartAt = 0;\n    this.currentIdx = 0;\n  }\n\n  async renderGroup(group: IGroup, drawContext: IDrawContext) {\n    if (drawContext.break || group.attribute.visibleAll === false) {\n      return;\n    }\n    if (group.incremental && drawContext.startAtId === group._uid) {\n      await this._increaseRender(group, drawContext);\n      drawContext.break = true;\n      return;\n    }\n\n    await new Promise(resolve => {\n      this.renderItem(group, drawContext, {\n        drawingCb: async () => {\n          await foreachAsync(group, DefaultAttribute.zIndex, async (item: IGraphic) => {\n            if (drawContext.break) {\n              return;\n            }\n            if (item.isContainer) {\n              await this.renderGroup(item as IGroup, drawContext);\n            } else {\n              // 增量渲染不管非_increaseRender的内容\n              return;\n            }\n          });\n          resolve(false);\n        }\n      });\n    });\n  }\n\n  // /**\n  //  * 一个每一帧都执行的脚本，用于检查和触发执行draw\n  //  */\n  // protected autoRunner() {\n\n  // }\n}\n"]}

package/cjs/render/contributions/render/incremental-line-render.js

@@ -13,9 +13,7 @@ Object.defineProperty(exports, "__esModule", {
 const inversify_lite_1 = require("../../../common/inversify-lite"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), utils_1 = require("./utils"), line_render_1 = require("./line-render"), render_curve_1 = require("../../../common/render-curve");
 
 let DefaultIncrementalCanvasLineRender = class extends line_render_1.DefaultCanvasLineRender {
-    constructor() {
-        super(...arguments), this.numberType = constants_1.LINE_NUMBER_TYPE;
-    }
+    numberType=constants_1.LINE_NUMBER_TYPE;
     drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb) {
         if (line.incremental && drawContext.multiGraphicOptions) {
             const {startAtIdx: startAtIdx, length: length} = drawContext.multiGraphicOptions, {segments: segments = []} = line.attribute;

package/cjs/render/contributions/render/incremental-line-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/incremental-line-render.ts"],"names":[],"mappings":"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","file":"incremental-line-render.js","sourcesContent":["import { injectable } from '../../../common/inversify-lite';\nimport type {\n  IContext2d,\n  ILine,\n  ILineGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  ISegment,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IDrawContext\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { LINE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { DefaultCanvasLineRender } from './line-render';\nimport { drawIncrementalSegments } from '../../../common/render-curve';\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\n@injectable()\nexport class DefaultIncrementalCanvasLineRender extends DefaultCanvasLineRender implements IGraphicRender {\n  declare type: 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n\n  drawShape(\n    line: ILine,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // console.log(drawContext.multiGraphicOptions)\n    if (line.incremental && drawContext.multiGraphicOptions) {\n      const { startAtIdx, length } = drawContext.multiGraphicOptions;\n      const { segments = [] } = line.attribute;\n      if (startAtIdx > segments.length) {\n        return;\n      }\n\n      const lineAttribute = getTheme(line).line;\n\n      const {\n        fill = lineAttribute.fill,\n        stroke = lineAttribute.stroke,\n        opacity = lineAttribute.opacity,\n        fillOpacity = lineAttribute.fillOpacity,\n        strokeOpacity = lineAttribute.strokeOpacity,\n        lineWidth = lineAttribute.lineWidth,\n        visible = lineAttribute.visible\n      } = line.attribute;\n\n      // 不绘制或者透明\n      const fVisible = fillVisible(opacity, fillOpacity, fill);\n      const sVisible = strokeVisible(opacity, strokeOpacity);\n      const doFill = runFill(fill);\n      const doStroke = runStroke(stroke, lineWidth);\n\n      if (!(line.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 { context } = drawContext;\n      // 不支持clipRange，不支持pick，仅支持最基础的线段绘制\n      for (let i = startAtIdx; i < startAtIdx + length; i++) {\n        this.drawIncreaseSegment(\n          line,\n          context,\n          segments[i - 1],\n          segments[i],\n          line.attribute.segments[i],\n          [lineAttribute, line.attribute],\n          x,\n          y\n        );\n      }\n    } else {\n      super.drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n\n  drawIncreaseSegment(\n    line: ILine,\n    context: IContext2d,\n    lastSeg: ISegment,\n    seg: ISegment,\n    attribute: Partial<ILineGraphicAttribute>,\n    defaultAttribute: Required<ILineGraphicAttribute> | Partial<ILineGraphicAttribute>[],\n    offsetX: number,\n    offsetY: number\n  ) {\n    if (!seg) {\n      return;\n    }\n\n    context.beginPath();\n    drawIncrementalSegments(context.nativeContext, lastSeg, seg, { offsetX, offsetY });\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, attribute, defaultAttribute);\n    context.setStrokeStyle(line, attribute, offsetX, offsetY, defaultAttribute);\n    context.stroke();\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/incremental-line-render.ts"],"names":[],"mappings":"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","file":"incremental-line-render.js","sourcesContent":["import { injectable } from '../../../common/inversify-lite';\nimport type {\n  IContext2d,\n  ILine,\n  ILineGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  ISegment,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IDrawContext\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { LINE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { DefaultCanvasLineRender } from './line-render';\nimport { drawIncrementalSegments } from '../../../common/render-curve';\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\n@injectable()\nexport class DefaultIncrementalCanvasLineRender extends DefaultCanvasLineRender implements IGraphicRender {\n  declare type: 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n\n  drawShape(\n    line: ILine,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // console.log(drawContext.multiGraphicOptions)\n    if (line.incremental && drawContext.multiGraphicOptions) {\n      const { startAtIdx, length } = drawContext.multiGraphicOptions;\n      const { segments = [] } = line.attribute;\n      if (startAtIdx > segments.length) {\n        return;\n      }\n\n      const lineAttribute = getTheme(line).line;\n\n      const {\n        fill = lineAttribute.fill,\n        stroke = lineAttribute.stroke,\n        opacity = lineAttribute.opacity,\n        fillOpacity = lineAttribute.fillOpacity,\n        strokeOpacity = lineAttribute.strokeOpacity,\n        lineWidth = lineAttribute.lineWidth,\n        visible = lineAttribute.visible\n      } = line.attribute;\n\n      // 不绘制或者透明\n      const fVisible = fillVisible(opacity, fillOpacity, fill);\n      const sVisible = strokeVisible(opacity, strokeOpacity);\n      const doFill = runFill(fill);\n      const doStroke = runStroke(stroke, lineWidth);\n\n      if (!(line.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 { context } = drawContext;\n      // 不支持clipRange，不支持pick，仅支持最基础的线段绘制\n      for (let i = startAtIdx; i < startAtIdx + length; i++) {\n        this.drawIncreaseSegment(\n          line,\n          context,\n          segments[i - 1],\n          segments[i],\n          line.attribute.segments[i],\n          [lineAttribute, line.attribute],\n          x,\n          y\n        );\n      }\n    } else {\n      super.drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n\n  drawIncreaseSegment(\n    line: ILine,\n    context: IContext2d,\n    lastSeg: ISegment,\n    seg: ISegment,\n    attribute: Partial<ILineGraphicAttribute>,\n    defaultAttribute: Required<ILineGraphicAttribute> | Partial<ILineGraphicAttribute>[],\n    offsetX: number,\n    offsetY: number\n  ) {\n    if (!seg) {\n      return;\n    }\n\n    context.beginPath();\n    drawIncrementalSegments(context.nativeContext, lastSeg, seg, { offsetX, offsetY });\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, attribute, defaultAttribute);\n    context.setStrokeStyle(line, attribute, offsetX, offsetY, defaultAttribute);\n    context.stroke();\n  }\n}\n"]}

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

@@ -13,18 +13,16 @@ Object.defineProperty(exports, "__esModule", {
 const vutils_1 = require("@visactor/vutils"), inversify_lite_1 = require("../../../common/inversify-lite"), theme_1 = require("../../../graphic/theme"), constants_1 = require("../../../graphic/constants"), base_render_1 = require("./base-render"), render_curve_1 = require("../../../common/render-curve"), segment_1 = require("../../../common/segment");
 
 let DefaultCanvasLineRender = class extends base_render_1.BaseRender {
-    constructor() {
-        super(...arguments), this.numberType = constants_1.LINE_NUMBER_TYPE;
-    }
+    type;
+    numberType=constants_1.LINE_NUMBER_TYPE;
     draw(line, renderService, drawContext, params) {
-        const lineAttribute = (0, theme_1.getTheme)(line, null == params ? void 0 : params.theme).line;
+        const lineAttribute = (0, theme_1.getTheme)(line, params?.theme).line;
         this._draw(line, lineAttribute, !1, drawContext, params);
     }
     drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e;
         if (!cache) return;
         context.beginPath();
-        const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
+        const z = this.z ?? 0;
         (0, render_curve_1.drawSegments)(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
             offsetX: offsetX,
             offsetY: offsetY,
@@ -36,13 +34,12 @@ let DefaultCanvasLineRender = class extends base_render_1.BaseRender {
         context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), 
         context.stroke()));
         let {connectedType: connectedType, connectedX: connectedX, connectedY: connectedY, connectedStyle: connectedStyle} = attribute;
-        if ((0, vutils_1.isArray)(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, 
-        connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, 
-        connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, 
-        connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, 
-        connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, 
-        connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), 
-        "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), 
+        if ((0, vutils_1.isArray)(defaultAttribute) ? (connectedType = connectedType ?? defaultAttribute[0].connectedType ?? defaultAttribute[1].connectedType, 
+        connectedX = connectedX ?? defaultAttribute[0].connectedX ?? defaultAttribute[1].connectedX, 
+        connectedY = connectedY ?? defaultAttribute[0].connectedY ?? defaultAttribute[1].connectedY, 
+        connectedStyle = connectedStyle ?? defaultAttribute[0].connectedStyle ?? defaultAttribute[1].connectedStyle) : (connectedType = connectedType ?? defaultAttribute.connectedType, 
+        connectedX = connectedX ?? defaultAttribute.connectedX, connectedY = connectedY ?? defaultAttribute.connectedY, 
+        connectedStyle = connectedStyle ?? defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), 
         "none" !== connectedType) {
             context.beginPath(), (0, render_curve_1.drawSegments)(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
                 offsetX: offsetX,
@@ -62,9 +59,8 @@ let DefaultCanvasLineRender = class extends base_render_1.BaseRender {
         return !1;
     }
     drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
-        var _a;
         context.beginPath();
-        const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0, {points: points} = line.attribute, startP = points[0];
+        const z = this.z ?? 0, {points: points} = line.attribute, startP = points[0];
         context.moveTo(startP.x + offsetX, startP.y + offsetY, z);
         for (let i = 1; i < points.length; i++) {
             const p = points[i];
@@ -77,7 +73,7 @@ let DefaultCanvasLineRender = class extends base_render_1.BaseRender {
         context.stroke()));
     }
     drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const lineAttribute = (0, theme_1.getTheme)(line, null == params ? void 0 : params.theme).line, {fill: fill = lineAttribute.fill, stroke: stroke = lineAttribute.stroke, fillOpacity: fillOpacity = lineAttribute.fillOpacity, strokeOpacity: strokeOpacity = lineAttribute.strokeOpacity, segments: segments, points: points, closePath: closePath} = line.attribute;
+        const lineAttribute = (0, theme_1.getTheme)(line, params?.theme).line, {fill: fill = lineAttribute.fill, stroke: stroke = lineAttribute.stroke, fillOpacity: fillOpacity = lineAttribute.fillOpacity, strokeOpacity: strokeOpacity = lineAttribute.strokeOpacity, segments: segments, points: points, closePath: closePath} = line.attribute;
         if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
         let {curveType: curveType = lineAttribute.curveType} = line.attribute;
         closePath && "linear" === curveType && (curveType = "linearClosed");

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/line-render.ts"],"names":[],"mappings":";;;;;;;;;AACA,6CAAgD;AAChD,mEAA4D;AAe5D,kDAAkD;AAClD,0DAA8D;AAE9D,+CAA2C;AAE3C,+DAA4D;AAC5D,qDAAwD;AAOjD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,wBAAiB;IAAvD;;QAEL,eAAU,GAAW,4BAAgB,CAAC;IA6axC,CAAC;IA1aC,IAAI,CAAC,IAAW,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC3G,MAAM,aAAa,GAAG,IAAA,gBAAQ,EAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAiBS,eAAe,CACvB,OAAmB,EACnB,KAAiB,EACjB,IAAa,EACb,MAAe,EACf,WAAmB,EACnB,aAAqB,EACrB,SAAyC,EACzC,gBAAoF,EACpF,SAAiB,EACjB,oBAA+C,EAC/C,OAAe,EACf,OAAe,EACf,IAAW,EACX,MAIY,EACZ,QAIY;;QAEZ,IAAI,CAAC,KAAK,EAAE;YACV,OAAO;SACR;QACD,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,CAAC,mCAAI,CAAC,CAAC;QAEtB,IAAA,2BAAY,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE;YACrG,OAAO;YACP,OAAO;YACP,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QAGH,IACE,IAAI,CAAC,KAAK;YACV,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACvC,IAAI,CAAC,SAAS,CAAC,SAAS;YACxB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAC3C;YACA,OAAO,CAAC,SAAS,EAAE,CAAC;SACrB;QAGD,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAE9F,MAAM,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;QACrD,MAAM,GAAG,GAAY,KAAK,CAAC;QAC3B,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;aAC9C;iBAAM,IAAI,WAAW,EAAE;gBACtB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,gBAAgB,CAAC,CAAC;gBAChG,OAAO,CAAC,IAAI,EAAE,CAAC;aAChB;SACF;QACD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;aAChD;iBAAM,IAAI,aAAa,EAAE;gBACxB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,gBAAgB,CAAC,CAAC;gBAChG,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;QAGD,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;QAC1E,IAAI,IAAA,gBAAO,EAAC,gBAAgB,CAAC,EAAE;YAC7B,aAAa,GAAG,MAAA,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,aAAa,mCAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACxG,UAAU,GAAG,MAAA,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,mCAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC5F,UAAU,GAAG,MAAA,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,mCAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC5F,cAAc,GAAG,MAAA,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,cAAc,mCAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;SAC7G;aAAM;YACL,aAAa,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,gBAAgB,CAAC,aAAa,CAAC;YAChE,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,gBAAgB,CAAC,UAAU,CAAC;YACvD,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,gBAAgB,CAAC,UAAU,CAAC;YACvD,cAAc,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,gBAAgB,CAAC,cAAc,CAAC;SACpE;QAED,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,MAAM,EAAE;YAC3D,aAAa,GAAG,MAAM,CAAC;SACxB;QACD,IAAI,aAAa,KAAK,MAAM,EAAE;YAC5B,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAA,2BAAY,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE;gBACrG,OAAO;gBACP,OAAO;gBACP,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,IAAI;gBACjB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,UAAU;gBACjB,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,EAAE,CAAC;YACd,IAAI,IAAA,gBAAO,EAAC,gBAAgB,CAAC,EAAE;gBAC7B,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;iBAAM;gBACL,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC3B;YACD,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEnB,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,IAAI,MAAM,EAAE;oBACV,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;iBAC9C;qBAAM,IAAI,WAAW,EAAE;oBACtB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC;oBACvF,OAAO,CAAC,IAAI,EAAE,CAAC;iBAChB;aACF;YACD,IAAI,MAAM,KAAK,KAAK,EAAE;gBACpB,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;iBAChD;qBAAM,IAAI,aAAa,EAAE;oBACxB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC;oBACvF,OAAO,CAAC,MAAM,EAAE,CAAC;iBAClB;aACF;SACF;QACD,OAAO,CAAC,CAAC,GAAG,CAAC;IACf,CAAC;IAGD,6BAA6B,CAC3B,IAAW,EACX,OAAmB,EACnB,IAAa,EACb,MAAe,EACf,WAAmB,EACnB,aAAqB,EACrB,OAAe,EACf,OAAe,EACf,aAA8C,EAC9C,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAEZ,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,CAAC,mCAAI,CAAC,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAEzB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;QAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;SACjD;QAGD,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAEhG,MAAM,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1D,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;aAChD;iBAAM,IAAI,WAAW,EAAE;gBACtB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,aAAa,CAAC,CAAC;gBAClG,OAAO,CAAC,IAAI,EAAE,CAAC;aAChB;SACF;QACD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;aAClD;iBAAM,IAAI,aAAa,EAAE;gBACxB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,aAAa,CAAC,CAAC;gBAClG,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,SAAS,CACP,IAAW,EACX,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;QAGZ,MAAM,aAAa,GAAG,IAAA,gBAAQ,EAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QAEzD,MAAM,EACJ,IAAI,GAAG,aAAa,CAAC,IAAI,EACzB,MAAM,GAAG,aAAa,CAAC,MAAM,EAC7B,WAAW,GAAG,aAAa,CAAC,WAAW,EACvC,aAAa,GAAG,aAAa,CAAC,aAAa,EAC3C,QAAQ,EACR,MAAM,EACN,SAAS,EACV,GAAG,IAAI,CAAC,SAAS,CAAC;QAEnB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,IAAI,EAAE,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7D,IAAI,SAAS,IAAI,SAAS,KAAK,QAAQ,EAAE;YACvC,SAAS,GAAG,cAAc,CAAC;SAC5B;QAED,MAAM,EAAE,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,EAAE,GACtG,IAAI,CAAC,SAAS,CAAC;QAEjB,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,IAAI,SAAS,KAAK,QAAQ,EAAE;YACpG,OAAO,IAAI,CAAC,6BAA6B,CACvC,IAAI,EACJ,OAAO,EACP,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,MAAM,EACR,WAAW,EACX,aAAa,EACb,CAAC,EACD,CAAC,EACD,aAAa,EACb,WAAW,EACX,MAAM,EACN,MAAM,EACN,QAAQ,CACT,CAAC;SACH;QAID,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC5B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YAE5C,MAAM,OAAO,GAAG,MAAM,CAAC;YACvB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;gBAC/B,IAAI,UAAsB,CAAC;gBAC3B,IAAI,OAA4E,CAAC;gBACjF,IAAI,CAAC,KAAK,GAAG,QAAQ;qBAClB,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAClB,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;wBAE1B,IAAI,KAAK,KAAK,CAAC,EAAE;4BACf,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;gCACX,CAAC,OAAO,GAAG;oCACT,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oCACrB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oCACrB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;iCACvD,CAAC,CAAC;4BACL,OAAO,IAAI,CAAC;yBACb;qBACF;oBAED,IAAI,KAAK,KAAK,CAAC,EAAE;wBACf,UAAU,GAAG;4BACX,CAAC,EAAE,OAAO,CAAC,IAAI;4BACf,CAAC,EAAE,OAAO,CAAC,IAAI;4BACf,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO;yBAC3D,CAAC;qBACH;yBAAM,IAAI,KAAK,GAAG,CAAC,EAAE;wBACpB,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;wBAC5B,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;wBAC5B,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;qBACxE;oBACD,MAAM,IAAI,GAAG,IAAA,uBAAa,EAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE;wBAChD,UAAU;qBACX,CAAC,CAAC;oBACH,OAAO,GAAG,IAAI,CAAC;oBACf,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;qBACD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAG1B,IAAI,SAAS,KAAK,cAAc,EAAE;oBAChC,IAAI,MAAkB,CAAC;oBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BAChD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;gCAC/B,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gCAChC,MAAM;6BACP;yBACF;wBACD,IAAI,MAAM,EAAE;4BACV,MAAM;yBACP;qBACF;oBACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBACzG;aACF;iBAAM,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;gBAClC,IAAI,CAAC,KAAK,GAAG,IAAA,uBAAa,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;aAChD;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,OAAO;aACR;YACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAC5B;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAE5E,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnC,QAAQ,CAAC,KAAK,EAAE,CAAC;aAClB;YACD,IAAI,SAAS,KAAK,CAAC,EAAE;gBACnB,IAAI,IAAI,GAAG,KAAK,CAAC;gBAEjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAClC,IAAI,IAAI,EAAE;wBACR,OAAO;qBACR;oBACD,IAAI,GAAG,IAAI,CAAC,eAAe,CACzB,OAAO,EACP,KAAK,EACL,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,MAAM,EACR,WAAW,EACX,aAAa,EACb,QAAQ,CAAC,KAAK,CAAC,EACf,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAC/B,SAAS,EACT,oBAAoB,EACpB,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,EACN,QAAQ,CACT,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;iBAAM;gBAGL,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;gBAEtE,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,CAAC;gBAEhD,IAAI,qBAAqB,GAAG,CAAC,CAAC;gBAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAClC,IAAI,IAAI,EAAE;wBACR,OAAO;qBACR;oBACD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;oBACvC,MAAM,GAAG,GAAG,CAAC,eAAe,GAAG,qBAAqB,CAAC,GAAG,YAAY,CAAC;oBACrE,qBAAqB,IAAI,YAAY,CAAC;oBACtC,IAAI,GAAG,GAAG,CAAC,EAAE;wBACX,IAAI,GAAG,IAAI,CAAC,eAAe,CACzB,OAAO,EACP,KAAK,EACL,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,MAAM,EACR,WAAW,EACX,aAAa,EACb,QAAQ,CAAC,KAAK,CAAC,EACf,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAC/B,IAAA,YAAG,EAAC,GAAG,EAAE,CAAC,CAAC,EACX,oBAAoB,EACpB,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,EACN,QAAQ,CACT,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;aAAM;YACL,IAAI,CAAC,eAAe,CAClB,OAAO,EACP,IAAI,CAAC,KAAmB,EACxB,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,MAAM,EACR,WAAW,EACX,aAAa,EACb,IAAI,CAAC,SAAS,EACd,aAAa,EACb,SAAS,EACT,oBAAoB,EACpB,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,EACN,QAAQ,CACT,CAAC;SACH;IACH,CAAC;CACF,CAAA;AA/aY,uBAAuB;IADnC,IAAA,2BAAU,GAAE;GACA,uBAAuB,CA+anC;AA/aY,0DAAuB","file":"line-render.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport { min, isArray } from '@visactor/vutils';\nimport { injectable } from '../../../common/inversify-lite';\nimport type {\n  IContext2d,\n  ILine,\n  ILineGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IClipRangeByDimensionType,\n  ISegPath2D,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { LINE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { BaseRender } from './base-render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { drawSegments } from '../../../common/render-curve';\nimport { calcLineCache } from '../../../common/segment';\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\n@injectable()\nexport class DefaultCanvasLineRender extends BaseRender<ILine> implements IGraphicRender {\n  type: 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n  declare z: number;\n\n  draw(line: ILine, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const lineAttribute = getTheme(line, params?.theme).line;\n    this._draw(line, lineAttribute, false, drawContext, params);\n  }\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: ISegPath2D,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    attribute: Partial<ILineGraphicAttribute>,\n    defaultAttribute: Required<ILineGraphicAttribute> | Partial<ILineGraphicAttribute>[],\n    clipRange: number,\n    clipRangeByDimension: IClipRangeByDimensionType,\n    offsetX: number,\n    offsetY: number,\n    line: ILine,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    if (!cache) {\n      return;\n    }\n    context.beginPath();\n\n    const z = this.z ?? 0;\n\n    drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {\n      offsetX,\n      offsetY,\n      offsetZ: z\n    });\n\n    // 如果是一根线，且是Closed，并且没有defined为false的点，需要close\n    if (\n      line.cache &&\n      !isArray(line.cache) &&\n      line.cache.curves.every(c => c.defined) &&\n      line.attribute.curveType &&\n      line.attribute.curveType.includes('Closed')\n    ) {\n      context.closePath();\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, attribute, defaultAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = attribute;\n    const ret: boolean = false;\n    if (fill !== false) {\n      if (fillCb) {\n        fillCb(context, attribute, defaultAttribute);\n      } else if (fillOpacity) {\n        context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n        context.fill();\n      }\n    }\n    if (stroke !== false) {\n      if (strokeCb) {\n        strokeCb(context, attribute, defaultAttribute);\n      } else if (strokeOpacity) {\n        context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n        context.stroke();\n      }\n    }\n\n    // 绘制connect区域\n    let { connectedType, connectedX, connectedY, connectedStyle } = attribute;\n    if (isArray(defaultAttribute)) {\n      connectedType = connectedType ?? defaultAttribute[0].connectedType ?? defaultAttribute[1].connectedType;\n      connectedX = connectedX ?? defaultAttribute[0].connectedX ?? defaultAttribute[1].connectedX;\n      connectedY = connectedY ?? defaultAttribute[0].connectedY ?? defaultAttribute[1].connectedY;\n      connectedStyle = connectedStyle ?? defaultAttribute[0].connectedStyle ?? defaultAttribute[1].connectedStyle;\n    } else {\n      connectedType = connectedType ?? defaultAttribute.connectedType;\n      connectedX = connectedX ?? defaultAttribute.connectedX;\n      connectedY = connectedY ?? defaultAttribute.connectedY;\n      connectedStyle = connectedStyle ?? defaultAttribute.connectedStyle;\n    }\n    // 如果有非法值就是none\n    if (connectedType !== 'connect' && connectedType !== 'zero') {\n      connectedType = 'none';\n    }\n    if (connectedType !== 'none') {\n      context.beginPath();\n      drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {\n        offsetX,\n        offsetY,\n        offsetZ: z,\n        drawConnect: true,\n        mode: connectedType,\n        zeroX: connectedX,\n        zeroY: connectedY\n      });\n\n      const da = [];\n      if (isArray(defaultAttribute)) {\n        defaultAttribute.forEach(i => da.push(i));\n      } else {\n        da.push(defaultAttribute);\n      }\n      da.push(attribute);\n\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, attribute, defaultAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);\n          context.fill();\n        }\n      }\n      if (stroke !== false) {\n        if (strokeCb) {\n          strokeCb(context, attribute, defaultAttribute);\n        } else if (strokeOpacity) {\n          context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);\n          context.stroke();\n        }\n      }\n    }\n    return !!ret;\n  }\n\n  // 高性能绘制linear line，不用拆分\n  drawLinearLineHighPerformance(\n    line: ILine,\n    context: IContext2d,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    offsetX: number,\n    offsetY: number,\n    lineAttribute: Required<ILineGraphicAttribute>,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    context.beginPath();\n\n    const z = this.z ?? 0;\n    const { points } = line.attribute;\n    const startP = points[0];\n\n    context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n    for (let i = 1; i < points.length; i++) {\n      const p = points[i];\n      context.lineTo(p.x + offsetX, p.y + offsetY, z);\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, line.attribute, lineAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = line.attribute;\n    if (fill !== false) {\n      if (fillCb) {\n        fillCb(context, line.attribute, lineAttribute);\n      } else if (fillOpacity) {\n        context.setCommonStyle(line, line.attribute, originX - offsetX, originY - offsetY, lineAttribute);\n        context.fill();\n      }\n    }\n    if (stroke !== false) {\n      if (strokeCb) {\n        strokeCb(context, line.attribute, lineAttribute);\n      } else if (strokeOpacity) {\n        context.setStrokeStyle(line, line.attribute, originX - offsetX, originY - offsetY, lineAttribute);\n        context.stroke();\n      }\n    }\n  }\n\n  drawShape(\n    line: ILine,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const lineAttribute = graphicService.themeService.getCurrentTheme().lineAttribute;\n    const lineAttribute = getTheme(line, params?.theme).line;\n\n    const {\n      fill = lineAttribute.fill,\n      stroke = lineAttribute.stroke,\n      fillOpacity = lineAttribute.fillOpacity,\n      strokeOpacity = lineAttribute.strokeOpacity,\n      segments,\n      points,\n      closePath\n    } = line.attribute;\n\n    const data = this.valid(line, lineAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n\n    let { curveType = lineAttribute.curveType } = line.attribute;\n    if (closePath && curveType === 'linear') {\n      curveType = 'linearClosed';\n    }\n\n    const { clipRange = lineAttribute.clipRange, clipRangeByDimension = lineAttribute.clipRangeByDimension } =\n      line.attribute;\n\n    if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {\n      return this.drawLinearLineHighPerformance(\n        line,\n        context,\n        !!fill,\n        !!stroke,\n        fillOpacity,\n        strokeOpacity,\n        x,\n        y,\n        lineAttribute,\n        drawContext,\n        params,\n        fillCb,\n        strokeCb\n      );\n    }\n    // const { fVisible, sVisible, doFill, doStroke } = data;\n\n    // 更新cache\n    if (line.shouldUpdateShape()) {\n      const { points, segments } = line.attribute;\n\n      const _points = points;\n      if (segments && segments.length) {\n        let startPoint: IPointLike;\n        let lastSeg: { endX: number; endY: number; curves: Array<{ defined: boolean }> };\n        line.cache = segments\n          .map((seg, index) => {\n            if (seg.points.length <= 1) {\n              // 第一个点的话，直接设置lastTopSeg\n              if (index === 0) {\n                seg.points[0] &&\n                  (lastSeg = {\n                    endX: seg.points[0].x,\n                    endY: seg.points[0].y,\n                    curves: [{ defined: seg.points[0].defined !== false }]\n                  });\n                return null;\n              }\n            }\n            // 添加上一个segment结束的点作为这个segment的起始点\n            if (index === 1) {\n              startPoint = {\n                x: lastSeg.endX,\n                y: lastSeg.endY,\n                defined: lastSeg.curves[lastSeg.curves.length - 1].defined\n              };\n            } else if (index > 1) {\n              startPoint.x = lastSeg.endX;\n              startPoint.y = lastSeg.endY;\n              startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;\n            }\n            const data = calcLineCache(seg.points, curveType, {\n              startPoint\n            });\n            lastSeg = data;\n            return data;\n          })\n          .filter(item => !!item);\n\n        // 如果lineClosed，那就绘制到第一个点\n        if (curveType === 'linearClosed') {\n          let startP: IPointLike;\n          for (let i = 0; i < line.cache.length; i++) {\n            const cacheItem = line.cache[i];\n            for (let i = 0; i < cacheItem.curves.length; i++) {\n              if (cacheItem.curves[i].defined) {\n                startP = cacheItem.curves[i].p0;\n                break;\n              }\n            }\n            if (startP) {\n              break;\n            }\n          }\n          line.cache[line.cache.length - 1] && line.cache[line.cache.length - 1].lineTo(startP.x, startP.y, true);\n        }\n      } else if (points && points.length) {\n        line.cache = calcLineCache(_points, curveType);\n      } else {\n        line.cache = null;\n        line.clearUpdateShapeTag();\n        return;\n      }\n      line.clearUpdateShapeTag();\n    }\n\n    if (Array.isArray(line.cache)) {\n      const segments = line.attribute.segments.filter(item => item.points.length);\n      // 如果第一个seg只有一个点，那么shift出去\n      if (segments[0].points.length === 1) {\n        segments.shift();\n      }\n      if (clipRange === 1) {\n        let skip = false;\n        // 性能优化，不需要clip的线段不需要计算长度\n        line.cache.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          skip = this.drawSegmentItem(\n            context,\n            cache,\n            !!fill,\n            !!stroke,\n            fillOpacity,\n            strokeOpacity,\n            segments[index],\n            [lineAttribute, line.attribute],\n            clipRange,\n            clipRangeByDimension,\n            x,\n            y,\n            line,\n            fillCb,\n            strokeCb\n          );\n        });\n      } else {\n        // 如果是segments的话，每个clipRange需要重新计算\n        // 整个线段的总长度\n        const totalLength = line.cache.reduce((l, c) => l + c.getLength(), 0);\n        // 总需要绘制的长度\n        const totalDrawLength = clipRange * totalLength;\n        // 直到上次绘制的长度\n        let drawedLengthUntilLast = 0;\n        let skip = false;\n        line.cache.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          const curSegLength = cache.getLength();\n          const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;\n          drawedLengthUntilLast += curSegLength;\n          if (_cr > 0) {\n            skip = this.drawSegmentItem(\n              context,\n              cache,\n              !!fill,\n              !!stroke,\n              fillOpacity,\n              strokeOpacity,\n              segments[index],\n              [lineAttribute, line.attribute],\n              min(_cr, 1),\n              clipRangeByDimension,\n              x,\n              y,\n              line,\n              fillCb,\n              strokeCb\n            );\n          }\n        });\n      }\n    } else {\n      this.drawSegmentItem(\n        context,\n        line.cache as ISegPath2D,\n        !!fill,\n        !!stroke,\n        fillOpacity,\n        strokeOpacity,\n        line.attribute,\n        lineAttribute,\n        clipRange,\n        clipRangeByDimension,\n        x,\n        y,\n        line,\n        fillCb,\n        strokeCb\n      );\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/line-render.ts"],"names":[],"mappings":"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","file":"line-render.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport { min, isArray } from '@visactor/vutils';\nimport { injectable } from '../../../common/inversify-lite';\nimport type {\n  IContext2d,\n  ILine,\n  ILineGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IClipRangeByDimensionType,\n  ISegPath2D,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams\n} from '../../../interface';\nimport { getTheme } from '../../../graphic/theme';\nimport { LINE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { BaseRender } from './base-render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { drawSegments } from '../../../common/render-curve';\nimport { calcLineCache } from '../../../common/segment';\n\n/**\n * 默认的基于canvas的line渲染器\n * 单例\n */\n@injectable()\nexport class DefaultCanvasLineRender extends BaseRender<ILine> implements IGraphicRender {\n  type: 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n  declare z: number;\n\n  draw(line: ILine, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const lineAttribute = getTheme(line, params?.theme).line;\n    this._draw(line, lineAttribute, false, drawContext, params);\n  }\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: ISegPath2D,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    attribute: Partial<ILineGraphicAttribute>,\n    defaultAttribute: Required<ILineGraphicAttribute> | Partial<ILineGraphicAttribute>[],\n    clipRange: number,\n    clipRangeByDimension: IClipRangeByDimensionType,\n    offsetX: number,\n    offsetY: number,\n    line: ILine,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    if (!cache) {\n      return;\n    }\n    context.beginPath();\n\n    const z = this.z ?? 0;\n\n    drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {\n      offsetX,\n      offsetY,\n      offsetZ: z\n    });\n\n    // 如果是一根线，且是Closed，并且没有defined为false的点，需要close\n    if (\n      line.cache &&\n      !isArray(line.cache) &&\n      line.cache.curves.every(c => c.defined) &&\n      line.attribute.curveType &&\n      line.attribute.curveType.includes('Closed')\n    ) {\n      context.closePath();\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, attribute, defaultAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = attribute;\n    const ret: boolean = false;\n    if (fill !== false) {\n      if (fillCb) {\n        fillCb(context, attribute, defaultAttribute);\n      } else if (fillOpacity) {\n        context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n        context.fill();\n      }\n    }\n    if (stroke !== false) {\n      if (strokeCb) {\n        strokeCb(context, attribute, defaultAttribute);\n      } else if (strokeOpacity) {\n        context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute);\n        context.stroke();\n      }\n    }\n\n    // 绘制connect区域\n    let { connectedType, connectedX, connectedY, connectedStyle } = attribute;\n    if (isArray(defaultAttribute)) {\n      connectedType = connectedType ?? defaultAttribute[0].connectedType ?? defaultAttribute[1].connectedType;\n      connectedX = connectedX ?? defaultAttribute[0].connectedX ?? defaultAttribute[1].connectedX;\n      connectedY = connectedY ?? defaultAttribute[0].connectedY ?? defaultAttribute[1].connectedY;\n      connectedStyle = connectedStyle ?? defaultAttribute[0].connectedStyle ?? defaultAttribute[1].connectedStyle;\n    } else {\n      connectedType = connectedType ?? defaultAttribute.connectedType;\n      connectedX = connectedX ?? defaultAttribute.connectedX;\n      connectedY = connectedY ?? defaultAttribute.connectedY;\n      connectedStyle = connectedStyle ?? defaultAttribute.connectedStyle;\n    }\n    // 如果有非法值就是none\n    if (connectedType !== 'connect' && connectedType !== 'zero') {\n      connectedType = 'none';\n    }\n    if (connectedType !== 'none') {\n      context.beginPath();\n      drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {\n        offsetX,\n        offsetY,\n        offsetZ: z,\n        drawConnect: true,\n        mode: connectedType,\n        zeroX: connectedX,\n        zeroY: connectedY\n      });\n\n      const da = [];\n      if (isArray(defaultAttribute)) {\n        defaultAttribute.forEach(i => da.push(i));\n      } else {\n        da.push(defaultAttribute);\n      }\n      da.push(attribute);\n\n      if (fill !== false) {\n        if (fillCb) {\n          fillCb(context, attribute, defaultAttribute);\n        } else if (fillOpacity) {\n          context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);\n          context.fill();\n        }\n      }\n      if (stroke !== false) {\n        if (strokeCb) {\n          strokeCb(context, attribute, defaultAttribute);\n        } else if (strokeOpacity) {\n          context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);\n          context.stroke();\n        }\n      }\n    }\n    return !!ret;\n  }\n\n  // 高性能绘制linear line，不用拆分\n  drawLinearLineHighPerformance(\n    line: ILine,\n    context: IContext2d,\n    fill: boolean,\n    stroke: boolean,\n    fillOpacity: number,\n    strokeOpacity: number,\n    offsetX: number,\n    offsetY: number,\n    lineAttribute: Required<ILineGraphicAttribute>,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    context.beginPath();\n\n    const z = this.z ?? 0;\n    const { points } = line.attribute;\n    const startP = points[0];\n\n    context.moveTo(startP.x + offsetX, startP.y + offsetY, z);\n    for (let i = 1; i < points.length; i++) {\n      const p = points[i];\n      context.lineTo(p.x + offsetX, p.y + offsetY, z);\n    }\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(line, line.attribute, lineAttribute);\n\n    const { x: originX = 0, x: originY = 0 } = line.attribute;\n    if (fill !== false) {\n      if (fillCb) {\n        fillCb(context, line.attribute, lineAttribute);\n      } else if (fillOpacity) {\n        context.setCommonStyle(line, line.attribute, originX - offsetX, originY - offsetY, lineAttribute);\n        context.fill();\n      }\n    }\n    if (stroke !== false) {\n      if (strokeCb) {\n        strokeCb(context, line.attribute, lineAttribute);\n      } else if (strokeOpacity) {\n        context.setStrokeStyle(line, line.attribute, originX - offsetX, originY - offsetY, lineAttribute);\n        context.stroke();\n      }\n    }\n  }\n\n  drawShape(\n    line: ILine,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const lineAttribute = graphicService.themeService.getCurrentTheme().lineAttribute;\n    const lineAttribute = getTheme(line, params?.theme).line;\n\n    const {\n      fill = lineAttribute.fill,\n      stroke = lineAttribute.stroke,\n      fillOpacity = lineAttribute.fillOpacity,\n      strokeOpacity = lineAttribute.strokeOpacity,\n      segments,\n      points,\n      closePath\n    } = line.attribute;\n\n    const data = this.valid(line, lineAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n\n    let { curveType = lineAttribute.curveType } = line.attribute;\n    if (closePath && curveType === 'linear') {\n      curveType = 'linearClosed';\n    }\n\n    const { clipRange = lineAttribute.clipRange, clipRangeByDimension = lineAttribute.clipRangeByDimension } =\n      line.attribute;\n\n    if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {\n      return this.drawLinearLineHighPerformance(\n        line,\n        context,\n        !!fill,\n        !!stroke,\n        fillOpacity,\n        strokeOpacity,\n        x,\n        y,\n        lineAttribute,\n        drawContext,\n        params,\n        fillCb,\n        strokeCb\n      );\n    }\n    // const { fVisible, sVisible, doFill, doStroke } = data;\n\n    // 更新cache\n    if (line.shouldUpdateShape()) {\n      const { points, segments } = line.attribute;\n\n      const _points = points;\n      if (segments && segments.length) {\n        let startPoint: IPointLike;\n        let lastSeg: { endX: number; endY: number; curves: Array<{ defined: boolean }> };\n        line.cache = segments\n          .map((seg, index) => {\n            if (seg.points.length <= 1) {\n              // 第一个点的话，直接设置lastTopSeg\n              if (index === 0) {\n                seg.points[0] &&\n                  (lastSeg = {\n                    endX: seg.points[0].x,\n                    endY: seg.points[0].y,\n                    curves: [{ defined: seg.points[0].defined !== false }]\n                  });\n                return null;\n              }\n            }\n            // 添加上一个segment结束的点作为这个segment的起始点\n            if (index === 1) {\n              startPoint = {\n                x: lastSeg.endX,\n                y: lastSeg.endY,\n                defined: lastSeg.curves[lastSeg.curves.length - 1].defined\n              };\n            } else if (index > 1) {\n              startPoint.x = lastSeg.endX;\n              startPoint.y = lastSeg.endY;\n              startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;\n            }\n            const data = calcLineCache(seg.points, curveType, {\n              startPoint\n            });\n            lastSeg = data;\n            return data;\n          })\n          .filter(item => !!item);\n\n        // 如果lineClosed，那就绘制到第一个点\n        if (curveType === 'linearClosed') {\n          let startP: IPointLike;\n          for (let i = 0; i < line.cache.length; i++) {\n            const cacheItem = line.cache[i];\n            for (let i = 0; i < cacheItem.curves.length; i++) {\n              if (cacheItem.curves[i].defined) {\n                startP = cacheItem.curves[i].p0;\n                break;\n              }\n            }\n            if (startP) {\n              break;\n            }\n          }\n          line.cache[line.cache.length - 1] && line.cache[line.cache.length - 1].lineTo(startP.x, startP.y, true);\n        }\n      } else if (points && points.length) {\n        line.cache = calcLineCache(_points, curveType);\n      } else {\n        line.cache = null;\n        line.clearUpdateShapeTag();\n        return;\n      }\n      line.clearUpdateShapeTag();\n    }\n\n    if (Array.isArray(line.cache)) {\n      const segments = line.attribute.segments.filter(item => item.points.length);\n      // 如果第一个seg只有一个点，那么shift出去\n      if (segments[0].points.length === 1) {\n        segments.shift();\n      }\n      if (clipRange === 1) {\n        let skip = false;\n        // 性能优化，不需要clip的线段不需要计算长度\n        line.cache.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          skip = this.drawSegmentItem(\n            context,\n            cache,\n            !!fill,\n            !!stroke,\n            fillOpacity,\n            strokeOpacity,\n            segments[index],\n            [lineAttribute, line.attribute],\n            clipRange,\n            clipRangeByDimension,\n            x,\n            y,\n            line,\n            fillCb,\n            strokeCb\n          );\n        });\n      } else {\n        // 如果是segments的话，每个clipRange需要重新计算\n        // 整个线段的总长度\n        const totalLength = line.cache.reduce((l, c) => l + c.getLength(), 0);\n        // 总需要绘制的长度\n        const totalDrawLength = clipRange * totalLength;\n        // 直到上次绘制的长度\n        let drawedLengthUntilLast = 0;\n        let skip = false;\n        line.cache.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          const curSegLength = cache.getLength();\n          const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;\n          drawedLengthUntilLast += curSegLength;\n          if (_cr > 0) {\n            skip = this.drawSegmentItem(\n              context,\n              cache,\n              !!fill,\n              !!stroke,\n              fillOpacity,\n              strokeOpacity,\n              segments[index],\n              [lineAttribute, line.attribute],\n              min(_cr, 1),\n              clipRangeByDimension,\n              x,\n              y,\n              line,\n              fillCb,\n              strokeCb\n            );\n          }\n        });\n      }\n    } else {\n      this.drawSegmentItem(\n        context,\n        line.cache as ISegPath2D,\n        !!fill,\n        !!stroke,\n        fillOpacity,\n        strokeOpacity,\n        line.attribute,\n        lineAttribute,\n        clipRange,\n        clipRangeByDimension,\n        x,\n        y,\n        line,\n        fillCb,\n        strokeCb\n      );\n    }\n  }\n}\n"]}

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

@@ -19,19 +19,20 @@ Object.defineProperty(exports, "__esModule", {
 const inversify_lite_1 = require("../../../common/inversify-lite"), 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"), constants_2 = require("./contributions/constants"), base_render_1 = require("./base-render"), path_contribution_render_1 = require("./contributions/path-contribution-render");
 
 let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
+    pathRenderContribitions;
+    type;
+    numberType=constants_1.PATH_NUMBER_TYPE;
+    tempTheme;
     constructor(pathRenderContribitions) {
-        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = constants_1.PATH_NUMBER_TYPE, 
-        this.builtinContributions = [ path_contribution_render_1.defaultPathBackgroundRenderContribution, path_contribution_render_1.defaultPathTextureRenderContribution ], 
+        super(), this.pathRenderContribitions = pathRenderContribitions, this.builtinContributions = [ path_contribution_render_1.defaultPathBackgroundRenderContribution, path_contribution_render_1.defaultPathTextureRenderContribution ], 
         this.init(pathRenderContribitions);
     }
     drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
-        var _a, _b, _c;
-        const pathAttribute = null !== (_a = this.tempTheme) && void 0 !== _a ? _a : (0, 
-        theme_1.getTheme)(path, null == params ? void 0 : params.theme).path, {x: originX = pathAttribute.x, y: originY = pathAttribute.y} = path.attribute, z = null !== (_b = this.z) && void 0 !== _b ? _b : 0, data = this.valid(path, pathAttribute, fillCb, strokeCb);
+        const pathAttribute = this.tempTheme ?? (0, theme_1.getTheme)(path, params?.theme).path, {x: originX = pathAttribute.x, y: originY = pathAttribute.y} = path.attribute, z = this.z ?? 0, data = this.valid(path, pathAttribute, fillCb, strokeCb);
         if (!data) return;
         const {fVisible: fVisible, sVisible: sVisible, doFill: doFill, doStroke: doStroke} = data;
         if (context.beginPath(), path.pathShape) (0, render_command_list_1.renderCommandList)(path.pathShape.commandList, context, x, y, 1, 1, z); else {
-            const path2D = null !== (_c = path.attribute.path) && void 0 !== _c ? _c : pathAttribute.path;
+            const path2D = path.attribute.path ?? pathAttribute.path;
             (0, render_command_list_1.renderCommandList)(path2D.commandList, context, x, y, 1, 1, z);
         }
         context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute), 
@@ -41,7 +42,7 @@ let DefaultCanvasPathRender = class extends base_render_1.BaseRender {
         context.fill())), this.afterRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
     }
     draw(path, renderService, drawContext, params) {
-        const pathAttribute = (0, theme_1.getTheme)(path, null == params ? void 0 : params.theme).path;
+        const pathAttribute = (0, theme_1.getTheme)(path, params?.theme).path;
         this.tempTheme = pathAttribute, this._draw(path, pathAttribute, !1, drawContext, params), 
         this.tempTheme = null;
     }