@visactor/vrender 0.11.1 → 0.12.0

package/cjs/interface/render.d.ts

@@ -0,0 +1,89 @@
+import type { IAABBBounds, IBounds } from '@visactor/vutils';
+import type { IColor } from './color';
+import type { IContext2d } from './context';
+import type { IGraphic, IGraphicAttribute } from './graphic';
+import type { IMarkAttribute, IThemeAttribute } from './graphic/creator';
+import type { IFullThemeSpec } from './graphic/theme';
+import type { ILayer } from './layer';
+import type { IStage } from './stage';
+import type { IGroup } from './graphic/group';
+import type { MaybePromise } from './common';
+import type { ISyncHook } from './sync-hook';
+export interface IRenderServiceDrawParams {
+    context?: IContext2d;
+    clear?: string | IColor;
+    width: number;
+    height: number;
+    x: number;
+    y: number;
+    stage: IStage;
+    layer: ILayer;
+    renderService: IRenderService;
+    updateBounds: boolean;
+    renderStyle?: string;
+}
+export interface IRenderService {
+    dirtyBounds: IBounds;
+    renderTreeRoots: IGraphic[];
+    renderLists: IGraphic[];
+    drawParams: IRenderServiceDrawParams;
+    prepare: (updateBounds: boolean) => void;
+    prepareRenderList: () => void;
+    beforeDraw: (params: IRenderServiceDrawParams) => void;
+    draw: (params: IRenderServiceDrawParams) => void;
+    afterDraw: (params: IRenderServiceDrawParams) => void;
+    render: (groups: IGroup[], params: IRenderServiceDrawParams) => MaybePromise<void>;
+}
+export interface IDrawContext extends IRenderServiceDrawParams {
+    startAtId?: number;
+    break?: boolean;
+    restartIncremental?: boolean;
+    multiGraphicOptions?: {
+        startAtIdx: number;
+        length: number;
+    };
+    in3dInterceptor?: boolean;
+    drawContribution?: IDrawContribution;
+    hack_pieFace?: 'inside' | 'bottom' | 'top' | 'outside';
+}
+export interface IDrawContribution {
+    hooks?: {
+        completeDraw: ISyncHook<[]>;
+    };
+    dirtyBounds?: IAABBBounds;
+    backupDirtyBounds?: IAABBBounds;
+    rendering?: boolean;
+    currentRenderMap: Map<number, IGraphicRender>;
+    defaultRenderMap: Map<number, IGraphicRender>;
+    styleRenderMap: Map<string, Map<number, IGraphicRender>>;
+    draw: (renderService: IRenderService, drawParams: IDrawContext) => MaybePromise<void>;
+    getRenderContribution: (graphic: IGraphic) => IGraphicRender | null;
+    renderGroup: (group: IGroup, drawContext: IDrawContext, skipSort?: boolean) => void;
+    renderItem: (graphic: IGraphic, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) => void;
+}
+export interface IGraphicRenderDrawParams {
+    beforeDrawCb?: () => void;
+    afterDrawCb?: () => void;
+    drawingCb?: () => void;
+    skipDraw?: boolean;
+    theme?: IFullThemeSpec;
+}
+export interface IGraphicRender {
+    type: string;
+    numberType: number;
+    style?: string;
+    z?: number;
+    draw: (graphic: IGraphic, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) => void;
+    drawShape?: (graphic: IGraphic, ctx: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean) => void;
+}
+export interface IBeforeRenderConstribution {
+    apply: (renderService: IRenderService) => MaybePromise<void>;
+}
+export interface IRenderSelector {
+    selector: (graphic: IGraphic) => IGraphicRender | null;
+}
+export interface IDrawItemInterceptorContribution {
+    order: number;
+    beforeDrawItem?: (graphic: IGraphic, renderService: IRenderService, drawContext: IDrawContext, drawContribution: IDrawContribution, params?: IGraphicRenderDrawParams) => boolean;
+    afterDrawItem?: (graphic: IGraphic, renderService: IRenderService, drawContext: IDrawContext, drawContribution: IDrawContribution, params?: IGraphicRenderDrawParams) => boolean;
+}

package/cjs/interface/render.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+//# sourceMappingURL=render.js.map

package/cjs/interface/render.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/interface/render.ts"],"names":[],"mappings":"","file":"render.js","sourcesContent":["import type { IAABBBounds, IBounds } from '@visactor/vutils';\nimport type { IColor } from './color';\nimport type { IContext2d } from './context';\nimport type { IGraphic, IGraphicAttribute } from './graphic';\nimport type { IMarkAttribute, IThemeAttribute } from './graphic/creator';\nimport type { IFullThemeSpec } from './graphic/theme';\nimport type { ILayer } from './layer';\nimport type { IStage } from './stage';\nimport type { IGroup } from './graphic/group';\nimport type { MaybePromise } from './common';\nimport type { ISyncHook } from './sync-hook';\n\n// 用于绘制的参数，提供context\n// TODO: 考虑是否可以隐藏上下文类型\nexport interface IRenderServiceDrawParams {\n  context?: IContext2d;\n\n  // 绘制的区域以及是否需要清屏\n  clear?: string | IColor;\n  width: number;\n  height: number;\n  x: number;\n  y: number;\n  stage: IStage;\n  layer: ILayer;\n  renderService: IRenderService;\n  updateBounds: boolean;\n  renderStyle?: string;\n}\n\nexport interface IRenderService {\n  dirtyBounds: IBounds;\n  renderTreeRoots: IGraphic[]; // 此次render的数组\n  renderLists: IGraphic[];\n  drawParams: IRenderServiceDrawParams;\n\n  prepare: (updateBounds: boolean) => void;\n  prepareRenderList: () => void;\n  beforeDraw: (params: IRenderServiceDrawParams) => void;\n  draw: (params: IRenderServiceDrawParams) => void;\n  afterDraw: (params: IRenderServiceDrawParams) => void;\n  render: (groups: IGroup[], params: IRenderServiceDrawParams) => MaybePromise<void>;\n}\n\nexport interface IDrawContext extends IRenderServiceDrawParams {\n  startAtId?: number;\n  break?: boolean;\n  restartIncremental?: boolean;\n  // multi图元开始的位置\n  multiGraphicOptions?: {\n    startAtIdx: number;\n    length: number;\n  };\n  in3dInterceptor?: boolean;\n  drawContribution?: IDrawContribution;\n  // hack内容\n  hack_pieFace?: 'inside' | 'bottom' | 'top' | 'outside';\n}\n\nexport interface IDrawContribution {\n  hooks?: {\n    completeDraw: ISyncHook<[]>;\n  };\n  dirtyBounds?: IAABBBounds;\n  backupDirtyBounds?: IAABBBounds;\n  rendering?: boolean;\n  currentRenderMap: Map<number, IGraphicRender>;\n  defaultRenderMap: Map<number, IGraphicRender>;\n  styleRenderMap: Map<string, Map<number, IGraphicRender>>;\n  draw: (renderService: IRenderService, drawParams: IDrawContext) => MaybePromise<void>;\n  getRenderContribution: (graphic: IGraphic) => IGraphicRender | null;\n  renderGroup: (group: IGroup, drawContext: IDrawContext, skipSort?: boolean) => void;\n  renderItem: (graphic: IGraphic, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) => void;\n}\n\nexport interface IGraphicRenderDrawParams {\n  beforeDrawCb?: () => void;\n  afterDrawCb?: () => void;\n  drawingCb?: () => void;\n  skipDraw?: boolean;\n  theme?: IFullThemeSpec;\n}\n\nexport interface IGraphicRender {\n  type: string; // 图元类型\n  numberType: number;\n  style?: string;\n  z?: number;\n  draw: (\n    graphic: IGraphic,\n    renderService: IRenderService,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams\n  ) => void;\n  drawShape?: (\n    graphic: IGraphic,\n    ctx: 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  ) => void;\n}\n\nexport interface IBeforeRenderConstribution {\n  apply: (renderService: IRenderService) => MaybePromise<void>;\n}\n\nexport interface IRenderSelector {\n  selector: (graphic: IGraphic) => IGraphicRender | null;\n}\n\nexport interface IDrawItemInterceptorContribution {\n  order: number;\n  beforeDrawItem?: (\n    graphic: IGraphic,\n    renderService: IRenderService,\n    drawContext: IDrawContext,\n    drawContribution: IDrawContribution,\n    params?: IGraphicRenderDrawParams\n  ) => boolean;\n  afterDrawItem?: (\n    graphic: IGraphic,\n    renderService: IRenderService,\n    drawContext: IDrawContext,\n    drawContribution: IDrawContribution,\n    params?: IGraphicRenderDrawParams\n  ) => boolean;\n}\n"]}

package/cjs/interface/stage.d.ts

@@ -1,18 +1,18 @@
-import { INode } from './node-tree';
-import { ILayer } from './layer';
-import { IGraphic } from './graphic';
-import { IGroup } from './graphic/group';
-import { IColor } from './color';
-import { IBounds, IBoundsLike, IMatrix, IPointLike } from '@visactor/vutils';
-import { SyncHook } from '../tapable';
-import { IWindow } from '../core';
-import { IDrawContext, IRenderService } from '../render';
-import { ICamera } from './camera';
-import { vec3 } from './matrix';
-import { IDirectionLight } from './light';
-import { ITicker } from '../animate';
-import { IPluginService } from '../plugins/plugin-service';
-import { IPickerService } from '../picker';
+import type { INode } from './node-tree';
+import type { ILayer } from './layer';
+import type { IGraphic } from './graphic';
+import type { IGroup } from './graphic/group';
+import type { IColor } from './color';
+import type { IBounds, IBoundsLike, IMatrix } from '@visactor/vutils';
+import type { ICamera } from './camera';
+import type { vec3 } from './matrix';
+import type { IDirectionLight } from './light';
+import type { ISyncHook } from './sync-hook';
+import type { IDrawContext, IRenderService } from './render';
+import type { ITicker } from './animate';
+import type { IPickerService } from './picker';
+import type { IPluginService } from './plugin';
+import type { IWindow } from './window';
 export type IExportType = 'canvas' | 'imageData';
 export interface IStageParams {
     viewBox: IBoundsLike;
@@ -36,7 +36,14 @@ export interface IOption3D {
     alpha?: number;
     beta?: number;
     gama?: number;
-    center?: IPointLike;
+    center?: {
+        x?: number;
+        y?: number;
+        z?: number;
+        dx?: number;
+        dy?: number;
+        dz?: number;
+    };
     fieldRatio?: number;
     fieldDepth?: number;
     light?: {
@@ -61,8 +68,8 @@ export interface IStage extends INode {
     autoRender: boolean;
     renderCount: number;
     hooks: {
-        beforeRender: SyncHook<[IStage]>;
-        afterRender: SyncHook<[IStage]>;
+        beforeRender: ISyncHook<[IStage]>;
+        afterRender: ISyncHook<[IStage]>;
     };
     renderService: IRenderService;
     option3d?: IOption3D;

package/cjs/interface/stage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/stage.ts"],"names":[],"mappings":"","file":"stage.js","sourcesContent":["import { INode } from './node-tree';\nimport { ILayer } from './layer';\nimport { IGraphic } from './graphic';\nimport { IGroup } from './graphic/group';\nimport { IColor } from './color';\nimport { IBounds, IBoundsLike, IMatrix, IMatrixLike, IPointLike } from '@visactor/vutils';\nimport { SyncHook } from '../tapable';\nimport { IWindow } from '../core';\nimport { IDrawContext, IRenderService } from '../render';\nimport { ICamera } from './camera';\nimport { vec3 } from './matrix';\nimport { IDirectionLight } from './light';\nimport { ITicker } from '../animate';\nimport { IPluginService } from '../plugins/plugin-service';\nimport { IPickerService } from '../picker';\n\nexport type IExportType = 'canvas' | 'imageData';\n\nexport interface IStageParams {\n  // x: number;\n  // y: number;\n  // // 视口的宽高\n  // viewWidth: number;\n  // viewHeight: number;\n\n  // 视口的宽高\n  viewBox: IBoundsLike;\n  // 总的宽高\n  width: number;\n  height: number;\n  dpr: number;\n  // stage的背景\n  background: string | IColor;\n  // 外部的canvas\n  canvas: string | HTMLCanvasElement;\n  // canvas的container容器，如果不传入canvas，那就会在容器中创建canvas\n  container: string | HTMLElement;\n  // 是否是受控制的canvas，如果不是的话，不会进行resize等操作，也不会修改canvas的样式\n  canvasControled: boolean;\n  title: string;\n  autoRender: boolean;\n  disableDirtyBounds: boolean;\n  // 绘制之前的钩子函数\n  beforeRender: (stage: IStage) => void;\n  // 绘制之后的钩子函数\n  afterRender: (stage: IStage) => void;\n  renderStyle?: string;\n  ticker?: ITicker;\n}\n\nexport interface IOption3D {\n  enableView3dTransform?: boolean; // 是否开启view3d自动旋转\n  alpha?: number; // x轴的转角\n  beta?: number; // y轴的转角\n  gama?: number; // z轴的转角\n  center?: IPointLike; // 中心位置\n  fieldRatio?: number; // 透视的视域缩放比例\n  fieldDepth?: number;\n  light?: {\n    dir?: vec3;\n    color?: string;\n    ambient?: number;\n  };\n  // 配置相机后，alpha、beta、gamma配置会失效\n  camera?: any; // 相机配置\n}\n\n// TODO 命名方式\nexport interface IStage extends INode {\n  stage?: IStage;\n  parent: IStage | null;\n  // rootNode: IStage;\n  x: number;\n  y: number;\n\n  window: IWindow;\n\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n  defaultLayer: ILayer;\n  dirtyBounds: IBounds | null;\n\n  autoRender: boolean;\n  renderCount: number;\n\n  hooks: {\n    beforeRender: SyncHook<[IStage]>;\n    afterRender: SyncHook<[IStage]>;\n  };\n\n  renderService: IRenderService;\n\n  option3d?: IOption3D;\n\n  set3dOptions: (options: IOption3D) => void;\n  light?: IDirectionLight;\n  camera?: ICamera;\n\n  dpr: number;\n\n  viewBox: IBoundsLike;\n  background: string | IColor;\n  ticker: ITicker;\n  increaseAutoRender: boolean;\n  readonly pickerService: IPickerService;\n  readonly pluginService: IPluginService;\n  // 如果传入CanvasId，如果存在相同Id，说明这两个图层使用相同的Canvas绘制\n  // 但需要注意的是依然是两个图层（用于解决Table嵌入ChartSpace不影响Table的绘制）\n  createLayer: (canvasId?: string) => ILayer;\n  sortLayer: (cb: (layer: ILayer) => number) => void;\n  removeLayer: (layerId: number) => ILayer | false;\n\n  render: (layers?: ILayer[], params?: Partial<IDrawContext>) => void;\n  renderNextFrame: (layers?: ILayer[]) => void;\n\n  // 画布操作\n  resize: (w: number, h: number, rerender?: boolean) => void;\n  resizeWindow: (w: number, h: number, rerender?: boolean) => void;\n  resizeView: (w: number, h: number, rerender?: boolean) => void;\n  setViewBox:\n    | ((viewBox: IBoundsLike, rerender: boolean) => void)\n    | ((x: number, y: number, w: number, h: number, rerender: boolean) => void)\n    | ((x: number | IBoundsLike, y: number | boolean, w?: number, h?: number, rerender?: boolean) => void);\n  setDpr: (dpr: number) => void;\n  setOrigin: (x: number, y: number) => void;\n  export: (type: IExportType) => HTMLCanvasElement | ImageData;\n  pick: (x: number, y: number) => { graphic: IGraphic | null; group: IGroup | null } | false;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  dirty: (b: IBounds, matrix?: IMatrix) => void;\n  // 考虑操作回放\n\n  renderTo: (window: IWindow, params: { x: number; y: number; width: number; height: number }) => void;\n\n  renderToNewWindow: (fullImage?: boolean) => IWindow;\n\n  toCanvas: (fullImage?: boolean) => HTMLCanvasElement | null;\n\n  setBeforeRender: (cb: (stage: IStage) => void) => void;\n\n  setAfterRender: (cb: (stage: IStage) => void) => void;\n\n  afterNextRender: (cb: (stage: IStage) => void) => void;\n  enableAutoRender: () => void;\n  disableAutoRender: () => void;\n  enableIncrementalAutoRender: () => void;\n  disableIncrementalAutoRender: () => void;\n  enableDirtyBounds: () => void;\n  disableDirtyBounds: () => void;\n  enableView3dTransform: () => void;\n  disableView3dTranform: () => void;\n  clearViewBox: (color?: string) => void;\n  release: () => void;\n  setStage: (stage?: IStage) => void;\n\n  setCursor: (mode?: string) => void;\n}\n\nexport declare function combineStage(srages: IStage[], params: { canvas: string | HTMLCanvasElement }): IStage;\n"]}
+{"version":3,"sources":["../../src/interface/stage.ts"],"names":[],"mappings":"","file":"stage.js","sourcesContent":["import type { INode } from './node-tree';\nimport type { ILayer } from './layer';\nimport type { IGraphic } from './graphic';\nimport type { IGroup } from './graphic/group';\nimport type { IColor } from './color';\nimport type { IBounds, IBoundsLike, IMatrix, IPointLike } from '@visactor/vutils';\nimport type { ICamera } from './camera';\nimport type { vec3 } from './matrix';\nimport type { IDirectionLight } from './light';\nimport type { ISyncHook } from './sync-hook';\nimport type { IDrawContext, IRenderService } from './render';\nimport type { ITicker } from './animate';\nimport type { IPickerService } from './picker';\nimport type { IPluginService } from './plugin';\nimport type { IWindow } from './window';\n\nexport type IExportType = 'canvas' | 'imageData';\n\nexport interface IStageParams {\n  // x: number;\n  // y: number;\n  // // 视口的宽高\n  // viewWidth: number;\n  // viewHeight: number;\n\n  // 视口的宽高\n  viewBox: IBoundsLike;\n  // 总的宽高\n  width: number;\n  height: number;\n  dpr: number;\n  // stage的背景\n  background: string | IColor;\n  // 外部的canvas\n  canvas: string | HTMLCanvasElement;\n  // canvas的container容器，如果不传入canvas，那就会在容器中创建canvas\n  container: string | HTMLElement;\n  // 是否是受控制的canvas，如果不是的话，不会进行resize等操作，也不会修改canvas的样式\n  canvasControled: boolean;\n  title: string;\n  autoRender: boolean;\n  disableDirtyBounds: boolean;\n  // 绘制之前的钩子函数\n  beforeRender: (stage: IStage) => void;\n  // 绘制之后的钩子函数\n  afterRender: (stage: IStage) => void;\n  renderStyle?: string;\n  ticker?: ITicker;\n}\n\nexport interface IOption3D {\n  enableView3dTransform?: boolean; // 是否开启view3d自动旋转\n  alpha?: number; // x轴的转角\n  beta?: number; // y轴的转角\n  gama?: number; // z轴的转角\n  center?: { x?: number; y?: number; z?: number; dx?: number; dy?: number; dz?: number }; // 中心位置\n  fieldRatio?: number; // 透视的视域缩放比例\n  fieldDepth?: number;\n  light?: {\n    dir?: vec3;\n    color?: string;\n    ambient?: number;\n  };\n  // 配置相机后，alpha、beta、gamma配置会失效\n  camera?: any; // 相机配置\n}\n\n// TODO 命名方式\nexport interface IStage extends INode {\n  stage?: IStage;\n  parent: IStage | null;\n  // rootNode: IStage;\n  x: number;\n  y: number;\n\n  window: IWindow;\n\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n  defaultLayer: ILayer;\n  dirtyBounds: IBounds | null;\n\n  autoRender: boolean;\n  renderCount: number;\n\n  hooks: {\n    beforeRender: ISyncHook<[IStage]>;\n    afterRender: ISyncHook<[IStage]>;\n  };\n\n  renderService: IRenderService;\n\n  option3d?: IOption3D;\n\n  set3dOptions: (options: IOption3D) => void;\n  light?: IDirectionLight;\n  camera?: ICamera;\n\n  dpr: number;\n\n  viewBox: IBoundsLike;\n  background: string | IColor;\n  ticker: ITicker;\n  increaseAutoRender: boolean;\n  readonly pickerService: IPickerService;\n  readonly pluginService: IPluginService;\n  // 如果传入CanvasId，如果存在相同Id，说明这两个图层使用相同的Canvas绘制\n  // 但需要注意的是依然是两个图层（用于解决Table嵌入ChartSpace不影响Table的绘制）\n  createLayer: (canvasId?: string) => ILayer;\n  sortLayer: (cb: (layer: ILayer) => number) => void;\n  removeLayer: (layerId: number) => ILayer | false;\n\n  render: (layers?: ILayer[], params?: Partial<IDrawContext>) => void;\n  renderNextFrame: (layers?: ILayer[]) => void;\n\n  // 画布操作\n  resize: (w: number, h: number, rerender?: boolean) => void;\n  resizeWindow: (w: number, h: number, rerender?: boolean) => void;\n  resizeView: (w: number, h: number, rerender?: boolean) => void;\n  setViewBox:\n    | ((viewBox: IBoundsLike, rerender: boolean) => void)\n    | ((x: number, y: number, w: number, h: number, rerender: boolean) => void)\n    | ((x: number | IBoundsLike, y: number | boolean, w?: number, h?: number, rerender?: boolean) => void);\n  setDpr: (dpr: number) => void;\n  setOrigin: (x: number, y: number) => void;\n  export: (type: IExportType) => HTMLCanvasElement | ImageData;\n  pick: (x: number, y: number) => { graphic: IGraphic | null; group: IGroup | null } | false;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  dirty: (b: IBounds, matrix?: IMatrix) => void;\n  // 考虑操作回放\n\n  renderTo: (window: IWindow, params: { x: number; y: number; width: number; height: number }) => void;\n\n  renderToNewWindow: (fullImage?: boolean) => IWindow;\n\n  toCanvas: (fullImage?: boolean) => HTMLCanvasElement | null;\n\n  setBeforeRender: (cb: (stage: IStage) => void) => void;\n\n  setAfterRender: (cb: (stage: IStage) => void) => void;\n\n  afterNextRender: (cb: (stage: IStage) => void) => void;\n  enableAutoRender: () => void;\n  disableAutoRender: () => void;\n  enableIncrementalAutoRender: () => void;\n  disableIncrementalAutoRender: () => void;\n  enableDirtyBounds: () => void;\n  disableDirtyBounds: () => void;\n  enableView3dTransform: () => void;\n  disableView3dTranform: () => void;\n  clearViewBox: (color?: string) => void;\n  release: () => void;\n  setStage: (stage?: IStage) => void;\n\n  setCursor: (mode?: string) => void;\n}\n\nexport declare function combineStage(srages: IStage[], params: { canvas: string | HTMLCanvasElement }): IStage;\n"]}

package/cjs/interface/sync-hook.d.ts

@@ -0,0 +1,26 @@
+import type { AsArray } from './common';
+export type Tap = TapOptions & {
+    name: string;
+};
+export type TapOptions = {
+    before?: string;
+    stage?: number;
+};
+export type IfSet<X> = X extends UnsetAdditionalOptions ? any : X;
+export interface UnsetAdditionalOptions {
+    _UnsetAdditionalOptions: true;
+}
+export interface IHook<T, R, AdditionalOptions = UnsetAdditionalOptions> {
+    name?: string;
+    taps: FullTap[];
+    tap: (options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => R) => void;
+    unTap: (options: string | (Tap & IfSet<AdditionalOptions>), fn?: (...args: AsArray<T>) => R) => void;
+}
+export interface ISyncHook<T, R = void, AdditionalOptions = UnsetAdditionalOptions> extends IHook<T, R, AdditionalOptions> {
+    call: (...args: AsArray<T>) => R;
+}
+export type FullTap = Tap & {
+    type: 'sync' | 'async' | 'promise';
+    fn: (...d: any) => any;
+};
+export type ICompileOptions = any;

package/cjs/{core/contributions/interface.js → interface/sync-hook.js}

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=sync-hook.js.map

package/cjs/interface/sync-hook.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/interface/sync-hook.ts"],"names":[],"mappings":"","file":"sync-hook.js","sourcesContent":["import type { AsArray } from './common';\n\nexport type Tap = TapOptions & {\n  name: string;\n};\n\nexport type TapOptions = {\n  before?: string;\n  stage?: number;\n};\n\nexport type IfSet<X> = X extends UnsetAdditionalOptions ? any : X;\n\nexport interface UnsetAdditionalOptions {\n  _UnsetAdditionalOptions: true;\n}\n\nexport interface IHook<T, R, AdditionalOptions = UnsetAdditionalOptions> {\n  name?: string;\n  taps: FullTap[];\n  tap: (options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => R) => void;\n  unTap: (options: string | (Tap & IfSet<AdditionalOptions>), fn?: (...args: AsArray<T>) => R) => void;\n}\n\nexport interface ISyncHook<T, R = void, AdditionalOptions = UnsetAdditionalOptions>\n  extends IHook<T, R, AdditionalOptions> {\n  call: (...args: AsArray<T>) => R;\n}\n\nexport type FullTap = Tap & {\n  type: 'sync' | 'async' | 'promise';\n  fn: (...d: any) => any;\n};\n\nexport type ICompileOptions = any;\n"]}

package/cjs/{core/contributions/textMeasure/ITextMeasure.d.ts → interface/text.d.ts}

@@ -1,5 +1,5 @@
-import { IContribution } from '../interface';
-import { IGraphicUtil } from '../../interface';
+import type { IContribution } from './contribution';
+import type { IGraphicUtil } from './core';
 export interface TextOptionsType {
     fontSize?: number;
     fontWeight?: string | number;

package/cjs/{picker/type.js → interface/text.js}

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=type.js.map
+//# sourceMappingURL=text.js.map

package/cjs/interface/text.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/interface/text.ts"],"names":[],"mappings":"","file":"text.js","sourcesContent":["import type { IContribution } from './contribution';\nimport type { IGraphicUtil } from './core';\n\nexport interface TextOptionsType {\n  fontSize?: number;\n  fontWeight?: string | number;\n  fontFamily?: string;\n  fontStyle?: string;\n  fontVariant?: string;\n}\n\nexport interface ITextMeasure extends IContribution<IGraphicUtil> {\n  measureTextWidth: (text: string, options: TextOptionsType) => number;\n  measureTextPixelHeight: (text: string, options: TextOptionsType) => number;\n  measureTextBoundHieght: (text: string, options: TextOptionsType) => number;\n  clipText: (text: string, options: TextOptionsType, width: number) => { str: string; width: number };\n  clipTextWithSuffix: (\n    text: string,\n    options: TextOptionsType,\n    width: number,\n    suffix: string\n  ) => { str: string; width: number };\n  measureText: (text: string, options: TextOptionsType) => { width: number };\n}\n"]}

package/cjs/interface/theme-service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/interface/theme-service.ts"],"names":[],"mappings":"","file":"theme-service.js","sourcesContent":["// import { inject, injectable, named, postConstruct } from 'inversify';\n// import { ContributionProvider } from '../../common/contribution-provider';\n// import {\n//   ICircleGraphicAttribute,\n//   ILineGraphicAttribute,\n//   IPathGraphicAttribute,\n//   IRectGraphicAttribute,\n//   ISymbolGraphicAttribute,\n//   ITextGraphicAttribute,\n//   IArcGraphicAttribute,\n//   IAreaGraphicAttribute,\n//   IGroupGraphicAttribute,\n//   IPolygonGraphicAttribute\n// } from '../../interface';\n\n// export interface ITheme {\n//   readonly id: string;\n//   circleAttribute: Required<ICircleGraphicAttribute>;\n//   textAttribute: Required<ITextGraphicAttribute>;\n//   symbolAttribute: Required<ISymbolGraphicAttribute>;\n//   lineAttribute: Required<ILineGraphicAttribute>;\n//   areaAttribute: Required<IAreaGraphicAttribute>;\n//   rectAttribute: Required<IRectGraphicAttribute>;\n//   pathAttribute: Required<IPathGraphicAttribute>;\n//   arcAttribute: Required<IArcGraphicAttribute>;\n//   groupAttribute: Required<IGroupGraphicAttribute>;\n//   polygonAttribute: Required<IPolygonGraphicAttribute>;\n\n//   configure: (themeService: IThemeService) => void;\n\n//   activate: () => void;\n//   deactivate: () => void;\n// }\n\n// export const Theme = Symbol.for('Theme');\n\n// export const DEFAULT_THEME_ID = 'DEFAULT_THEME_ID';\n\n// export interface IThemeService {\n//   register: (theme: ITheme) => void;\n//   getThemes: () => ITheme[];\n\n//   getTheme: (themeId: string) => ITheme;\n\n//   setCurrentTheme: (themeId: string) => void;\n\n//   getCurrentTheme: () => ITheme;\n\n//   defaultTheme: ITheme;\n\n//   reset: () => void;\n// }\n\n// export const ThemeServce = Symbol.for('ThemeServce');\n\n// @injectable()\n// export class DefaultThemeService implements IThemeService {\n//   protected themeMap: Record<string, ITheme> = {};\n//   protected activeTheme?: ITheme;\n\n//   constructor(\n//     @inject(ContributionProvider)\n//     @named(Theme)\n//     protected readonly contributions: ContributionProvider<ITheme>\n//   ) {}\n\n//   @postConstruct()\n//   init() {\n//     this.contributions.getContributions().forEach(theme => {\n//       theme.configure(this);\n//     });\n//     this.setCurrentTheme(this.defaultTheme.id);\n//   }\n\n//   register(theme: ITheme) {\n//     this.themeMap[theme.id] = theme;\n//   }\n//   getThemes(): ITheme[] {\n//     return Object.keys(this.themeMap).map(k => this.themeMap[k]);\n//   }\n\n//   getTheme(themeId: string): ITheme {\n//     return this.themeMap[themeId];\n//   }\n\n//   setCurrentTheme(themeId: string): void {\n//     this.activeTheme = this.themeMap[themeId] || this.defaultTheme;\n//   }\n\n//   getCurrentTheme(): ITheme {\n//     return this.activeTheme as ITheme;\n//   }\n\n//   get defaultTheme(): ITheme {\n//     return this.themeMap[DEFAULT_THEME_ID];\n//   }\n\n//   reset(): void {\n//     this.setCurrentTheme(this.defaultTheme.id);\n//   }\n// }\n"]}

package/cjs/interface/window.d.ts

@@ -0,0 +1,72 @@
+import type { IBoundsLike } from '@visactor/vutils';
+import type { ICanvas } from './canvas';
+import type { IContext2d } from './context';
+import type { IDomRectLike, IEventElement, Releaseable } from './common';
+import type { ISyncHook } from './sync-hook';
+import type { IContribution } from './contribution';
+import type { IGlobal } from './global';
+export interface IWindowParams {
+    canvas?: string | HTMLCanvasElement;
+    offscreen?: boolean;
+    width?: number;
+    height?: number;
+    x?: number;
+    y?: number;
+    dpr: number;
+    container?: string | HTMLElement;
+    canvasControled: boolean;
+    title: string;
+    CreateWindow?: (w: number, h: number, title: string) => void;
+}
+export interface IWindow extends Releaseable, Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {
+    hooks: {
+        onChange: ISyncHook<[number, number, number, number]>;
+    };
+    width: number;
+    height: number;
+    resizable: boolean;
+    minHeight: number;
+    minWidth: number;
+    maxHeight: number;
+    maxWidth: number;
+    title: string;
+    dpr: number;
+    style: CSSStyleDeclaration | Record<string, any>;
+    create: (options: IWindowParams) => void;
+    setWindowHandler: (handler: IWindowHandlerContribution) => void;
+    setDpr: (dpr: number) => void;
+    resize: (w: number, h: number) => void;
+    configure: () => void;
+    getContext: () => IContext2d;
+    getNativeHandler: () => ICanvas;
+    getContainer: () => HTMLElement | any;
+    getImageBuffer: (type?: string) => any;
+    clearViewBox: (viewBox: IBoundsLike, color?: string) => void;
+    getBoundingClientRect: () => IDomRectLike;
+}
+export interface IWindowHandlerContribution extends IContribution<IWindow>, Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {
+    container?: any;
+    configure: (window: IWindow, global: IGlobal) => void;
+    createWindow: (params: IWindowParams) => void;
+    releaseWindow: () => void;
+    resizeWindow: (width: number, height: number) => void;
+    setDpr: (dpr: number) => void;
+    getDpr: () => number;
+    getWH: () => {
+        width: number;
+        height: number;
+    };
+    getXY: () => {
+        x: number;
+        y: number;
+    };
+    getTitle: () => string;
+    getContext: () => IContext2d;
+    getNativeHandler: () => ICanvas;
+    getImageBuffer?: (type?: string) => any;
+    release: (...params: any) => void;
+    getStyle: () => CSSStyleDeclaration | Record<string, any>;
+    setStyle: (s: CSSStyleDeclaration | Record<string, any>) => void;
+    getBoundingClientRect: () => IDomRectLike;
+    clearViewBox: (vb: IBoundsLike, color?: string) => void;
+}

package/cjs/interface/window.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+//# sourceMappingURL=window.js.map

package/cjs/interface/window.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/interface/window.ts"],"names":[],"mappings":"","file":"window.js","sourcesContent":["// window为内部对象，属性均为stage传入\n\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { ICanvas } from './canvas';\nimport type { IContext2d } from './context';\nimport type { IDomRectLike, IEventElement, Releaseable } from './common';\nimport type { ISyncHook } from './sync-hook';\nimport type { IContribution } from './contribution';\nimport type { IGlobal } from './global';\n\n// TODO: 参数考虑动态注入，比如CreateWindow是native的专用接口\nexport interface IWindowParams {\n  canvas?: string | HTMLCanvasElement;\n  offscreen?: boolean;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  dpr: number;\n  container?: string | HTMLElement;\n  canvasControled: boolean;\n  title: string;\n  CreateWindow?: (w: number, h: number, title: string) => void;\n}\n\nexport interface IWindow\n  extends Releaseable,\n    Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  hooks: {\n    onChange: ISyncHook<[number, number, number, number]>;\n  };\n  // 窗口的大小\n  width: number;\n  height: number;\n  // // 窗口的位置\n  // x: number;\n  // y: number;\n  // 窗口操作配置\n  resizable: boolean;\n  minHeight: number;\n  minWidth: number;\n  maxHeight: number;\n  maxWidth: number;\n  // 窗口配置\n  title: string;\n  dpr: number;\n  style: CSSStyleDeclaration | Record<string, any>;\n\n  create: (options: IWindowParams) => void;\n  setWindowHandler: (handler: IWindowHandlerContribution) => void;\n  setDpr: (dpr: number) => void;\n  resize: (w: number, h: number) => void;\n  configure: () => void;\n\n  // 获取上下文和canvas，可以是2d也可以是GL\n  getContext: () => IContext2d;\n  getNativeHandler: () => ICanvas;\n  getContainer: () => HTMLElement | any;\n  getImageBuffer: (type?: string) => any;\n\n  clearViewBox: (viewBox: IBoundsLike, color?: string) => void;\n\n  getBoundingClientRect: () => IDomRectLike;\n}\n\nexport interface IWindowHandlerContribution\n  extends IContribution<IWindow>,\n    Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  container?: any;\n\n  configure: (window: IWindow, global: IGlobal) => void;\n  createWindow: (params: IWindowParams) => void;\n  releaseWindow: () => void;\n  resizeWindow: (width: number, height: number) => void;\n  setDpr: (dpr: number) => void;\n  getDpr: () => number;\n  getWH: () => { width: number; height: number };\n  getXY: () => { x: number; y: number };\n  getTitle: () => string;\n\n  // 获取上下文和canvas，可以是2d也可以是GL\n  getContext: () => IContext2d;\n  getNativeHandler: () => ICanvas;\n  getImageBuffer?: (type?: string) => any;\n  release: (...params: any) => void;\n\n  getStyle: () => CSSStyleDeclaration | Record<string, any>;\n  setStyle: (s: CSSStyleDeclaration | Record<string, any>) => void;\n\n  getBoundingClientRect: () => IDomRectLike;\n  clearViewBox: (vb: IBoundsLike, color?: string) => void;\n}\n"]}

package/cjs/modules.d.ts

@@ -1,6 +1,5 @@
-import { IPickerService } from './picker';
-import { IGlobal, IGraphicService } from './interface';
-import { IGraphicUtil, ILayerService, ITransformUtil } from './core/interface';
+import type { IGlobal, IGraphicService, IPickerService } from './interface';
+import type { IGraphicUtil, ILayerService, ITransformUtil } from './interface/core';
 export declare const global: IGlobal;
 export declare const graphicUtil: IGraphicUtil;
 export declare const transformUtil: ITransformUtil;

package/cjs/modules.js

@@ -10,13 +10,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.layerService = exports.pickerService = exports.graphicService = exports.transformUtil = exports.graphicUtil = exports.global = void 0;
 
-const core_modules_1 = __importDefault(require("./core/core-modules")), render_modules_1 = __importDefault(require("./render/render-modules")), pick_modules_1 = __importDefault(require("./picker/pick-modules")), graphic_module_1 = __importDefault(require("./graphic/graphic-service/graphic-module")), plugin_modules_1 = __importDefault(require("./plugins/plugin-modules")), modules_1 = __importDefault(require("./core/contributions/modules")), modules_2 = __importDefault(require("./render/contributions/modules")), modules_3 = __importDefault(require("./picker/contributions/modules")), modules_4 = __importDefault(require("./canvas/contributions/modules")), constants_1 = require("./core/constants"), global_picker_service_1 = require("./picker/global-picker-service"), interface_1 = require("./interface"), application_1 = require("./application"), constants_2 = require("./graphic/constants"), constants_3 = require("./core/constants"), container_1 = require("./container");
+const core_modules_1 = __importDefault(require("./core/core-modules")), render_modules_1 = __importDefault(require("./render/render-modules")), pick_modules_1 = __importDefault(require("./picker/pick-modules")), graphic_module_1 = __importDefault(require("./graphic/graphic-service/graphic-module")), plugin_modules_1 = __importDefault(require("./plugins/plugin-modules")), modules_1 = __importDefault(require("./core/contributions/modules")), modules_2 = __importDefault(require("./render/contributions/modules")), modules_3 = __importDefault(require("./picker/contributions/modules")), modules_4 = __importDefault(require("./canvas/contributions/modules")), constants_1 = require("./core/constants"), global_picker_service_1 = require("./picker/global-picker-service"), application_1 = require("./application"), constants_2 = require("./graphic/constants"), constants_3 = require("./core/constants"), container_1 = require("./container"), constants_4 = require("./constants");
 
 container_1.container.load(core_modules_1.default), container_1.container.load(graphic_module_1.default), 
 container_1.container.load(render_modules_1.default), container_1.container.load(pick_modules_1.default), 
 container_1.container.load(plugin_modules_1.default), (0, modules_1.default)(container_1.container), 
 (0, modules_2.default)(container_1.container), (0, modules_3.default)(container_1.container), 
-(0, modules_4.default)(container_1.container), exports.global = container_1.container.get(interface_1.Global), 
+(0, modules_4.default)(container_1.container), exports.global = container_1.container.get(constants_4.Global), 
 application_1.application.global = exports.global, exports.graphicUtil = container_1.container.get(constants_3.GraphicUtil), 
 application_1.application.graphicUtil = exports.graphicUtil, exports.transformUtil = container_1.container.get(constants_3.TransformUtil), 
 application_1.application.transformUtil = exports.transformUtil, exports.graphicService = container_1.container.get(constants_2.GraphicService), 

package/cjs/modules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/modules.ts"],"names":[],"mappings":";;;;;;AACA,uEAA6C;AAC7C,6EAAmD;AACnD,yEAA+C;AAE/C,8FAAqE;AACrE,8EAAoD;AACpD,2EAAoE;AACpE,6EAAqE;AACrE,6EAAmE;AACnE,6EAAqE;AACrE,gDAAgD;AAEhD,0EAAqE;AAwBrE,2CAA+D;AAC/D,+CAA4C;AAE5C,mDAAqD;AACrD,gDAA8D;AAC9D,2CAAwC;AAExC,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAC3B,qBAAS,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;AAC9B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAE3B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,IAAA,iBAAwB,EAAC,qBAAS,CAAC,CAAC;AACpC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AACnC,IAAA,iBAAqB,EAAC,qBAAS,CAAC,CAAC;AACjC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AAGtB,QAAA,MAAM,GAAG,qBAAS,CAAC,GAAG,CAAU,kBAAM,CAAC,CAAC;AACrD,yBAAW,CAAC,MAAM,GAAG,cAAM,CAAC;AACf,QAAA,WAAW,GAAG,qBAAS,CAAC,GAAG,CAAe,uBAAW,CAAC,CAAC;AACpE,yBAAW,CAAC,WAAW,GAAG,mBAAW,CAAC;AACzB,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,yBAAa,CAAC,CAAC;AAC1E,yBAAW,CAAC,aAAa,GAAG,qBAAa,CAAC;AAC7B,QAAA,cAAc,GAAG,qBAAS,CAAC,GAAG,CAAkB,0BAAc,CAAC,CAAC;AAC7E,yBAAW,CAAC,cAAc,GAAG,sBAAc,CAAC;AAY/B,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,2CAAmB,CAAC,CAAC;AACnE,QAAA,YAAY,GAAG,qBAAS,CAAC,GAAG,CAAgB,wBAAY,CAAC,CAAC;AACvE,yBAAW,CAAC,YAAY,GAAG,oBAAY,CAAC","file":"modules.js","sourcesContent":["import { Container } from 'inversify';\nimport coreModule from './core/core-modules';\nimport renderModule from './render/render-modules';\nimport pickModule from './picker/pick-modules';\n// import allocatorModule from './allocator/allocator-modules';\nimport graphicModule from './graphic/graphic-service/graphic-module';\nimport pluginModule from './plugins/plugin-modules';\nimport loadBuiltinContributions from './core/contributions/modules';\nimport loadRenderContributions from './render/contributions/modules';\nimport loadPickContributions from './picker/contributions/modules';\nimport loadCanvasContributions from './canvas/contributions/modules';\nimport { LayerService } from './core/constants';\n// import { IMat4Allocate, IMatrixAllocate, Mat4Allocate, MatrixAllocate } from './allocator/matrix-allocate';\nimport { GlobalPickerService } from './picker/global-picker-service';\nimport { IPickerService } from './picker';\nimport {\n  ArcAllocate,\n  AreaAllocate,\n  CircleAllocate,\n  LineAllocate,\n  PathAllocate,\n  RectAllocate,\n  SymbolAllocate,\n  TextAllocate,\n  CanvasAllocate\n} from './allocator/constants';\nimport {\n  ILineAllocate,\n  IPathAllocate,\n  IRectAllocate,\n  ISymbolAllocate,\n  ITextAllocate,\n  IArcAllocate,\n  IAreaAllocate,\n  ICircleAllocate,\n  ICanvasAllocate\n} from './allocator/interface';\nimport { Global, IGlobal, IGraphicService } from './interface';\nimport { application } from './application';\nimport { IGraphicUtil, ILayerService, ITransformUtil } from './core/interface';\nimport { GraphicService } from './graphic/constants';\nimport { GraphicUtil, TransformUtil } from './core/constants';\nimport { container } from './container';\n\ncontainer.load(coreModule);\ncontainer.load(graphicModule);\ncontainer.load(renderModule);\ncontainer.load(pickModule);\n// container.load(allocatorModule);\ncontainer.load(pluginModule);\nloadBuiltinContributions(container);\nloadRenderContributions(container);\nloadPickContributions(container);\nloadCanvasContributions(container);\n\n// 全局变量\nexport const global = container.get<IGlobal>(Global);\napplication.global = global;\nexport const graphicUtil = container.get<IGraphicUtil>(GraphicUtil);\napplication.graphicUtil = graphicUtil;\nexport const transformUtil = container.get<ITransformUtil>(TransformUtil);\napplication.transformUtil = transformUtil;\nexport const graphicService = container.get<IGraphicService>(GraphicService);\napplication.graphicService = graphicService;\n// export const matrixAllocate = container.get<IMatrixAllocate>(MatrixAllocate);\n// export const mat4Allocate = container.get<IMat4Allocate>(Mat4Allocate);\n// export const canvasAllocate = container.get<ICanvasAllocate>(CanvasAllocate);\n// export const arcAllocate = container.get<IArcAllocate>(ArcAllocate);\n// export const areaAllocate = container.get<IAreaAllocate>(AreaAllocate);\n// export const circleAllocate = container.get<ICircleAllocate>(CircleAllocate);\n// export const lineAllocate = container.get<ILineAllocate>(LineAllocate);\n// export const pathAllocate = container.get<IPathAllocate>(PathAllocate);\n// export const rectAllocate = container.get<IRectAllocate>(RectAllocate);\n// export const symbolAllocate = container.get<ISymbolAllocate>(SymbolAllocate);\n// export const textAllocate = container.get<ITextAllocate>(TextAllocate);\nexport const pickerService = container.get<IPickerService>(GlobalPickerService);\nexport const layerService = container.get<ILayerService>(LayerService);\napplication.layerService = layerService;\n"]}
+{"version":3,"sources":["../../src/modules.ts"],"names":[],"mappings":";;;;;;AACA,uEAA6C;AAC7C,6EAAmD;AACnD,yEAA+C;AAE/C,8FAAqE;AACrE,8EAAoD;AACpD,2EAAoE;AACpE,6EAAqE;AACrE,6EAAmE;AACnE,6EAAqE;AACrE,gDAAgD;AAEhD,0EAAqE;AAErE,+CAA4C;AAE5C,mDAAqD;AACrD,gDAA8D;AAC9D,2CAAwC;AACxC,2CAAqC;AAErC,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAC3B,qBAAS,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;AAC9B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAE3B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,IAAA,iBAAwB,EAAC,qBAAS,CAAC,CAAC;AACpC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AACnC,IAAA,iBAAqB,EAAC,qBAAS,CAAC,CAAC;AACjC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AAGtB,QAAA,MAAM,GAAG,qBAAS,CAAC,GAAG,CAAU,kBAAM,CAAC,CAAC;AACrD,yBAAW,CAAC,MAAM,GAAG,cAAM,CAAC;AACf,QAAA,WAAW,GAAG,qBAAS,CAAC,GAAG,CAAe,uBAAW,CAAC,CAAC;AACpE,yBAAW,CAAC,WAAW,GAAG,mBAAW,CAAC;AACzB,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,yBAAa,CAAC,CAAC;AAC1E,yBAAW,CAAC,aAAa,GAAG,qBAAa,CAAC;AAC7B,QAAA,cAAc,GAAG,qBAAS,CAAC,GAAG,CAAkB,0BAAc,CAAC,CAAC;AAC7E,yBAAW,CAAC,cAAc,GAAG,sBAAc,CAAC;AAY/B,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,2CAAmB,CAAC,CAAC;AACnE,QAAA,YAAY,GAAG,qBAAS,CAAC,GAAG,CAAgB,wBAAY,CAAC,CAAC;AACvE,yBAAW,CAAC,YAAY,GAAG,oBAAY,CAAC","file":"modules.js","sourcesContent":["import { Container } from 'inversify';\nimport coreModule from './core/core-modules';\nimport renderModule from './render/render-modules';\nimport pickModule from './picker/pick-modules';\n// import allocatorModule from './allocator/allocator-modules';\nimport graphicModule from './graphic/graphic-service/graphic-module';\nimport pluginModule from './plugins/plugin-modules';\nimport loadBuiltinContributions from './core/contributions/modules';\nimport loadRenderContributions from './render/contributions/modules';\nimport loadPickContributions from './picker/contributions/modules';\nimport loadCanvasContributions from './canvas/contributions/modules';\nimport { LayerService } from './core/constants';\n// import { IMat4Allocate, IMatrixAllocate, Mat4Allocate, MatrixAllocate } from './allocator/matrix-allocate';\nimport { GlobalPickerService } from './picker/global-picker-service';\nimport type { IGlobal, IGraphicService, IPickerService } from './interface';\nimport { application } from './application';\nimport type { IGraphicUtil, ILayerService, ITransformUtil } from './interface/core';\nimport { GraphicService } from './graphic/constants';\nimport { GraphicUtil, TransformUtil } from './core/constants';\nimport { container } from './container';\nimport { Global } from './constants';\n\ncontainer.load(coreModule);\ncontainer.load(graphicModule);\ncontainer.load(renderModule);\ncontainer.load(pickModule);\n// container.load(allocatorModule);\ncontainer.load(pluginModule);\nloadBuiltinContributions(container);\nloadRenderContributions(container);\nloadPickContributions(container);\nloadCanvasContributions(container);\n\n// 全局变量\nexport const global = container.get<IGlobal>(Global);\napplication.global = global;\nexport const graphicUtil = container.get<IGraphicUtil>(GraphicUtil);\napplication.graphicUtil = graphicUtil;\nexport const transformUtil = container.get<ITransformUtil>(TransformUtil);\napplication.transformUtil = transformUtil;\nexport const graphicService = container.get<IGraphicService>(GraphicService);\napplication.graphicService = graphicService;\n// export const matrixAllocate = container.get<IMatrixAllocate>(MatrixAllocate);\n// export const mat4Allocate = container.get<IMat4Allocate>(Mat4Allocate);\n// export const canvasAllocate = container.get<ICanvasAllocate>(CanvasAllocate);\n// export const arcAllocate = container.get<IArcAllocate>(ArcAllocate);\n// export const areaAllocate = container.get<IAreaAllocate>(AreaAllocate);\n// export const circleAllocate = container.get<ICircleAllocate>(CircleAllocate);\n// export const lineAllocate = container.get<ILineAllocate>(LineAllocate);\n// export const pathAllocate = container.get<IPathAllocate>(PathAllocate);\n// export const rectAllocate = container.get<IRectAllocate>(RectAllocate);\n// export const symbolAllocate = container.get<ISymbolAllocate>(SymbolAllocate);\n// export const textAllocate = container.get<ITextAllocate>(TextAllocate);\nexport const pickerService = container.get<IPickerService>(GlobalPickerService);\nexport const layerService = container.get<ILayerService>(LayerService);\napplication.layerService = layerService;\n"]}

package/cjs/picker/canvas-picker-service.d.ts

@@ -1,11 +1,8 @@
-import { IPointLike } from '@visactor/vutils';
-import { ContributionProvider } from '../common/contribution-provider';
-import { ICanvas, IContext2d, IGraphic, EnvType, IGlobal } from '../interface';
-import { DefaultPickService, IGraphicPicker, IPickerService, IPickParams } from './picker-service';
-import { IDrawContribution } from '../render';
-import { IPickItemInterceptorContribution } from './pick-interceptor';
+import type { IPointLike } from '@visactor/vutils';
+import type { ICanvas, IContext2d, IGraphic, EnvType, IGlobal, IGraphicPicker, IPickerService, IDrawContribution, IContributionProvider, IPickItemInterceptorContribution, IPickParams } from '../interface';
+import { DefaultPickService } from './picker-service';
 export declare class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {
-    protected readonly contributions: ContributionProvider<IGraphicPicker>;
+    protected readonly contributions: IContributionProvider<IGraphicPicker>;
     private readonly circlePicker;
     private readonly rectPicker;
     private readonly arcPicker;
@@ -19,12 +16,12 @@ export declare class DefaultCanvasPickerService extends DefaultPickService imple
     private readonly richtextPicker;
     readonly drawContribution: IDrawContribution;
     readonly global: IGlobal;
-    protected readonly pickItemInterceptorContributions: ContributionProvider<IPickItemInterceptorContribution>;
+    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>;
     type: 'default';
     pickCanvas: ICanvas;
     pickContext: IContext2d;
     pickerMap: Map<number, IGraphicPicker>;
-    constructor(contributions: ContributionProvider<IGraphicPicker>, circlePicker: IGraphicPicker, rectPicker: IGraphicPicker, arcPicker: IGraphicPicker, areaPicker: IGraphicPicker, imagePicker: IGraphicPicker, linePicker: IGraphicPicker, pathPicker: IGraphicPicker, symbolPicker: IGraphicPicker, textPicker: IGraphicPicker, polygonPicker: IGraphicPicker, richtextPicker: IGraphicPicker, drawContribution: IDrawContribution, global: IGlobal, pickItemInterceptorContributions: ContributionProvider<IPickItemInterceptorContribution>);
+    constructor(contributions: IContributionProvider<IGraphicPicker>, circlePicker: IGraphicPicker, rectPicker: IGraphicPicker, arcPicker: IGraphicPicker, areaPicker: IGraphicPicker, imagePicker: IGraphicPicker, linePicker: IGraphicPicker, pathPicker: IGraphicPicker, symbolPicker: IGraphicPicker, textPicker: IGraphicPicker, polygonPicker: IGraphicPicker, richtextPicker: IGraphicPicker, drawContribution: IDrawContribution, global: IGlobal, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
     init(): void;
     configure(global: IGlobal, env: EnvType): void;
     pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null;

package/cjs/picker/canvas-picker-service.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPickerService = void 0;
 
-const contribution_provider_1 = require("../common/contribution-provider"), inversify_1 = require("inversify"), browser_1 = require("../canvas/contributions/browser"), interface_1 = require("../interface"), constants_1 = require("./contributions/constants"), picker_service_1 = require("./picker-service"), render_1 = require("../render"), pick_interceptor_1 = require("./pick-interceptor");
+const contribution_provider_1 = require("../common/contribution-provider"), inversify_1 = require("inversify"), browser_1 = require("../canvas/contributions/browser"), constants_1 = require("./contributions/constants"), picker_service_1 = require("./picker-service"), render_1 = require("../render"), pick_interceptor_1 = require("./pick-interceptor"), constants_2 = require("../constants");
 
 let DefaultCanvasPickerService = class extends picker_service_1.DefaultPickService {
     constructor(contributions, circlePicker, rectPicker, arcPicker, areaPicker, imagePicker, linePicker, pathPicker, symbolPicker, textPicker, polygonPicker, richtextPicker, drawContribution, global, pickItemInterceptorContributions) {
@@ -67,7 +67,7 @@ inversify_1.inject)(constants_1.CanvasAreaPicker)), __param(5, (0, inversify_1.i
 inversify_1.inject)(constants_1.CanvasLinePicker)), __param(7, (0, inversify_1.inject)(constants_1.CanvasPathPicker)), __param(8, (0, 
 inversify_1.inject)(constants_1.CanvasSymbolPicker)), __param(9, (0, inversify_1.inject)(constants_1.CanvasTextPicker)), __param(10, (0, 
 inversify_1.inject)(constants_1.CanvasPolygonPicker)), __param(11, (0, inversify_1.inject)(constants_1.CanvasRichTextPicker)), __param(12, (0, 
-inversify_1.inject)(render_1.DrawContribution)), __param(13, (0, inversify_1.inject)(interface_1.Global)), __param(14, (0, 
+inversify_1.inject)(render_1.DrawContribution)), __param(13, (0, inversify_1.inject)(constants_2.Global)), __param(14, (0, 
 inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(14, (0, 
 inversify_1.named)(pick_interceptor_1.PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object ]) ], DefaultCanvasPickerService), 
 exports.DefaultCanvasPickerService = DefaultCanvasPickerService;

package/cjs/picker/canvas-picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/canvas-picker-service.ts"],"names":[],"mappings":"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","file":"canvas-picker-service.js","sourcesContent":["import { IPointLike } from '@visactor/vutils';\nimport { ContributionProvider } from '../common/contribution-provider';\nimport { inject, injectable, named, postConstruct } from 'inversify';\nimport { BrowserCanvas } from '../canvas/contributions/browser';\nimport { ICanvas, IContext2d, IGraphic, EnvType, Global, IGlobal } from '../interface';\nimport {\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasRectPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker,\n  CanvasRichTextPicker\n} from './contributions/constants';\nimport { DefaultPickService, IGraphicPicker, IPickerService, IPickParams } from './picker-service';\nimport { DrawContribution, IDrawContribution } from '../render';\nimport { IPickItemInterceptorContribution, PickItemInterceptor } from './pick-interceptor';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(CanvasPickerContribution)\n    protected readonly contributions: ContributionProvider<IGraphicPicker>,\n    @inject(CanvasCirclePicker) private readonly circlePicker: IGraphicPicker, // 默认的circlePicker\n    @inject(CanvasRectPicker) private readonly rectPicker: IGraphicPicker, // 默认的rectPicker\n    @inject(CanvasArcPicker) private readonly arcPicker: IGraphicPicker, // 默认的arcPicker\n    @inject(CanvasAreaPicker) private readonly areaPicker: IGraphicPicker, // 默认的areaPicker\n    @inject(CanvasImagePicker) private readonly imagePicker: IGraphicPicker, // 默认的imagePicker\n    @inject(CanvasLinePicker) private readonly linePicker: IGraphicPicker, // 默认的linePicker\n    @inject(CanvasPathPicker) private readonly pathPicker: IGraphicPicker, // 默认的pathPicker\n    @inject(CanvasSymbolPicker) private readonly symbolPicker: IGraphicPicker, // 默认的symbolPicker\n    @inject(CanvasTextPicker) private readonly textPicker: IGraphicPicker, // 默认的textPicker\n    @inject(CanvasPolygonPicker) private readonly polygonPicker: IGraphicPicker, // 默认的polygonPicker\n    @inject(CanvasRichTextPicker) private readonly richtextPicker: IGraphicPicker, // 默认的richtextPicker\n\n    @inject(DrawContribution)\n    public readonly drawContribution: IDrawContribution,\n    @inject(Global) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: ContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(global, pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('canvas-picker-service', (_, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n\n    // 创建pick canvas\n    const options = {\n      width: 100,\n      height: 100,\n      nativeCanvas: global.createCanvas({ width: 100, height: 100 }),\n      id: 'for-pick'\n    };\n    this.pickCanvas = new BrowserCanvas(options);\n    this.pickContext = this.pickCanvas.getContext('2d');\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforePickItem) {\n          if (drawContribution.beforePickItem(graphic, this, point, params)) {\n            return graphic;\n          }\n        }\n      }\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    return picker.contains(graphic, point, params) ? graphic : null;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/canvas-picker-service.ts"],"names":[],"mappings":"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","file":"canvas-picker-service.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport { ContributionProvider } from '../common/contribution-provider';\nimport { inject, injectable, named, postConstruct } from 'inversify';\nimport { BrowserCanvas } from '../canvas/contributions/browser';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IDrawContribution,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams\n} from '../interface';\nimport {\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasRectPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker,\n  CanvasRichTextPicker\n} from './contributions/constants';\nimport { DefaultPickService } from './picker-service';\nimport { DrawContribution } from '../render';\nimport { PickItemInterceptor } from './pick-interceptor';\nimport { Global } from '../constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(CanvasPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    @inject(CanvasCirclePicker) private readonly circlePicker: IGraphicPicker, // 默认的circlePicker\n    @inject(CanvasRectPicker) private readonly rectPicker: IGraphicPicker, // 默认的rectPicker\n    @inject(CanvasArcPicker) private readonly arcPicker: IGraphicPicker, // 默认的arcPicker\n    @inject(CanvasAreaPicker) private readonly areaPicker: IGraphicPicker, // 默认的areaPicker\n    @inject(CanvasImagePicker) private readonly imagePicker: IGraphicPicker, // 默认的imagePicker\n    @inject(CanvasLinePicker) private readonly linePicker: IGraphicPicker, // 默认的linePicker\n    @inject(CanvasPathPicker) private readonly pathPicker: IGraphicPicker, // 默认的pathPicker\n    @inject(CanvasSymbolPicker) private readonly symbolPicker: IGraphicPicker, // 默认的symbolPicker\n    @inject(CanvasTextPicker) private readonly textPicker: IGraphicPicker, // 默认的textPicker\n    @inject(CanvasPolygonPicker) private readonly polygonPicker: IGraphicPicker, // 默认的polygonPicker\n    @inject(CanvasRichTextPicker) private readonly richtextPicker: IGraphicPicker, // 默认的richtextPicker\n\n    @inject(DrawContribution)\n    public readonly drawContribution: IDrawContribution,\n    @inject(Global) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(global, pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('canvas-picker-service', (_, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n\n    // 创建pick canvas\n    const options = {\n      width: 100,\n      height: 100,\n      nativeCanvas: global.createCanvas({ width: 100, height: 100 }),\n      id: 'for-pick'\n    };\n    this.pickCanvas = new BrowserCanvas(options);\n    this.pickContext = this.pickCanvas.getContext('2d');\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforePickItem) {\n          if (drawContribution.beforePickItem(graphic, this, point, params)) {\n            return graphic;\n          }\n        }\n      }\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    return picker.contains(graphic, point, params) ? graphic : null;\n  }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/arc-picker.d.ts

@@ -1,7 +1,5 @@
-import { IPoint } from '@visactor/vutils';
-import { IArc } from '../../../interface';
-import { IGraphicPicker, IPickParams } from '../../picker-service';
-import { IGraphicRender } from '../../../render';
+import type { IPoint } from '@visactor/vutils';
+import type { IArc, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';
 export declare class DefaultCanvasArcPicker implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;

package/cjs/picker/contributions/canvas-picker/arc-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,kDAAkD;AAGlD,4CAA4D;AAC5D,+DAA+D;AAC/D,0DAA6D;AAGtD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,2BAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,YAAY,GAAG,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjF,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,kBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA8ElC;AA9EY,wDAAsB","file":"arc-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { IArc, IGraphicAttribute, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { ArcRender, IGraphicRender } from '../../../render';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { ARC_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasArcPicker implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(@inject(ArcRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(arc: IArc, point: IPoint, params?: IPickParams): boolean {\n    if (!arc.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (arc.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const arcAttribute = getTheme(arc).arc;\n\n    // const arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n\n    pickContext.highPerformanceSave();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const point = arc.getOffsetXY(arcAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,kDAAkD;AAYlD,4CAA4C;AAC5C,+DAA+D;AAC/D,0DAA6D;AAGtD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,2BAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,YAAY,GAAG,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjF,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,kBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA8ElC;AA9EY,wDAAsB","file":"arc-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport type { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport type {\n  IArc,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '../../../interface';\n\nimport { ArcRender } from '../../../render';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { ARC_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasArcPicker implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(@inject(ArcRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(arc: IArc, point: IPoint, params?: IPickParams): boolean {\n    if (!arc.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (arc.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const arcAttribute = getTheme(arc).arc;\n\n    // const arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n\n    pickContext.highPerformanceSave();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const point = arc.getOffsetXY(arcAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/arc3d-picker.d.ts

@@ -1,7 +1,5 @@
-import { IPoint } from '@visactor/vutils';
-import { IArc3d } from '../../../interface';
-import { IGraphicRender } from '../../../render';
-import { IGraphicPicker, IPickParams } from '../../picker-service';
+import type { IPoint } from '@visactor/vutils';
+import type { IArc3d, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';
 import { BasePicker } from './base-picker';
 export declare class DefaultCanvasArc3dPicker extends BasePicker<IArc3d> implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

package/cjs/picker/contributions/canvas-picker/arc3d-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,yCAA+C;AAC/C,kDAAkD;AAElD,4CAA8D;AAE9D,wEAAkE;AAClE,+CAA2C;AAC3C,0DAA+D;AAE/D,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,wBAAkB;IAI9D,YAAiD,cAA8B;QAC7E,KAAK,EAAE,CAAC;QADuC,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAIvC,CAAC;IAED,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,cAAc,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC,GAAG,CAAC;QAE3C,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAE1C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACpD,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;YACnF,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;SACpF;QAED,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,MAAa,EACb,IAAI,EACJ,CACE,OAAmB,EACnB,cAA2D,EAC3D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAG1B,IAAI,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE;YAC/C,8BAAY,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC5C;QACD,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC;QAE1C,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7DY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA6DpC;AA7DY,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import { IPoint, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IArc3d, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, Arc3dRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BasePicker } from './base-picker';\nimport { ARC3D_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasArc3dPicker extends BasePicker<IArc3d> implements IGraphicPicker {\n  type: string = 'arc3d';\n  numberType: number = ARC3D_NUMBER_TYPE;\n\n  constructor(@inject(Arc3dRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(arc3d: IArc3d, point: IPoint, params?: IPickParams): boolean {\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n    const arc3dAttribute = getTheme(arc3d).arc;\n\n    pickContext.highPerformanceSave();\n    const data = this.transform(arc3d, arc3dAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = arc3d.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    this.canvasRenderer.z = z;\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc3d,\n      pickContext,\n      x,\n      y,\n      params as any,\n      null,\n      (\n        context: IContext2d,\n        arc3dAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n    this.canvasRenderer.z = 0;\n\n    // mat4Allocate.free(pickContext.modelMatrix);\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6CAA8C;AAC9C,yCAA+C;AAC/C,kDAAkD;AAWlD,4CAA8C;AAC9C,wEAAkE;AAClE,+CAA2C;AAC3C,0DAA+D;AAE/D,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,wBAAkB;IAI9D,YAAiD,cAA8B;QAC7E,KAAK,EAAE,CAAC;QADuC,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAIvC,CAAC;IAED,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,cAAc,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC,GAAG,CAAC;QAE3C,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAE1C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACpD,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;YACnF,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;SACpF;QAED,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,MAAa,EACb,IAAI,EACJ,CACE,OAAmB,EACnB,cAA2D,EAC3D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAG1B,IAAI,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE;YAC/C,8BAAY,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC5C;QACD,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC;QAE1C,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7DY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA6DpC;AA7DY,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IArc3d,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '../../../interface';\nimport { Arc3dRender } from '../../../render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BasePicker } from './base-picker';\nimport { ARC3D_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasArc3dPicker extends BasePicker<IArc3d> implements IGraphicPicker {\n  type: string = 'arc3d';\n  numberType: number = ARC3D_NUMBER_TYPE;\n\n  constructor(@inject(Arc3dRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(arc3d: IArc3d, point: IPoint, params?: IPickParams): boolean {\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n    const arc3dAttribute = getTheme(arc3d).arc;\n\n    pickContext.highPerformanceSave();\n    const data = this.transform(arc3d, arc3dAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = arc3d.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    this.canvasRenderer.z = z;\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc3d,\n      pickContext,\n      x,\n      y,\n      params as any,\n      null,\n      (\n        context: IContext2d,\n        arc3dAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n    this.canvasRenderer.z = 0;\n\n    // mat4Allocate.free(pickContext.modelMatrix);\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}