@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/es/picker/picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/picker-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAwC,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAiB,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAyC,MAAM,EAAiB,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1D,OAAO,EAAoC,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE3F,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAiCzD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAGlD,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAMtC,YACkC,MAAe,EAI5B,gCAAwF;QAJ3E,WAAM,GAAN,MAAM,CAAS;QAI5B,qCAAgC,GAAhC,gCAAgC,CAAwD;QAV7G,SAAI,GAAW,SAAS,CAAC;IAWtB,CAAC;IAEM,KAAK;QACb,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,gCAAgC;aAClE,gBAAgB,EAAE;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAMD,IAAI,CAAC,QAAoB,EAAE,KAAa,EAAE,MAAmB;QAC3D,IAAI,MAAM,GAAe;YACvB,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE;gBAC7C,OAAO,MAAM,CAAC;aACf;YACD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;SAC5B;QACD,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;SAC/B;QACD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE1D,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAI,KAAa,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;gBAC3B,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAW,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;aAC7E;iBAAM;gBACL,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aAC5D;YACD,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,MAAM;aACP;YACD,IAAI,CAAC,KAAK,EAAE;gBACV,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;aACtB;SACF;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;SACtB;QACD,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC;SAChC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,OAAiB,EAAE,KAAiB,EAAE,MAAmB;QACrE,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAGD,SAAS,CAAC,KAAa,EAAE,KAAiB,EAAE,YAAqB,EAAE,MAAmB;QACpF,IAAI,MAAM,GAAe;YACvB,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,IAAI;SACd,CAAC;QACF,IAAI,KAAK,CAAC,SAAS,CAAC,UAAU,KAAK,KAAK,EAAE;YACxC,OAAO,MAAM,CAAC;SACf;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;QACnC,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;QAEvC,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;YAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YACvC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACtB,IAAI,UAAU,EAAE;gBACd,IAAI,MAAM,EAAE;oBACV,MAAM,CAAC,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAClC,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;oBAC9D,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC3B;aACF;iBAAM;gBAEL,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAC5C,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC;aAC9B;SACF;QAED,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAC1D,IAAI,gBAAgB,CAAC,cAAc,EAAE;oBACnC,MAAM,MAAM,GAAG,gBAAgB,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;oBAC7F,IAAI,MAAM,EAAE;wBACV,IAAI,OAAO,CAAC,WAAW,KAAK,UAAU,EAAE;4BACtC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;yBACxC;wBACD,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC;wBACjC,OAAO,MAAoB,CAAC;qBAC7B;iBACF;aACF;SACF;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,MAAM,kBAAkB,GAAG,cAAc,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAW,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACrD,kBAAkB,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE7D,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;YACvC,OAAO,MAAM,CAAC;SACf;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,KAAK,IAAI,WAAW,CAAC;QAEtE,kBAAkB,CAAC,QAAQ,CACzB,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,CACd,CAAC;QACF,IAAI,KAAK,CAAC,SAAS,CAAC,gBAAgB,KAAK,KAAK,EAAE;YAC9C,OAAO,CACL,KAAK,EACL,gBAAgB,CAAC,MAAM,EACvB,CAAC,OAAiB,EAAE,EAAE;gBACpB,IAAI,OAAO,CAAC,WAAW,EAAE;oBAEvB,MAAM,QAAQ,GAAW,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;oBACpC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;oBAC7E,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC;oBACtB,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC;oBACtB,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAiB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;iBAClF;qBAAM;oBACL,MAAM,QAAQ,GAAW,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrD,kBAAkB,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAEtD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;oBACpC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;oBAC7E,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC;oBACtB,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC;oBACtB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;oBAC5D,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;iBAC7B;gBACD,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC5C,CAAC,EACD,IAAI,EACJ,CAAC,CAAC,OAAO,CAAC,MAAM,CACjB,CAAC;SACH;QACD,IAAI,OAAO,CAAC,WAAW,KAAK,UAAU,EAAE;YACtC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACxC;QACD,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,WAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;YAC1E,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;SACtB;QACD,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IAKS,YAAY,CAAC,OAAiB;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9LqB,kBAAkB;IADvC,UAAU,EAAE;IAQR,WAAA,MAAM,CAAC,MAAM,CAAC,CAAA;IAEd,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,mBAAmB,CAAC,CAAA;;GAVT,kBAAkB,CA8LvC;SA9LqB,kBAAkB","file":"picker-service.js","sourcesContent":["import { Matrix, Point, IMatrix, IPoint, IBounds, IPointLike } from '@visactor/vutils';\nimport { inject, injectable, named, postConstruct } from 'inversify';\nimport { ContributionProvider, foreach } from '../common';\nimport { IContext2d, IGraphic, IGroup, EnvType, Global, IGlobal, mat4 } from '../interface';\nimport { DefaultAttribute, getTheme, mat3Tomat4, multiplyMat4Mat4 } from '../graphic';\nimport { mat4Allocate, matrixAllocate } from '../modules';\nimport { PickResult } from './type';\nimport { IDrawContribution } from '../render';\nimport { IPickItemInterceptorContribution, PickItemInterceptor } from './pick-interceptor';\n\nexport const GraphicPicker = Symbol.for('GraphicPicker');\n\nexport interface IGraphicPicker {\n  type: string;\n  numberType: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n\nexport interface IPickParams {\n  group?: boolean;\n  graphic?: boolean;\n  bounds?: IBounds;\n  pickContext?: IContext2d;\n  pickerService?: IPickerService;\n  // 内部设置\n  in3dInterceptor?: boolean;\n  hack_pieFace?: string;\n}\n\nexport interface IPickerService {\n  type: string;\n\n  pickContext?: IContext2d;\n  pickerMap: Map<number, IGraphicPicker>;\n  configure: (global: IGlobal, env: EnvType) => void;\n  pick: (group: IGraphic[], point: IPoint, params?: IPickParams) => PickResult;\n  pickGroup: (group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams) => PickResult;\n  pickItem: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => IGraphic | null;\n  containsPoint: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n  drawContribution?: IDrawContribution;\n}\n\nexport const PickerService = Symbol.for('PickerService');\n\n@injectable()\nexport abstract class DefaultPickService implements IPickerService {\n  type: string = 'default';\n  declare pickerMap: Map<number, IGraphicPicker>;\n  declare pickContext?: IContext2d;\n  declare InterceptorContributions: IPickItemInterceptorContribution[];\n\n  constructor(\n    @inject(Global) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: ContributionProvider<IPickItemInterceptorContribution>\n  ) {}\n\n  protected _init() {\n    this.InterceptorContributions = this.pickItemInterceptorContributions\n      .getContributions()\n      .sort((a, b) => a.order - b.order);\n  }\n\n  abstract configure(global: IGlobal, env: EnvType): void;\n\n  // todo: params支持\n  // todo: 性能优化\n  pick(graphics: IGraphic[], point: IPoint, params: IPickParams): PickResult {\n    let result: PickResult = {\n      graphic: null,\n      group: null\n    };\n    params.pickerService = this;\n    let offsetX = 0;\n    let offsetY = 0;\n    if (params && params.bounds) {\n      if (!params.bounds.contains(point.x, point.y)) {\n        return result;\n      }\n      offsetX = params.bounds.x1;\n      offsetY = params.bounds.y1;\n    }\n    if (this.pickContext) {\n      this.pickContext.inuse = true;\n    }\n    params.pickContext = this.pickContext;\n    this.pickContext && this.pickContext.clearMatrix(true, 1);\n\n    const parentMatrix = new Matrix(1, 0, 0, 1, offsetX, offsetY);\n    let group: IGroup;\n    for (let i = graphics.length - 1; i >= 0; i--) {\n      if (graphics[i].isContainer) {\n        result = this.pickGroup(graphics[i] as IGroup, point, parentMatrix, params);\n      } else {\n        result.graphic = this.pickItem(graphics[i], point, params);\n      }\n      if (result.graphic) {\n        break;\n      }\n      if (!group) {\n        group = result.group;\n      }\n    }\n    if (!result.graphic) {\n      result.group = group;\n    }\n    if (this.pickContext) {\n      this.pickContext.inuse = false;\n    }\n    return result;\n  }\n\n  containsPoint(graphic: IGraphic, point: IPointLike, params: IPickParams): boolean {\n    return !!this.pickItem(graphic, point, params);\n  }\n\n  // TODO: 支持3d模式的拾取和自定义path的拾取\n  pickGroup(group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams): PickResult {\n    let result: PickResult = {\n      group: null,\n      graphic: null\n    };\n    if (group.attribute.visibleAll === false) {\n      return result;\n    }\n    const context = params.pickContext;\n    const lastMatrix = context.modelMatrix;\n    // 如果是3d，那么需要生成modelMatrix\n    if (context.camera) {\n      const m = group.transMatrix;\n      const matrix = mat4Allocate.allocate();\n      mat3Tomat4(matrix, m);\n      if (lastMatrix) {\n        if (matrix) {\n          const m = mat4Allocate.allocate();\n          context.modelMatrix = multiplyMat4Mat4(m, lastMatrix, matrix);\n          mat4Allocate.free(matrix);\n        }\n      } else {\n        // 转化context的matrix为lastMatrix\n        mat3Tomat4(matrix, group.globalTransMatrix);\n        context.modelMatrix = matrix;\n      }\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          const result = drawContribution.beforePickItem(group, this, point, params, { parentMatrix });\n          if (result) {\n            if (context.modelMatrix !== lastMatrix) {\n              mat4Allocate.free(context.modelMatrix);\n            }\n            context.modelMatrix = lastMatrix;\n            return result as PickResult;\n          }\n        }\n      }\n    }\n    // 转换坐标空间\n    const transMatrix = group.transMatrix;\n    const currentGroupMatrix = matrixAllocate.allocateByObj(parentMatrix);\n    const newPoint: IPoint = new Point(point.x, point.y);\n    currentGroupMatrix.transformPoint(newPoint, newPoint);\n    // todo: 支持带有path的group的选中\n    const insideGroup = group.AABBBounds.containsPoint(newPoint);\n    // 如果group没有被选中，直接跳过（如果是3d模式，那么继续）\n    if (!insideGroup && !group.stage.camera) {\n      return result;\n    }\n    const groupPicked = group.attribute.pickable !== false && insideGroup;\n\n    currentGroupMatrix.multiply(\n      transMatrix.a,\n      transMatrix.b,\n      transMatrix.c,\n      transMatrix.d,\n      transMatrix.e,\n      transMatrix.f\n    );\n    if (group.attribute.childrenPickable !== false) {\n      foreach(\n        group,\n        DefaultAttribute.zIndex,\n        (graphic: IGraphic) => {\n          if (graphic.isContainer) {\n            // 偏移scrollX和scrollY\n            const newPoint: IPoint = new Point(point.x, point.y);\n            const theme = getTheme(group).group;\n            const { scrollX = theme.scrollX, scrollY = theme.scrollY } = group.attribute;\n            newPoint.x -= scrollX;\n            newPoint.y -= scrollY;\n            result = this.pickGroup(graphic as IGroup, newPoint, currentGroupMatrix, params);\n          } else {\n            const newPoint: IPoint = new Point(point.x, point.y);\n            currentGroupMatrix.transformPoint(newPoint, newPoint);\n            // 偏移scrollX和scrollY\n            const theme = getTheme(group).group;\n            const { scrollX = theme.scrollX, scrollY = theme.scrollY } = group.attribute;\n            newPoint.x -= scrollX;\n            newPoint.y -= scrollY;\n            const pickedItem = this.pickItem(graphic, newPoint, params);\n            result.graphic = pickedItem;\n          }\n          return !!result.graphic || !!result.group;\n        },\n        true,\n        !!context.camera\n      );\n    }\n    if (context.modelMatrix !== lastMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastMatrix;\n\n    if (!result.graphic && !result.group && groupPicked && !group.stage.camera) {\n      result.group = group;\n    }\n    matrixAllocate.free(currentGroupMatrix);\n    return result;\n  }\n\n  // todo: switch统一改为数字map\n  abstract pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null;\n\n  protected selectPicker(graphic: IGraphic): IGraphicPicker | null {\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    return picker;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/picker-service.ts"],"names":[],"mappings":"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","file":"picker-service.js","sourcesContent":["import { Matrix, Point, IMatrix, IPoint, IBounds, IPointLike } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { foreach } from '../common/sort';\nimport { ContributionProvider } from '../common/contribution-provider';\nimport { IContext2d, IGraphic, IGroup, EnvType, Global, IGlobal, mat4 } from '../interface';\nimport { DefaultAttribute, getTheme, mat3Tomat4, multiplyMat4Mat4 } from '../graphic';\nimport { mat4Allocate, matrixAllocate } from '../allocator/matrix-allocate';\nimport { PickResult } from './type';\nimport { IDrawContribution } from '../render';\nimport { IPickItemInterceptorContribution, PickItemInterceptor } from './pick-interceptor';\n\nexport const GraphicPicker = Symbol.for('GraphicPicker');\n\nexport interface IGraphicPicker {\n  type: string;\n  numberType: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n\nexport interface IPickParams {\n  group?: boolean;\n  graphic?: boolean;\n  bounds?: IBounds;\n  pickContext?: IContext2d;\n  pickerService?: IPickerService;\n  // 内部设置\n  in3dInterceptor?: boolean;\n  hack_pieFace?: string;\n}\n\nexport interface IPickerService {\n  type: string;\n\n  pickContext?: IContext2d;\n  pickerMap: Map<number, IGraphicPicker>;\n  configure: (global: IGlobal, env: EnvType) => void;\n  pick: (group: IGraphic[], point: IPoint, params?: IPickParams) => PickResult;\n  pickGroup: (group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams) => PickResult;\n  pickItem: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => IGraphic | null;\n  containsPoint: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n  drawContribution?: IDrawContribution;\n}\n\nexport const PickerService = Symbol.for('PickerService');\n\n@injectable()\nexport abstract class DefaultPickService implements IPickerService {\n  type: string = 'default';\n  declare pickerMap: Map<number, IGraphicPicker>;\n  declare pickContext?: IContext2d;\n  declare InterceptorContributions: IPickItemInterceptorContribution[];\n\n  constructor(\n    @inject(Global) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: ContributionProvider<IPickItemInterceptorContribution>\n  ) {}\n\n  protected _init() {\n    this.InterceptorContributions = this.pickItemInterceptorContributions\n      .getContributions()\n      .sort((a, b) => a.order - b.order);\n  }\n\n  abstract configure(global: IGlobal, env: EnvType): void;\n\n  // todo: params支持\n  // todo: 性能优化\n  pick(graphics: IGraphic[], point: IPoint, params: IPickParams): PickResult {\n    let result: PickResult = {\n      graphic: null,\n      group: null\n    };\n    params.pickerService = this;\n    let offsetX = 0;\n    let offsetY = 0;\n    if (params && params.bounds) {\n      if (!params.bounds.contains(point.x, point.y)) {\n        return result;\n      }\n      offsetX = params.bounds.x1;\n      offsetY = params.bounds.y1;\n    }\n    if (this.pickContext) {\n      this.pickContext.inuse = true;\n    }\n    params.pickContext = this.pickContext;\n    this.pickContext && this.pickContext.clearMatrix(true, 1);\n\n    const parentMatrix = new Matrix(1, 0, 0, 1, offsetX, offsetY);\n    let group: IGroup;\n    for (let i = graphics.length - 1; i >= 0; i--) {\n      if (graphics[i].isContainer) {\n        result = this.pickGroup(graphics[i] as IGroup, point, parentMatrix, params);\n      } else {\n        result.graphic = this.pickItem(graphics[i], point, params);\n      }\n      if (result.graphic) {\n        break;\n      }\n      if (!group) {\n        group = result.group;\n      }\n    }\n    if (!result.graphic) {\n      result.group = group;\n    }\n    if (this.pickContext) {\n      this.pickContext.inuse = false;\n    }\n    return result;\n  }\n\n  containsPoint(graphic: IGraphic, point: IPointLike, params: IPickParams): boolean {\n    return !!this.pickItem(graphic, point, params);\n  }\n\n  // TODO: 支持3d模式的拾取和自定义path的拾取\n  pickGroup(group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams): PickResult {\n    let result: PickResult = {\n      group: null,\n      graphic: null\n    };\n    if (group.attribute.visibleAll === false) {\n      return result;\n    }\n    const context = params.pickContext;\n    const lastMatrix = context.modelMatrix;\n    // 如果是3d，那么需要生成modelMatrix\n    if (context.camera) {\n      const m = group.transMatrix;\n      const matrix = mat4Allocate.allocate();\n      mat3Tomat4(matrix, m);\n      if (lastMatrix) {\n        if (matrix) {\n          const m = mat4Allocate.allocate();\n          context.modelMatrix = multiplyMat4Mat4(m, lastMatrix, matrix);\n          mat4Allocate.free(matrix);\n        }\n      } else {\n        // 转化context的matrix为lastMatrix\n        mat3Tomat4(matrix, group.globalTransMatrix);\n        context.modelMatrix = matrix;\n      }\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          const result = drawContribution.beforePickItem(group, this, point, params, { parentMatrix });\n          if (result) {\n            if (context.modelMatrix !== lastMatrix) {\n              mat4Allocate.free(context.modelMatrix);\n            }\n            context.modelMatrix = lastMatrix;\n            return result as PickResult;\n          }\n        }\n      }\n    }\n    // 转换坐标空间\n    const transMatrix = group.transMatrix;\n    const currentGroupMatrix = matrixAllocate.allocateByObj(parentMatrix);\n    const newPoint: IPoint = new Point(point.x, point.y);\n    currentGroupMatrix.transformPoint(newPoint, newPoint);\n    // todo: 支持带有path的group的选中\n    const insideGroup = group.AABBBounds.containsPoint(newPoint);\n    // 如果group没有被选中，直接跳过（如果是3d模式，那么继续）\n    if (!insideGroup && !group.stage.camera) {\n      return result;\n    }\n    const groupPicked = group.attribute.pickable !== false && insideGroup;\n\n    currentGroupMatrix.multiply(\n      transMatrix.a,\n      transMatrix.b,\n      transMatrix.c,\n      transMatrix.d,\n      transMatrix.e,\n      transMatrix.f\n    );\n    if (group.attribute.childrenPickable !== false) {\n      foreach(\n        group,\n        DefaultAttribute.zIndex,\n        (graphic: IGraphic) => {\n          if (graphic.isContainer) {\n            // 偏移scrollX和scrollY\n            const newPoint: IPoint = new Point(point.x, point.y);\n            const theme = getTheme(group).group;\n            const { scrollX = theme.scrollX, scrollY = theme.scrollY } = group.attribute;\n            newPoint.x -= scrollX;\n            newPoint.y -= scrollY;\n            result = this.pickGroup(graphic as IGroup, newPoint, currentGroupMatrix, params);\n          } else {\n            const newPoint: IPoint = new Point(point.x, point.y);\n            currentGroupMatrix.transformPoint(newPoint, newPoint);\n            // 偏移scrollX和scrollY\n            const theme = getTheme(group).group;\n            const { scrollX = theme.scrollX, scrollY = theme.scrollY } = group.attribute;\n            newPoint.x -= scrollX;\n            newPoint.y -= scrollY;\n            const pickedItem = this.pickItem(graphic, newPoint, params);\n            result.graphic = pickedItem;\n          }\n          return !!result.graphic || !!result.group;\n        },\n        true,\n        !!context.camera\n      );\n    }\n    if (context.modelMatrix !== lastMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastMatrix;\n\n    if (!result.graphic && !result.group && groupPicked && !group.stage.camera) {\n      result.group = group;\n    }\n    matrixAllocate.free(currentGroupMatrix);\n    return result;\n  }\n\n  // todo: switch统一改为数字map\n  abstract pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null;\n\n  protected selectPicker(graphic: IGraphic): IGraphicPicker | null {\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    return picker;\n  }\n}\n"]}

package/es/plugins/builtin-plugin/3dview-transform-plugin.js

@@ -1,4 +1,4 @@
-import { Generator } from "../../common";
+import { Generator } from "../../common/generator";
 
 export class ViewTransform3dPlugin {
     constructor() {

package/es/plugins/builtin-plugin/3dview-transform-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/builtin-plugin/3dview-transform-plugin.ts"],"names":[],"mappings":"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","file":"3dview-transform-plugin.js","sourcesContent":["import { IOption3D } from '../../interface';\nimport { Generator } from '../../common';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nexport class ViewTransform3dPlugin implements IPlugin {\n  name: 'ViewTransform3dPlugin' = 'ViewTransform3dPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n  mousedown?: boolean;\n  pageX?: number;\n  pageY?: number;\n  option3d?: IOption3D;\n\n  onMouseDown = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = true;\n    this.pageX = e.page.x;\n    this.pageY = e.page.y;\n  };\n  onMouseUp = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = false;\n  };\n  onMouseMove = (e: MouseEvent | any) => {\n    const stage = this.pluginService.stage;\n    if (!this.option3d) {\n      this.option3d = stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    if (this.mousedown) {\n      if (!this.pageX || !this.pageY) {\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n      } else {\n        const deltaX = e.page.x - this.pageX;\n        const deltaY = e.page.y - this.pageY;\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n\n        const angle1 = deltaX / 100;\n        const angle2 = deltaY / 100;\n        this.option3d.alpha += angle1;\n        this.option3d.beta += angle2;\n        stage.set3dOptions(this.option3d);\n        stage.renderNextFrame();\n      }\n    }\n  };\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    const stage = context.stage;\n    this.option3d = stage.option3d;\n    stage.addEventListener('mousedown', this.onMouseDown);\n    stage.addEventListener('mouseup', this.onMouseUp);\n    stage.addEventListener('mousemove', this.onMouseMove);\n  }\n  deactivate(context: IPluginService): void {\n    const stage = context.stage;\n    stage.removeEventListener('mousedown', this.onMouseDown);\n    stage.removeEventListener('mouseup', this.onMouseUp);\n    stage.removeEventListener('mousemove', this.onMouseMove);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/plugins/builtin-plugin/3dview-transform-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,MAAM,OAAO,qBAAqB;IAAlC;QACE,SAAI,GAA4B,uBAAuB,CAAC;QACxD,gBAAW,GAAiB,YAAY,CAAC;QAEzC,SAAI,GAAW,SAAS,CAAC,kBAAkB,EAAE,CAAC;QAC9C,QAAG,GAAW,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAMpC,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC;aACnD;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,OAAO;aACR;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC;QACF,cAAS,GAAG,CAAC,CAAmB,EAAE,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC;aACnD;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,OAAO;aACR;YACD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC,CAAC;QACF,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;aAChC;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,OAAO;aACR;YACD,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;oBAC9B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACtB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;oBACrC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;oBACrC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACtB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEtB,MAAM,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;oBAC5B,MAAM,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC;oBAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC;oBAC7B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAClC,KAAK,CAAC,eAAe,EAAE,CAAC;iBACzB;aACF;QACH,CAAC,CAAC;IAgBJ,CAAC;IAdC,QAAQ,CAAC,OAAuB;QAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC/B,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;IACD,UAAU,CAAC,OAAuB;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,KAAK,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,KAAK,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3D,CAAC;CACF","file":"3dview-transform-plugin.js","sourcesContent":["import { IOption3D } from '../../interface';\nimport { Generator } from '../../common/generator';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nexport class ViewTransform3dPlugin implements IPlugin {\n  name: 'ViewTransform3dPlugin' = 'ViewTransform3dPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n  mousedown?: boolean;\n  pageX?: number;\n  pageY?: number;\n  option3d?: IOption3D;\n\n  onMouseDown = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = true;\n    this.pageX = e.page.x;\n    this.pageY = e.page.y;\n  };\n  onMouseUp = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = false;\n  };\n  onMouseMove = (e: MouseEvent | any) => {\n    const stage = this.pluginService.stage;\n    if (!this.option3d) {\n      this.option3d = stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    if (this.mousedown) {\n      if (!this.pageX || !this.pageY) {\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n      } else {\n        const deltaX = e.page.x - this.pageX;\n        const deltaY = e.page.y - this.pageY;\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n\n        const angle1 = deltaX / 100;\n        const angle2 = deltaY / 100;\n        this.option3d.alpha += angle1;\n        this.option3d.beta += angle2;\n        stage.set3dOptions(this.option3d);\n        stage.renderNextFrame();\n      }\n    }\n  };\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    const stage = context.stage;\n    this.option3d = stage.option3d;\n    stage.addEventListener('mousedown', this.onMouseDown);\n    stage.addEventListener('mouseup', this.onMouseUp);\n    stage.addEventListener('mousemove', this.onMouseMove);\n  }\n  deactivate(context: IPluginService): void {\n    const stage = context.stage;\n    stage.removeEventListener('mousedown', this.onMouseDown);\n    stage.removeEventListener('mouseup', this.onMouseUp);\n    stage.removeEventListener('mousemove', this.onMouseMove);\n  }\n}\n"]}

package/es/plugins/builtin-plugin/auto-render-plugin.js

@@ -1,6 +1,6 @@
-import { Generator } from "../../common";
+import { Generator } from "../../common/generator";
 
-import { graphicService } from "../../modules";
+import { application } from "../../application";
 
 export class AutoRenderPlugin {
     constructor() {
@@ -8,15 +8,15 @@ export class AutoRenderPlugin {
         this.key = this.name + this._uid;
     }
     activate(context) {
-        this.pluginService = context, graphicService.hooks.onAttributeUpdate.tap(this.key, (graphic => {
+        this.pluginService = context, application.graphicService.hooks.onAttributeUpdate.tap(this.key, (graphic => {
             graphic.glyphHost && (graphic = graphic.glyphHost), graphic.stage === context.stage && null != graphic.stage && graphic.stage.renderNextFrame();
-        })), graphicService.hooks.onSetStage.tap(this.key, (graphic => {
+        })), application.graphicService.hooks.onSetStage.tap(this.key, (graphic => {
             graphic.glyphHost && (graphic = graphic.glyphHost), graphic.stage === context.stage && null != graphic.stage && graphic.stage.renderNextFrame();
         }));
     }
     deactivate(context) {
-        graphicService.hooks.onAttributeUpdate.taps = graphicService.hooks.onAttributeUpdate.taps.filter((item => item.name !== this.key)), 
-        graphicService.hooks.onSetStage.taps = graphicService.hooks.onSetStage.taps.filter((item => item.name !== this.key));
+        application.graphicService.hooks.onAttributeUpdate.taps = application.graphicService.hooks.onAttributeUpdate.taps.filter((item => item.name !== this.key)), 
+        application.graphicService.hooks.onSetStage.taps = application.graphicService.hooks.onSetStage.taps.filter((item => item.name !== this.key));
     }
 }
 //# sourceMappingURL=auto-render-plugin.js.map

package/es/plugins/builtin-plugin/auto-render-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/builtin-plugin/auto-render-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,MAAM,OAAO,gBAAgB;IAA7B;QACE,SAAI,GAAuB,kBAAkB,CAAC;QAC9C,gBAAW,GAAiB,YAAY,CAAC;QAEzC,SAAI,GAAW,SAAS,CAAC,kBAAkB,EAAE,CAAC;QAC9C,QAAG,GAAW,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IA6BtC,CAAC;IA3BC,QAAQ,CAAC,OAAuB;QAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAC7B,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;YAC7D,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;aAC7B;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;gBAC5D,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QACH,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;YACtD,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;aAC7B;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;gBAC5D,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,UAAU,CAAC,OAAuB;QAChC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACtG,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACxF,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;CACF","file":"auto-render-plugin.js","sourcesContent":["import { Generator } from '../../common';\nimport { graphicService } from '../../modules';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nexport class AutoRenderPlugin implements IPlugin {\n  name: 'AutoRenderPlugin' = 'AutoRenderPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    graphicService.hooks.onAttributeUpdate.tap(this.key, graphic => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        graphic.stage.renderNextFrame();\n      }\n    });\n    graphicService.hooks.onSetStage.tap(this.key, graphic => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        graphic.stage.renderNextFrame();\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    graphicService.hooks.onAttributeUpdate.taps = graphicService.hooks.onAttributeUpdate.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    graphicService.hooks.onSetStage.taps = graphicService.hooks.onSetStage.taps.filter(item => {\n      return item.name !== this.key;\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../../src/plugins/builtin-plugin/auto-render-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,OAAO,gBAAgB;IAA7B;QACE,SAAI,GAAuB,kBAAkB,CAAC;QAC9C,gBAAW,GAAiB,YAAY,CAAC;QAEzC,SAAI,GAAW,SAAS,CAAC,kBAAkB,EAAE,CAAC;QAC9C,QAAG,GAAW,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IA8BtC,CAAC;IA5BC,QAAQ,CAAC,OAAuB;QAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAC7B,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;YACzE,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;aAC7B;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;gBAC5D,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;YAClE,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;aAC7B;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;gBAC5D,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,UAAU,CAAC,OAAuB;QAChC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI;YACrD,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBACpE,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAChH,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;CACF","file":"auto-render-plugin.js","sourcesContent":["import { Generator } from '../../common/generator';\nimport { application } from '../../application';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nexport class AutoRenderPlugin implements IPlugin {\n  name: 'AutoRenderPlugin' = 'AutoRenderPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    application.graphicService.hooks.onAttributeUpdate.tap(this.key, graphic => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        graphic.stage.renderNextFrame();\n      }\n    });\n    application.graphicService.hooks.onSetStage.tap(this.key, graphic => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        graphic.stage.renderNextFrame();\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    application.graphicService.hooks.onAttributeUpdate.taps =\n      application.graphicService.hooks.onAttributeUpdate.taps.filter(item => {\n        return item.name !== this.key;\n      });\n    application.graphicService.hooks.onSetStage.taps = application.graphicService.hooks.onSetStage.taps.filter(item => {\n      return item.name !== this.key;\n    });\n  }\n}\n"]}

package/es/plugins/builtin-plugin/dirty-bounds-plugin.js

@@ -1,8 +1,8 @@
 import { AABBBounds } from "@visactor/vutils";
 
-import { Generator } from "../../common";
+import { Generator } from "../../common/generator";
 
-import { graphicService } from "../../modules";
+import { application } from "../../application";
 
 const globalBounds = new AABBBounds;
 
@@ -14,21 +14,21 @@ export class DirtyBoundsPlugin {
     activate(context) {
         this.pluginService = context, context.stage.hooks.afterRender.tap(this.key, (stage => {
             stage && stage === this.pluginService.stage && stage.dirtyBounds.clear();
-        })), graphicService.hooks.beforeUpdateAABBBounds.tap(this.key, ((graphic, stage, willUpdate, bounds) => {
+        })), application.graphicService.hooks.beforeUpdateAABBBounds.tap(this.key, ((graphic, stage, willUpdate, bounds) => {
             graphic.glyphHost && (graphic = graphic.glyphHost), stage && stage === this.pluginService.stage && stage.renderCount && (graphic.isContainer && !graphic.shouldSelfChangeUpdateAABBBounds() || willUpdate && (globalBounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2), 
             stage.dirty(globalBounds, graphic.parent && graphic.parent.globalTransMatrix)));
-        })), graphicService.hooks.afterUpdateAABBBounds.tap(this.key, ((graphic, stage, bounds, params, selfChange) => {
+        })), application.graphicService.hooks.afterUpdateAABBBounds.tap(this.key, ((graphic, stage, bounds, params, selfChange) => {
             stage && stage === this.pluginService.stage && stage.renderCount && (graphic.isContainer && !selfChange || stage.dirty(params.globalAABBBounds));
-        })), graphicService.hooks.onRemove.tap(this.key, (graphic => {
+        })), application.graphicService.hooks.onRemove.tap(this.key, (graphic => {
             const stage = graphic.stage;
             stage && stage === this.pluginService.stage && stage.renderCount && stage && stage.dirty(graphic.globalAABBBounds);
         }));
     }
     deactivate(context) {
-        graphicService.hooks.beforeUpdateAABBBounds.taps = graphicService.hooks.beforeUpdateAABBBounds.taps.filter((item => item.name !== this.key)), 
-        graphicService.hooks.afterUpdateAABBBounds.taps = graphicService.hooks.afterUpdateAABBBounds.taps.filter((item => item.name !== this.key)), 
+        application.graphicService.hooks.beforeUpdateAABBBounds.taps = application.graphicService.hooks.beforeUpdateAABBBounds.taps.filter((item => item.name !== this.key)), 
+        application.graphicService.hooks.afterUpdateAABBBounds.taps = application.graphicService.hooks.afterUpdateAABBBounds.taps.filter((item => item.name !== this.key)), 
         context.stage.hooks.afterRender.taps = context.stage.hooks.afterRender.taps.filter((item => item.name !== this.key)), 
-        graphicService.hooks.onRemove.taps = graphicService.hooks.onRemove.taps.filter((item => item.name !== this.key));
+        application.graphicService.hooks.onRemove.taps = application.graphicService.hooks.onRemove.taps.filter((item => item.name !== this.key));
     }
 }
 //# sourceMappingURL=dirty-bounds-plugin.js.map

package/es/plugins/builtin-plugin/dirty-bounds-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/builtin-plugin/dirty-bounds-plugin.ts"],"names":[],"mappings":"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","file":"dirty-bounds-plugin.js","sourcesContent":["import { AABBBounds, IAABBBounds } from '@visactor/vutils';\nimport { Generator } from '../../common';\nimport { IGraphic, IStage } from '../../interface';\nimport { graphicService } from '../../modules';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nconst globalBounds = new AABBBounds();\n\nexport class DirtyBoundsPlugin implements IPlugin {\n  name: 'DirtyBoundsPlugin' = 'DirtyBoundsPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    context.stage.hooks.afterRender.tap(this.key, stage => {\n      if (!(stage && stage === this.pluginService.stage)) {\n        return;\n      }\n      stage.dirtyBounds.clear();\n    });\n    graphicService.hooks.beforeUpdateAABBBounds.tap(\n      this.key,\n      (graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) => {\n        if (graphic.glyphHost) {\n          graphic = graphic.glyphHost;\n        }\n        if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n          return;\n        }\n        // group的子元素导致的bounds更新不用做dirtyBounds\n        if (graphic.isContainer && !graphic.shouldSelfChangeUpdateAABBBounds()) {\n          return;\n        }\n        if (willUpdate) {\n          globalBounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n          stage.dirty(globalBounds, graphic.parent && graphic.parent.globalTransMatrix);\n        }\n      }\n    );\n    graphicService.hooks.afterUpdateAABBBounds.tap(\n      this.key,\n      (\n        graphic: IGraphic,\n        stage: IStage,\n        bounds: IAABBBounds,\n        params: { globalAABBBounds: IAABBBounds },\n        selfChange: boolean\n      ) => {\n        if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n          return;\n        }\n        // group的子元素导致的bounds更新不用做dirtyBounds\n        if (graphic.isContainer && !selfChange) {\n          return;\n        }\n        stage.dirty(params.globalAABBBounds);\n      }\n    );\n    graphicService.hooks.onRemove.tap(this.key, (graphic: IGraphic) => {\n      const stage = graphic.stage;\n      if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n        return;\n      }\n      if (stage) {\n        stage.dirty(graphic.globalAABBBounds);\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    graphicService.hooks.beforeUpdateAABBBounds.taps = graphicService.hooks.beforeUpdateAABBBounds.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    graphicService.hooks.afterUpdateAABBBounds.taps = graphicService.hooks.afterUpdateAABBBounds.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    context.stage.hooks.afterRender.taps = context.stage.hooks.afterRender.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    graphicService.hooks.onRemove.taps = graphicService.hooks.onRemove.taps.filter(item => {\n      return item.name !== this.key;\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../../src/plugins/builtin-plugin/dirty-bounds-plugin.ts"],"names":[],"mappings":"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","file":"dirty-bounds-plugin.js","sourcesContent":["import { AABBBounds, IAABBBounds } from '@visactor/vutils';\nimport { Generator } from '../../common/generator';\nimport { IGraphic, IStage } from '../../interface';\nimport { application } from '../../application';\nimport { IPlugin, IPluginService } from '../plugin-service';\n\nconst globalBounds = new AABBBounds();\n\nexport class DirtyBoundsPlugin implements IPlugin {\n  name: 'DirtyBoundsPlugin' = 'DirtyBoundsPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    context.stage.hooks.afterRender.tap(this.key, stage => {\n      if (!(stage && stage === this.pluginService.stage)) {\n        return;\n      }\n      stage.dirtyBounds.clear();\n    });\n    application.graphicService.hooks.beforeUpdateAABBBounds.tap(\n      this.key,\n      (graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) => {\n        if (graphic.glyphHost) {\n          graphic = graphic.glyphHost;\n        }\n        if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n          return;\n        }\n        // group的子元素导致的bounds更新不用做dirtyBounds\n        if (graphic.isContainer && !graphic.shouldSelfChangeUpdateAABBBounds()) {\n          return;\n        }\n        if (willUpdate) {\n          globalBounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n          stage.dirty(globalBounds, graphic.parent && graphic.parent.globalTransMatrix);\n        }\n      }\n    );\n    application.graphicService.hooks.afterUpdateAABBBounds.tap(\n      this.key,\n      (\n        graphic: IGraphic,\n        stage: IStage,\n        bounds: IAABBBounds,\n        params: { globalAABBBounds: IAABBBounds },\n        selfChange: boolean\n      ) => {\n        if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n          return;\n        }\n        // group的子元素导致的bounds更新不用做dirtyBounds\n        if (graphic.isContainer && !selfChange) {\n          return;\n        }\n        stage.dirty(params.globalAABBBounds);\n      }\n    );\n    application.graphicService.hooks.onRemove.tap(this.key, (graphic: IGraphic) => {\n      const stage = graphic.stage;\n      if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {\n        return;\n      }\n      if (stage) {\n        stage.dirty(graphic.globalAABBBounds);\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    application.graphicService.hooks.beforeUpdateAABBBounds.taps =\n      application.graphicService.hooks.beforeUpdateAABBBounds.taps.filter(item => {\n        return item.name !== this.key;\n      });\n    application.graphicService.hooks.afterUpdateAABBBounds.taps =\n      application.graphicService.hooks.afterUpdateAABBBounds.taps.filter(item => {\n        return item.name !== this.key;\n      });\n    context.stage.hooks.afterRender.taps = context.stage.hooks.afterRender.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    application.graphicService.hooks.onRemove.taps = application.graphicService.hooks.onRemove.taps.filter(item => {\n      return item.name !== this.key;\n    });\n  }\n}\n"]}

package/es/plugins/builtin-plugin/incremental-auto-render-plugin.js

@@ -1,6 +1,6 @@
-import { global, graphicService } from "../../modules";
+import { application } from "../../application";
 
-import { Generator } from "../../common";
+import { Generator } from "../../common/generator";
 
 export class IncrementalAutoRenderPlugin {
     constructor() {
@@ -9,21 +9,21 @@ export class IncrementalAutoRenderPlugin {
         this.key = this.name + this._uid;
     }
     activate(context) {
-        this.pluginService = context, graphicService.hooks.onAddIncremental.tap(this.key, ((graphic, group, stage) => {
+        this.pluginService = context, application.graphicService.hooks.onAddIncremental.tap(this.key, ((graphic, group, stage) => {
             graphic.glyphHost && (graphic = graphic.glyphHost), graphic.stage === context.stage && null != graphic.stage && (this.nextUserParams.startAtId = group._uid, 
             this.renderNextFrame(group));
-        })), graphicService.hooks.onClearIncremental.tap(this.key, ((group, stage) => {
+        })), application.graphicService.hooks.onClearIncremental.tap(this.key, ((group, stage) => {
             group.stage === context.stage && null != group.stage && (this.nextUserParams.startAtId = group._uid, 
             this.nextUserParams.restartIncremental = !0, this.renderNextFrame(group));
         }));
     }
     deactivate(context) {
-        graphicService.hooks.onAddIncremental.taps = graphicService.hooks.onAddIncremental.taps.filter((item => item.name !== this.key)), 
-        graphicService.hooks.onClearIncremental.taps = graphicService.hooks.onClearIncremental.taps.filter((item => item.name !== this.key));
+        application.graphicService.hooks.onAddIncremental.taps = application.graphicService.hooks.onAddIncremental.taps.filter((item => item.name !== this.key)), 
+        application.graphicService.hooks.onClearIncremental.taps = application.graphicService.hooks.onClearIncremental.taps.filter((item => item.name !== this.key));
     }
     renderNextFrame(group) {
         this.nextFrameRenderGroupSet.add(group), this.willNextFrameRender || (this.willNextFrameRender = !0, 
-        global.getRequestAnimationFrame()((() => {
+        application.global.getRequestAnimationFrame()((() => {
             this._doRenderInThisFrame(), this.willNextFrameRender = !1;
         })));
     }

package/es/plugins/builtin-plugin/incremental-auto-render-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/builtin-plugin/incremental-auto-render-plugin.ts"],"names":[],"mappings":"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","file":"incremental-auto-render-plugin.js","sourcesContent":["import { IGroup } from '../../interface';\nimport { IDrawContext } from '../../render';\nimport { global, graphicService } from '../../modules';\nimport { IPlugin, IPluginService } from '../plugin-service';\nimport { Generator } from '../../common';\n\nexport class IncrementalAutoRenderPlugin implements IPlugin {\n  name: 'IncrementalAutoRenderPlugin' = 'IncrementalAutoRenderPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  protected nextFrameRenderGroupSet: Set<IGroup> = new Set();\n  protected willNextFrameRender: boolean = false;\n  nextUserParams: Partial<IDrawContext> = {};\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    graphicService.hooks.onAddIncremental.tap(this.key, (graphic, group, stage) => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        this.nextUserParams.startAtId = group._uid;\n        this.renderNextFrame(group);\n      }\n    });\n    graphicService.hooks.onClearIncremental.tap(this.key, (group, stage) => {\n      if (group.stage === context.stage && group.stage != null) {\n        this.nextUserParams.startAtId = group._uid;\n        this.nextUserParams.restartIncremental = true;\n        this.renderNextFrame(group);\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    graphicService.hooks.onAddIncremental.taps = graphicService.hooks.onAddIncremental.taps.filter(item => {\n      return item.name !== this.key;\n    });\n    graphicService.hooks.onClearIncremental.taps = graphicService.hooks.onClearIncremental.taps.filter(item => {\n      return item.name !== this.key;\n    });\n  }\n\n  renderNextFrame(group: IGroup): void {\n    this.nextFrameRenderGroupSet.add(group);\n    if (!this.willNextFrameRender) {\n      this.willNextFrameRender = true;\n      global.getRequestAnimationFrame()(() => {\n        this._doRenderInThisFrame();\n        this.willNextFrameRender = false;\n      });\n    }\n  }\n\n  _doRenderInThisFrame() {\n    const stage = this.pluginService.stage;\n    if (this.nextFrameRenderGroupSet.size) {\n      this.nextFrameRenderGroupSet.forEach(group => {\n        const layer = group.layer;\n        if (!layer || !group.layer.subLayers) {\n          return;\n        }\n        const subLayer = group.layer.subLayers.get(group._uid);\n        if (!subLayer || !subLayer.drawContribution) {\n          return;\n        }\n        subLayer.drawContribution.draw(stage.renderService, {\n          x: stage.x,\n          y: stage.y,\n          width: layer.viewWidth,\n          height: layer.viewHeight,\n          stage,\n          layer,\n          // TODO: 多图层时不应该再用默认background\n          clear: 'transparent',\n          renderService: stage.renderService,\n          updateBounds: false,\n          startAtId: group._uid,\n          context: subLayer.layer.getNativeHandler().getContext(),\n          ...this.nextUserParams\n        });\n      });\n      this.nextUserParams = {};\n      this.nextFrameRenderGroupSet.clear();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/plugins/builtin-plugin/incremental-auto-render-plugin.ts"],"names":[],"mappings":"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","file":"incremental-auto-render-plugin.js","sourcesContent":["import { IGroup } from '../../interface';\nimport { IDrawContext } from '../../render';\nimport { application } from '../../application';\nimport { IPlugin, IPluginService } from '../plugin-service';\nimport { Generator } from '../../common/generator';\n\nexport class IncrementalAutoRenderPlugin implements IPlugin {\n  name: 'IncrementalAutoRenderPlugin' = 'IncrementalAutoRenderPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  protected nextFrameRenderGroupSet: Set<IGroup> = new Set();\n  protected willNextFrameRender: boolean = false;\n  nextUserParams: Partial<IDrawContext> = {};\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    application.graphicService.hooks.onAddIncremental.tap(this.key, (graphic, group, stage) => {\n      if (graphic.glyphHost) {\n        graphic = graphic.glyphHost;\n      }\n      if (graphic.stage === context.stage && graphic.stage != null) {\n        this.nextUserParams.startAtId = group._uid;\n        this.renderNextFrame(group);\n      }\n    });\n    application.graphicService.hooks.onClearIncremental.tap(this.key, (group, stage) => {\n      if (group.stage === context.stage && group.stage != null) {\n        this.nextUserParams.startAtId = group._uid;\n        this.nextUserParams.restartIncremental = true;\n        this.renderNextFrame(group);\n      }\n    });\n  }\n  deactivate(context: IPluginService): void {\n    application.graphicService.hooks.onAddIncremental.taps =\n      application.graphicService.hooks.onAddIncremental.taps.filter(item => {\n        return item.name !== this.key;\n      });\n    application.graphicService.hooks.onClearIncremental.taps =\n      application.graphicService.hooks.onClearIncremental.taps.filter(item => {\n        return item.name !== this.key;\n      });\n  }\n\n  renderNextFrame(group: IGroup): void {\n    this.nextFrameRenderGroupSet.add(group);\n    if (!this.willNextFrameRender) {\n      this.willNextFrameRender = true;\n      application.global.getRequestAnimationFrame()(() => {\n        this._doRenderInThisFrame();\n        this.willNextFrameRender = false;\n      });\n    }\n  }\n\n  _doRenderInThisFrame() {\n    const stage = this.pluginService.stage;\n    if (this.nextFrameRenderGroupSet.size) {\n      this.nextFrameRenderGroupSet.forEach(group => {\n        const layer = group.layer;\n        if (!layer || !group.layer.subLayers) {\n          return;\n        }\n        const subLayer = group.layer.subLayers.get(group._uid);\n        if (!subLayer || !subLayer.drawContribution) {\n          return;\n        }\n        subLayer.drawContribution.draw(stage.renderService, {\n          x: stage.x,\n          y: stage.y,\n          width: layer.viewWidth,\n          height: layer.viewHeight,\n          stage,\n          layer,\n          // TODO: 多图层时不应该再用默认background\n          clear: 'transparent',\n          renderService: stage.renderService,\n          updateBounds: false,\n          startAtId: group._uid,\n          context: subLayer.layer.getNativeHandler().getContext(),\n          ...this.nextUserParams\n        });\n      });\n      this.nextUserParams = {};\n      this.nextFrameRenderGroupSet.clear();\n    }\n  }\n}\n"]}

package/es/render/contributions/render/arc-render.d.ts

@@ -1,9 +1,8 @@
-import { ContributionProvider } from '../../../common';
+import { ContributionProvider } from '../../../common/contribution-provider';
 import { IContext2d, IArc, IPath2D, IGraphicAttribute, IMarkAttribute, IThemeAttribute } from '../../../interface';
 import { IDrawContext, IRenderService } from '../../render-service';
 import { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';
 import { IArcRenderContribution } from './contributions/arc-contribution-render';
-export declare function drawArcPath(arc: IArc, context: IContext2d | IPath2D, cx: number, cy: number, outerRadius: number, innerRadius: number, partStroke?: boolean[]): boolean;
 export declare class DefaultCanvasArcRender implements IGraphicRender {
     protected readonly arcRenderContribitions: ContributionProvider<IArcRenderContribution>;
     type: 'arc';

package/es/render/contributions/render/arc-render.js

@@ -14,87 +14,21 @@ import { abs, acos, atan2, cos, epsilon, min, pi, sin, sqrt, pi2 } from "@visact
 
 import { inject, injectable, named } from "inversify";
 
-import { ARC_NUMBER_TYPE, getTheme } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
-import { ContributionProvider, parseStroke } from "../../../common";
+import { parseStroke } from "../../../common/utils";
 
-import { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from "./utils";
+import { ContributionProvider } from "../../../common/contribution-provider";
 
-import { getConicGradientAt } from "../../../canvas";
+import { cornerTangents, drawArcPath, drawPathProxy, fillVisible, intersect, runFill, runStroke, strokeVisible } from "./utils";
+
+import { getConicGradientAt } from "../../../canvas/contributions/browser/conical-gradient";
 
 import { ArcRenderContribution } from "./contributions/arc-contribution-render";
 
 import { BaseRenderContributionTime } from "./contributions/base-contribution-render";
 
-function intersect(x0, y0, x1, y1, x2, y2, x3, y3) {
-    const x10 = x1 - x0, y10 = y1 - y0, x32 = x3 - x2, y32 = y3 - y2;
-    let t = y32 * x10 - x32 * y10;
-    return t * t < epsilon ? [] : (t = (x32 * (y0 - y2) - y32 * (x0 - x2)) / t, [ x0 + t * x10, y0 + t * y10 ]);
-}
-
-function cornerTangents(x0, y0, x1, y1, r1, rc, clockwise) {
-    const x01 = x0 - x1, y01 = y0 - y1, lo = (clockwise ? rc : -rc) / Math.sqrt(x01 * x01 + y01 * y01), ox = lo * y01, oy = -lo * x01, x11 = x0 + ox, y11 = y0 + oy, x10 = x1 + ox, y10 = y1 + oy, x00 = (x11 + x10) / 2, y00 = (y11 + y10) / 2, dx = x10 - x11, dy = y10 - y11, d2 = dx * dx + dy * dy, r = r1 - rc, D = x11 * y10 - x10 * y11, d = (dy < 0 ? -1 : 1) * Math.sqrt(Math.max(0, r * r * d2 - D * D));
-    let cx0 = (D * dy - dx * d) / d2, cy0 = (-D * dx - dy * d) / d2;
-    const cx1 = (D * dy + dx * d) / d2, cy1 = (-D * dx + dy * d) / d2, dx0 = cx0 - x00, dy0 = cy0 - y00, dx1 = cx1 - x00, dy1 = cy1 - y00;
-    return dx0 * dx0 + dy0 * dy0 > dx1 * dx1 + dy1 * dy1 && (cx0 = cx1, cy0 = cy1), 
-    {
-        cx: cx0,
-        cy: cy0,
-        x01: -ox,
-        y01: -oy,
-        x11: cx0 * (r1 / r - 1),
-        y11: cy0 * (r1 / r - 1)
-    };
-}
-
-export function drawArcPath(arc, context, cx, cy, outerRadius, innerRadius, partStroke) {
-    const {startAngle: startAngle, endAngle: endAngle} = arc.getParsedAngle(), deltaAngle = abs(endAngle - startAngle), clockwise = endAngle > startAngle;
-    let collapsedToLine = !1;
-    if (outerRadius < innerRadius) {
-        const temp = outerRadius;
-        outerRadius = innerRadius, innerRadius = temp;
-    }
-    if (outerRadius <= epsilon) context.moveTo(cx, cy); else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + outerRadius * cos(startAngle), cy + outerRadius * sin(startAngle)), 
-    context.arc(cx, cy, outerRadius, startAngle, endAngle, !clockwise), innerRadius > epsilon && (context.moveTo(cx + innerRadius * cos(endAngle), cy + innerRadius * sin(endAngle)), 
-    context.arc(cx, cy, innerRadius, endAngle, startAngle, clockwise)); else {
-        const cornerRadius = arc.getParsedCornerRadius(), {outerDeltaAngle: outerDeltaAngle, innerDeltaAngle: innerDeltaAngle, outerStartAngle: outerStartAngle, outerEndAngle: outerEndAngle, innerEndAngle: innerEndAngle, innerStartAngle: innerStartAngle} = arc.getParsePadAngle(startAngle, endAngle), outerCornerRadiusStart = cornerRadius, outerCornerRadiusEnd = cornerRadius, innerCornerRadiusEnd = cornerRadius, innerCornerRadiusStart = cornerRadius, maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart), maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
-        let limitedOcr = maxOuterCornerRadius, limitedIcr = maxInnerCornerRadius;
-        const xors = outerRadius * cos(outerStartAngle), yors = outerRadius * sin(outerStartAngle), xire = innerRadius * cos(innerEndAngle), yire = innerRadius * sin(innerEndAngle);
-        let xore, yore, xirs, yirs;
-        if ((maxInnerCornerRadius > epsilon || maxOuterCornerRadius > epsilon) && (xore = outerRadius * cos(outerEndAngle), 
-        yore = outerRadius * sin(outerEndAngle), xirs = innerRadius * cos(innerStartAngle), 
-        yirs = innerRadius * sin(innerStartAngle), deltaAngle < pi)) {
-            const oc = intersect(xors, yors, xirs, yirs, xore, yore, xire, yire);
-            if (oc) {
-                const ax = xors - oc[0], ay = yors - oc[1], bx = xore - oc[0], by = yore - oc[1], kc = 1 / sin(acos((ax * bx + ay * by) / (sqrt(ax * ax + ay * ay) * sqrt(bx * bx + by * by))) / 2), lc = sqrt(oc[0] * oc[0] + oc[1] * oc[1]);
-                limitedIcr = min(maxInnerCornerRadius, (innerRadius - lc) / (kc - 1)), limitedOcr = min(maxOuterCornerRadius, (outerRadius - lc) / (kc + 1));
-            }
-        }
-        if (outerDeltaAngle < .001) partStroke && (partStroke[3] || partStroke[1]) && context.moveTo(cx + xors, cy + yors), 
-        collapsedToLine = !0; else if (limitedOcr > epsilon) {
-            const cornerRadiusStart = min(outerCornerRadiusStart, limitedOcr), cornerRadiusEnd = min(outerCornerRadiusEnd, limitedOcr), t0 = cornerTangents(xirs, yirs, xors, yors, outerRadius, cornerRadiusStart, Number(clockwise)), t1 = cornerTangents(xore, yore, xire, yire, outerRadius, cornerRadiusEnd, Number(clockwise));
-            limitedOcr < maxOuterCornerRadius && cornerRadiusStart === cornerRadiusEnd ? !partStroke || partStroke[0] ? (context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
-            context.arc(cx + t0.cx, cy + t0.cy, limitedOcr, atan2(t0.y01, t0.x01), atan2(t1.y01, t1.x01), !clockwise)) : context.moveTo(cx + t0.cx + limitedOcr * cos(atan2(t1.y01, t1.x01)), cy + t0.cy + limitedOcr * sin(atan2(t1.y01, t1.x01))) : !partStroke || partStroke[0] ? (context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
-            cornerRadiusStart > 0 && context.arc(cx + t0.cx, cy + t0.cy, cornerRadiusStart, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !clockwise), 
-            context.arc(cx, cy, outerRadius, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), !clockwise), 
-            cornerRadiusEnd > 0 && context.arc(cx + t1.cx, cy + t1.cy, cornerRadiusEnd, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !clockwise)) : cornerRadiusEnd > 0 ? context.moveTo(cx + t1.cx + cornerRadiusEnd * cos(atan2(t1.y01, t1.x01)), cy + t1.cy + cornerRadiusEnd * sin(atan2(t1.y01, t1.x01))) : context.moveTo(cx + xore, cy + outerRadius * sin(outerEndAngle));
-        } else partStroke && !partStroke[0] || (context.moveTo(cx + xors, cy + yors), context.arc(cx, cy, outerRadius, outerStartAngle, outerEndAngle, !clockwise));
-        if (!(innerRadius > epsilon) || innerDeltaAngle < .001) !partStroke || partStroke[1] ? context.lineTo(cx + xire, cy + yire) : context.moveTo(cx + xire, cy + yire), 
-        collapsedToLine = !0; else if (limitedIcr > epsilon) {
-            const cornerRadiusStart = min(innerCornerRadiusStart, limitedIcr), cornerRadiusEnd = min(innerCornerRadiusEnd, limitedIcr), t0 = cornerTangents(xire, yire, xore, yore, innerRadius, -cornerRadiusEnd, Number(clockwise)), t1 = cornerTangents(xors, yors, xirs, yirs, innerRadius, -cornerRadiusStart, Number(clockwise));
-            if (!partStroke || partStroke[1] ? context.lineTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01) : context.moveTo(cx + t0.cx + t0.x01, cy + t0.cy + t0.y01), 
-            limitedIcr < maxInnerCornerRadius && cornerRadiusStart === cornerRadiusEnd) {
-                const arcEndAngle = atan2(t1.y01, t1.x01);
-                !partStroke || partStroke[2] ? context.arc(cx + t0.cx, cy + t0.cy, limitedIcr, atan2(t0.y01, t0.x01), arcEndAngle, !clockwise) : context.moveTo(cx + t0.cx + cos(arcEndAngle), cy + t0.cy + sin(arcEndAngle));
-            } else !partStroke || partStroke[2] ? (cornerRadiusEnd > 0 && context.arc(cx + t0.cx, cy + t0.cy, cornerRadiusEnd, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !clockwise), 
-            context.arc(cx, cy, innerRadius, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), clockwise), 
-            cornerRadiusStart > 0 && context.arc(cx + t1.cx, cy + t1.cy, cornerRadiusStart, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !clockwise)) : cornerRadiusStart > 0 ? context.moveTo(cx + t1.cx + cornerRadiusStart * cos(atan2(t1.y01, t1.x01)), cy + t1.cy + cornerRadiusStart * sin(atan2(t1.y01, t1.x01))) : context.moveTo(cx + xirs, cy + yirs);
-        } else !partStroke || partStroke[1] ? context.lineTo(cx + xire, cy + yire) : context.moveTo(cx + xire, cy + yire), 
-        !partStroke || partStroke[2] ? context.arc(cx, cy, innerRadius, innerEndAngle, innerStartAngle, clockwise) : context.moveTo(cx + innerRadius * cos(innerStartAngle), cy + innerRadius * sin(innerStartAngle));
-    }
-    return partStroke ? partStroke[3] && context.lineTo(cx + outerRadius * cos(endAngle), cy + outerRadius * cos(endAngle)) : context.closePath(), 
-    collapsedToLine;
-}
+import { ARC_NUMBER_TYPE } from "../../../graphic/constants";
 
 let DefaultCanvasArcRender = class {
     constructor(arcRenderContribitions) {
@@ -146,7 +80,7 @@ let DefaultCanvasArcRender = class {
         return collapsedToLine;
     }
     drawShape(arc, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc, {fill: fill = (null == arcAttribute.fill ? !!arc.attribute.fillColor : arcAttribute.fill), background: background, stroke: stroke = (null == arcAttribute.stroke ? !!arc.attribute.strokeColor : arcAttribute.stroke), opacity: opacity = arcAttribute.opacity, fillOpacity: fillOpacity = arcAttribute.fillOpacity, lineWidth: lineWidth = arcAttribute.lineWidth, strokeOpacity: strokeOpacity = arcAttribute.strokeOpacity, visible: visible = arcAttribute.visible} = arc.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
+        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc, {fill: fill = arcAttribute.fill, background: background, stroke: stroke = arcAttribute.stroke, opacity: opacity = arcAttribute.opacity, fillOpacity: fillOpacity = arcAttribute.fillOpacity, lineWidth: lineWidth = arcAttribute.lineWidth, strokeOpacity: strokeOpacity = arcAttribute.strokeOpacity, visible: visible = arcAttribute.visible} = arc.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
         if (!arc.valid || !visible) return;
         if (!(doFill || doStroke || background)) return;
         if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
@@ -168,10 +102,10 @@ let DefaultCanvasArcRender = class {
             const {startAngle: sa, endAngle: ea} = arc.getParsedAngle();
             if (abs(ea - sa) >= pi2 - epsilon) {
                 context.beginPath();
-                const capAngle = Math.abs(outerRadius - innerRadius) / 2 / outerRadius, {endAngle: endAngle = arcAttribute.endAngle, fillColor: fillColor = arcAttribute.fillColor} = arc.attribute, startAngle = endAngle;
+                const capAngle = Math.abs(outerRadius - innerRadius) / 2 / outerRadius, {endAngle: endAngle = arcAttribute.endAngle, fill: fill = arcAttribute.fill} = arc.attribute, startAngle = endAngle;
                 if (this.drawArcTailCapPath(arc, context, x, y, outerRadius, innerRadius, startAngle, startAngle + capAngle), 
                 doFill) {
-                    const color = fillColor;
+                    const color = fill;
                     if ("conical" === color.gradient) {
                         const lastColor = getConicGradientAt(0, 0, endAngle, color);
                         fillCb || fillVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute),