@visactor/vrender 0.15.0-alpha.15 → 0.15.0-alpha.16

package/cjs/core/graphic-utils.js

@@ -101,22 +101,9 @@ let DefaultTransformUtil = class {
         return this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f), 
         this;
     }
-    rotateMatrix(angle, center) {
-        const sMatrix = this.outSourceMatrix;
-        if (_matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f), 
-        this.outTargetMatrix.reset(), center) {
-            const {x: x, y: y} = center;
-            this.outTargetMatrix.translate(x, y), this.outTargetMatrix.rotate(angle), this.outTargetMatrix.translate(-x, -y);
-        } else this.outTargetMatrix.rotate(angle);
-        return this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f), 
-        this;
-    }
     scale(sx, sy, center) {
         return this.mode === TransformMode.matrix ? this.scaleMatrix(sx, sy, center) : this;
     }
-    rotate(angle, center) {
-        return this.mode === TransformMode.matrix ? this.rotateMatrix(angle, center) : this;
-    }
     translateMatrix(dx, dy) {
         const sMatrix = this.outSourceMatrix;
         return _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f), 

package/cjs/core/graphic-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/graphic-utils.ts"],"names":[],"mappings":"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","file":"graphic-utils.js","sourcesContent":["import { injectable, inject, named } from 'inversify';\nimport type { ICanvas, IContext2d, EnvType, IGlobal, ITextAttribute, IContributionProvider } from '../interface';\nimport type { ITextMeasure, TextOptionsType } from '../interface/text';\nimport { TextMeasureContribution } from './contributions/textMeasure/textMeasure-contribution';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../common/contribution-provider';\nimport { wrapCanvas } from '../canvas/util';\nimport { DefaultTextStyle } from '../graphic/config';\nimport type { IMatrix, IPointLike, ITextMeasureOption } from '@visactor/vutils';\nimport { Matrix, TextMeasure } from '@visactor/vutils';\nimport type { IGraphicUtil, ITransformUtil, TransformType } from '../interface/core';\nimport { VGlobal } from '../constants';\n\n@injectable()\nexport class DefaultGraphicUtil implements IGraphicUtil {\n  canvas?: ICanvas;\n  context?: IContext2d | null;\n  _textMeasure: ITextMeasure;\n  configured: boolean;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(TextMeasureContribution)\n    protected readonly contributions: IContributionProvider<ITextMeasure>,\n    @inject(VGlobal) public readonly global: IGlobal\n  ) {\n    this.configured = false;\n    this.global.hooks.onSetEnv.tap('graphic-util', (lastEnv, env, global) => {\n      this.configured = false;\n      this.configure(global, env);\n    });\n  }\n\n  get textMeasure(): ITextMeasure {\n    if (!this._textMeasure) {\n      this.configure(this.global, this.global.env);\n    }\n    return this._textMeasure;\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    if (this.configured) {\n      return;\n    }\n    const canvas = wrapCanvas({\n      nativeCanvas: global.createCanvas({ width: 100, height: 100 })\n    });\n    this.canvas = canvas;\n    this.context = canvas.getContext('2d');\n    this.contributions.getContributions().forEach(contribution => {\n      contribution.configure(this, env);\n    });\n    this.configured = true;\n  }\n\n  bindTextMeasure(tm: ITextMeasure) {\n    this._textMeasure = tm;\n  }\n\n  measureText(\n    text: string,\n    tc: TextOptionsType,\n    method: 'native' | 'simple' | 'quick' = 'native'\n  ): { width: number; height: number } {\n    this.configure(this.global, this.global.env);\n    const m = this.global.measureTextMethod;\n    this.global.measureTextMethod = method;\n    const data = {\n      width: this._textMeasure.measureTextWidth(text, tc),\n      height: tc.fontSize ?? DefaultTextStyle.fontSize\n    };\n    this.global.measureTextMethod = m;\n    return data;\n  }\n\n  createTextMeasureInstance(\n    textSpec?: Partial<ITextAttribute>,\n    option?: Partial<ITextMeasureOption>,\n    getCanvasForMeasure?: () => any\n  ) {\n    this.configure(this.global, this.global.env);\n    return new TextMeasure<ITextAttribute>(\n      {\n        defaultFontParams: {\n          fontFamily: DefaultTextStyle.fontFamily,\n          fontSize: DefaultTextStyle.fontSize\n        },\n        getCanvasForMeasure: getCanvasForMeasure || (() => this.canvas),\n        getTextBounds: undefined,\n        specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n        ...(option ?? {})\n      },\n      textSpec\n    );\n  }\n}\n\nenum TransformMode {\n  transform = 0,\n  matrix = 1\n}\n\nconst _matrix = new Matrix();\n\n@injectable()\nexport class DefaultTransformUtil implements ITransformUtil {\n  private matrix: IMatrix;\n  private originTransform: TransformType;\n\n  private outSourceMatrix: IMatrix;\n  private outTargetMatrix: IMatrix;\n\n  private mode: TransformMode;\n  constructor() {\n    this.matrix = new Matrix();\n  }\n  init(origin: TransformType): this {\n    this.mode = TransformMode.transform;\n    this.originTransform = origin;\n    this.matrix.reset();\n    return this;\n  }\n  fromMatrix(source: IMatrix, target: IMatrix): this {\n    this.mode = TransformMode.matrix;\n    this.outSourceMatrix = source;\n    this.outTargetMatrix = target;\n    return this;\n  }\n\n  // translate: (x: number, y: number) => Transform;\n  // translateTo: (x: number, y: number) => Transform;\n  private scaleMatrix(sx: number, sy: number, center?: IPointLike): this {\n    // if (this.outSourceMatrix !== this.outTargetMatrix) {\n    //   // copy\n    //   const m = this.outSourceMatrix;\n    //   this.outTargetMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n    // }\n    const sMatrix = this.outSourceMatrix;\n    _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);\n    this.outTargetMatrix.reset();\n    if (center) {\n      const { x, y } = center;\n      this.outTargetMatrix.translate(x, y);\n      this.outTargetMatrix.scale(sx, sy);\n      this.outTargetMatrix.translate(-x, -y);\n    } else {\n      this.outTargetMatrix.scale(sx, sy);\n    }\n\n    // _matrix.reset();\n    // if (center) {\n    //   const { x, y } = center;\n    //   _matrix.translate(x, y);\n    //   _matrix.scale(sx, sy);\n    //   _matrix.translate(-x, -y);\n    // } else {\n    //   _matrix.scale(sx, sy);\n    // }\n    this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);\n    return this;\n  }\n\n  private rotateMatrix(angle: number, center?: IPointLike): this {\n    const sMatrix = this.outSourceMatrix;\n    _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);\n    this.outTargetMatrix.reset();\n    if (center) {\n      const { x, y } = center;\n      this.outTargetMatrix.translate(x, y);\n      this.outTargetMatrix.rotate(angle);\n      this.outTargetMatrix.translate(-x, -y);\n    } else {\n      this.outTargetMatrix.rotate(angle);\n    }\n\n    this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);\n    return this;\n  }\n  scale(sx: number, sy: number, center?: IPointLike): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.scaleMatrix(sx, sy, center);\n    }\n    return this;\n  }\n  rotate(angle: number, center?: IPointLike): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.rotateMatrix(angle, center);\n    }\n    return this;\n  }\n  private translateMatrix(dx: number, dy: number): this {\n    // if (this.outSourceMatrix !== this.outTargetMatrix) {\n    //   // copy\n    //   const m = this.outSourceMatrix;\n    //   this.outTargetMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n    // }\n    const sMatrix = this.outSourceMatrix;\n    _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);\n    this.outTargetMatrix.reset();\n    this.outTargetMatrix.translate(dx, dy);\n\n    this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);\n    return this;\n  }\n  translate(dx: number, dy: number): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.translateMatrix(dx, dy);\n    }\n    return this;\n  }\n  // scaleTo: (sx: number, sy: number, center: IPointLike) => Transform;\n  // rotate: (rx: number, ry: number, center: IPointLike) => Transform;\n  // rotateTo: (rx: number, ry: number, center: IPointLike) => Transform;\n  // 语法糖\n  // interactive: (dx: number, dy: number, dsx: number, dsy: number, drx: number, dry: number) => Transform;\n  // // 扩展padding像素，用于外描边，内描边\n  // extend: (origin: TransformType, padding: number) => Transform;\n  // 将所有的transform生成为一次的transform\n  simplify(target: TransformType): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.simplifyMatrix(target);\n    }\n    return this;\n  }\n  private simplifyMatrix(target: TransformType): this {\n    // let { a, b, c, d, e, f } = this.outTargetMatrix;\n    // if (a === 0 || d === 0) return this;\n    // const { dx=0, dy=0 } = target;\n    // // 不处理dx和dy\n    // e -= dx;\n    // f -= dy;\n    // const tanTheta = b / a;\n    // const angle = Math.atan(tanTheta);\n    // const cosTheta = cos(angle);\n    // const sinTheta = sin(angle);\n    // const sx = cosTheta !== 0 ? (a / cosTheta) : (b / sinTheta);\n    // const sy = sinTheta !== 0 ? (-c / sinTheta) : (d / cosTheta);\n    // const x = e;\n    // const y = f;\n    // target.x = x;\n    // target.y = y;\n    // target.dx = dx;\n    return this;\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/graphic-utils.ts"],"names":[],"mappings":"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","file":"graphic-utils.js","sourcesContent":["import { injectable, inject, named } from 'inversify';\nimport type { ICanvas, IContext2d, EnvType, IGlobal, ITextAttribute, IContributionProvider } from '../interface';\nimport type { ITextMeasure, TextOptionsType } from '../interface/text';\nimport { TextMeasureContribution } from './contributions/textMeasure/textMeasure-contribution';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { ContributionProvider } from '../common/contribution-provider';\nimport { wrapCanvas } from '../canvas/util';\nimport { DefaultTextStyle } from '../graphic/config';\nimport type { IMatrix, IPointLike, ITextMeasureOption } from '@visactor/vutils';\nimport { Matrix, TextMeasure } from '@visactor/vutils';\nimport type { IGraphicUtil, ITransformUtil, TransformType } from '../interface/core';\nimport { VGlobal } from '../constants';\n\n@injectable()\nexport class DefaultGraphicUtil implements IGraphicUtil {\n  canvas?: ICanvas;\n  context?: IContext2d | null;\n  _textMeasure: ITextMeasure;\n  configured: boolean;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(TextMeasureContribution)\n    protected readonly contributions: IContributionProvider<ITextMeasure>,\n    @inject(VGlobal) public readonly global: IGlobal\n  ) {\n    this.configured = false;\n    this.global.hooks.onSetEnv.tap('graphic-util', (lastEnv, env, global) => {\n      this.configured = false;\n      this.configure(global, env);\n    });\n  }\n\n  get textMeasure(): ITextMeasure {\n    if (!this._textMeasure) {\n      this.configure(this.global, this.global.env);\n    }\n    return this._textMeasure;\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    if (this.configured) {\n      return;\n    }\n    const canvas = wrapCanvas({\n      nativeCanvas: global.createCanvas({ width: 100, height: 100 })\n    });\n    this.canvas = canvas;\n    this.context = canvas.getContext('2d');\n    this.contributions.getContributions().forEach(contribution => {\n      contribution.configure(this, env);\n    });\n    this.configured = true;\n  }\n\n  bindTextMeasure(tm: ITextMeasure) {\n    this._textMeasure = tm;\n  }\n\n  measureText(\n    text: string,\n    tc: TextOptionsType,\n    method: 'native' | 'simple' | 'quick' = 'native'\n  ): { width: number; height: number } {\n    this.configure(this.global, this.global.env);\n    const m = this.global.measureTextMethod;\n    this.global.measureTextMethod = method;\n    const data = {\n      width: this._textMeasure.measureTextWidth(text, tc),\n      height: tc.fontSize ?? DefaultTextStyle.fontSize\n    };\n    this.global.measureTextMethod = m;\n    return data;\n  }\n\n  createTextMeasureInstance(\n    textSpec?: Partial<ITextAttribute>,\n    option?: Partial<ITextMeasureOption>,\n    getCanvasForMeasure?: () => any\n  ) {\n    this.configure(this.global, this.global.env);\n    return new TextMeasure<ITextAttribute>(\n      {\n        defaultFontParams: {\n          fontFamily: DefaultTextStyle.fontFamily,\n          fontSize: DefaultTextStyle.fontSize\n        },\n        getCanvasForMeasure: getCanvasForMeasure || (() => this.canvas),\n        getTextBounds: undefined,\n        specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n        ...(option ?? {})\n      },\n      textSpec\n    );\n  }\n}\n\nenum TransformMode {\n  transform = 0,\n  matrix = 1\n}\n\nconst _matrix = new Matrix();\n\n@injectable()\nexport class DefaultTransformUtil implements ITransformUtil {\n  private matrix: IMatrix;\n  private originTransform: TransformType;\n\n  private outSourceMatrix: IMatrix;\n  private outTargetMatrix: IMatrix;\n\n  private mode: TransformMode;\n  constructor() {\n    this.matrix = new Matrix();\n  }\n  init(origin: TransformType): this {\n    this.mode = TransformMode.transform;\n    this.originTransform = origin;\n    this.matrix.reset();\n    return this;\n  }\n  fromMatrix(source: IMatrix, target: IMatrix): this {\n    this.mode = TransformMode.matrix;\n    this.outSourceMatrix = source;\n    this.outTargetMatrix = target;\n    return this;\n  }\n\n  // translate: (x: number, y: number) => Transform;\n  // translateTo: (x: number, y: number) => Transform;\n  private scaleMatrix(sx: number, sy: number, center?: IPointLike): this {\n    // if (this.outSourceMatrix !== this.outTargetMatrix) {\n    //   // copy\n    //   const m = this.outSourceMatrix;\n    //   this.outTargetMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n    // }\n    const sMatrix = this.outSourceMatrix;\n    _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);\n    this.outTargetMatrix.reset();\n    if (center) {\n      const { x, y } = center;\n      this.outTargetMatrix.translate(x, y);\n      this.outTargetMatrix.scale(sx, sy);\n      this.outTargetMatrix.translate(-x, -y);\n    } else {\n      this.outTargetMatrix.scale(sx, sy);\n    }\n\n    // _matrix.reset();\n    // if (center) {\n    //   const { x, y } = center;\n    //   _matrix.translate(x, y);\n    //   _matrix.scale(sx, sy);\n    //   _matrix.translate(-x, -y);\n    // } else {\n    //   _matrix.scale(sx, sy);\n    // }\n    this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);\n    return this;\n  }\n  scale(sx: number, sy: number, center?: IPointLike): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.scaleMatrix(sx, sy, center);\n    }\n    return this;\n  }\n  private translateMatrix(dx: number, dy: number): this {\n    // if (this.outSourceMatrix !== this.outTargetMatrix) {\n    //   // copy\n    //   const m = this.outSourceMatrix;\n    //   this.outTargetMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n    // }\n    const sMatrix = this.outSourceMatrix;\n    _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);\n    this.outTargetMatrix.reset();\n    this.outTargetMatrix.translate(dx, dy);\n\n    this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);\n    return this;\n  }\n  translate(dx: number, dy: number): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.translateMatrix(dx, dy);\n    }\n    return this;\n  }\n  // scaleTo: (sx: number, sy: number, center: IPointLike) => Transform;\n  // rotate: (rx: number, ry: number, center: IPointLike) => Transform;\n  // rotateTo: (rx: number, ry: number, center: IPointLike) => Transform;\n  // 语法糖\n  // interactive: (dx: number, dy: number, dsx: number, dsy: number, drx: number, dry: number) => Transform;\n  // // 扩展padding像素，用于外描边，内描边\n  // extend: (origin: TransformType, padding: number) => Transform;\n  // 将所有的transform生成为一次的transform\n  simplify(target: TransformType): this {\n    if (this.mode === TransformMode.matrix) {\n      return this.simplifyMatrix(target);\n    }\n    return this;\n  }\n  private simplifyMatrix(target: TransformType): this {\n    // let { a, b, c, d, e, f } = this.outTargetMatrix;\n    // if (a === 0 || d === 0) return this;\n    // const { dx=0, dy=0 } = target;\n    // // 不处理dx和dy\n    // e -= dx;\n    // f -= dy;\n    // const tanTheta = b / a;\n    // const angle = Math.atan(tanTheta);\n    // const cosTheta = cos(angle);\n    // const sinTheta = sin(angle);\n    // const sx = cosTheta !== 0 ? (a / cosTheta) : (b / sinTheta);\n    // const sy = sinTheta !== 0 ? (-c / sinTheta) : (d / cosTheta);\n    // const x = e;\n    // const y = f;\n    // target.x = x;\n    // target.y = y;\n    // target.dx = dx;\n    return this;\n  }\n}\n"]}

package/cjs/core/layer.js

@@ -96,12 +96,12 @@ class Layer extends group_1.Group {
     }
     prepare(dirtyBounds, params) {}
     combineTo(target, params) {
-        var _a, _b, _c;
+        var _a;
         this.offscreen && (this.layerHandler.drawTo(target, [ this ], Object.assign({
             background: null !== (_a = params.background) && void 0 !== _a ? _a : this.background,
             renderService: params.renderService,
-            x: null !== (_b = params.x) && void 0 !== _b ? _b : this.stage.x,
-            y: null !== (_c = params.y) && void 0 !== _c ? _c : this.stage.y,
+            x: this.stage.x,
+            y: this.stage.y,
             width: this.viewWidth,
             height: this.viewHeight,
             stage: this.stage,
@@ -114,12 +114,12 @@ class Layer extends group_1.Group {
         }));
     }
     drawTo(target, params) {
-        var _a, _b, _c;
+        var _a;
         this.layerHandler.drawTo(target, [ this ], Object.assign({
             background: null !== (_a = params.background) && void 0 !== _a ? _a : this.background,
             renderService: params.renderService,
-            x: null !== (_b = params.x) && void 0 !== _b ? _b : this.stage.x,
-            y: null !== (_c = params.y) && void 0 !== _c ? _c : this.stage.y,
+            x: this.stage.x,
+            y: this.stage.y,
             width: this.viewWidth,
             height: this.viewHeight,
             stage: this.stage,

package/cjs/core/layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/layer.ts"],"names":[],"mappings":"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","file":"layer.js","sourcesContent":["import type { AABBBounds, IBoundsLike } from '@visactor/vutils';\nimport { application } from '../application';\nimport { container } from '../container';\nimport type {\n  IDrawToParams,\n  IGraphic,\n  IGroup,\n  ILayer,\n  ILayerDrawParams,\n  IStage,\n  IGlobal,\n  ILayerHandlerContribution,\n  IDrawContext,\n  ILayerHandlerDrawParams,\n  IDrawContribution,\n  IWindow,\n  ILayerParams\n} from '../interface';\nimport { Theme } from '../graphic/theme';\nimport { Group } from '../graphic/group';\n\nexport const LayerHandlerContribution = Symbol.for('LayerHandlerContribution');\n\ntype BlendMode = 'normal';\n\n// layer需要有多个，对于Canvas来说，layer可以绑定一个canvas或一个ImageData\n// 对于WebGL来说，layer对应一个FrameBuffer\n// 对于Native来说，layer保留一个FrameBufferHandler\nexport class Layer extends Group implements ILayer {\n  declare parent: any;\n\n  declare _dpr: number;\n  declare main: boolean;\n\n  declare readonly virtual: boolean;\n  declare afterDrawCbs: ((l: this) => void)[];\n\n  declare imageData?: ImageData;\n  // 混合模式，用于多图层混合\n  declare blendMode: BlendMode;\n\n  declare background: string;\n  declare opacity: number;\n\n  declare layer: this;\n  declare subLayers: Map<\n    number,\n    { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }\n  >;\n\n  get offscreen(): boolean {\n    return this.layerHandler.offscreen;\n  }\n\n  // stage控制\n  // width: number;\n  // height: number;\n  get width(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.width;\n  }\n  get height(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.height;\n  }\n  get viewWidth(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewWidth;\n  }\n  get viewHeight(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewHeight;\n  }\n  declare pickable: boolean;\n\n  get dirtyBound(): AABBBounds {\n    // this.getRootNode<any>();\n    throw new Error('暂不支持');\n  }\n\n  get dpr(): number {\n    return this._dpr;\n  }\n\n  declare stage?: IStage;\n  protected declare global: IGlobal;\n  protected declare window: IWindow;\n  protected declare layerHandler: ILayerHandlerContribution;\n\n  constructor(stage: IStage, global: IGlobal, window: IWindow, params: ILayerParams) {\n    super({});\n    this.stage = stage;\n    this.global = global;\n    this.window = window;\n    this.main = params.main;\n    this.layerHandler = container.get<ILayerHandlerContribution>(LayerHandlerContribution);\n    this.layerHandler.init(this, window, {\n      main: params.main,\n      canvasId: params.canvasId,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      zIndex: params.zIndex ?? 0\n    });\n    this.layer = this;\n    this.subLayers = new Map();\n    this.theme = new Theme();\n    this.background = 'rgba(0, 0, 0, 0)';\n    this.virtual = !!params.virtual;\n    this.afterDrawCbs = [];\n  }\n\n  combineSubLayer(removeIncrementalKey: boolean = true) {\n    const subLayers = Array.from(this.subLayers.values()).sort((a, b) => {\n      return a.zIndex - b.zIndex;\n    });\n    this.layerHandler.merge(\n      subLayers.map(l => {\n        if (l.layer.subLayers.size) {\n          l.layer.combineSubLayer(removeIncrementalKey);\n        }\n        return l.layer.getNativeHandler();\n      })\n    );\n    if (removeIncrementalKey) {\n      subLayers.forEach(l => {\n        l.group && (l.group.incremental = 0);\n      });\n    }\n    subLayers.forEach(l => {\n      // l.layer.release();\n      application.layerService.releaseLayer(this.stage, l.layer);\n    });\n    this.subLayers.clear();\n  }\n\n  getNativeHandler(): ILayerHandlerContribution {\n    return this.layerHandler;\n  }\n\n  setStage(stage?: IStage, layer?: ILayer) {\n    super.setStage(stage, this);\n  }\n\n  // 选中图层中的节点\n  pick(x: number, y: number): { graphic?: IGraphic; group?: IGroup } | false {\n    throw new Error('暂不支持');\n  }\n  // 绘制图层\n  render(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    const stage = this.stage;\n    this.layerHandler.render(\n      [this],\n      {\n        renderService: params.renderService,\n        x: stage.x,\n        y: stage.y,\n        width: this.viewWidth,\n        height: this.viewHeight,\n        stage: this.stage,\n        layer: this,\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        updateBounds: params.updateBounds\n      },\n      userParams\n    );\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n  resize(w: number, h: number) {\n    this.layerHandler.resize(w, h);\n  }\n  resizeView(w: number, h: number) {\n    this.layerHandler.resizeView(w, h);\n  }\n  setDpr(dpr: number) {\n    this.layerHandler.setDpr(dpr);\n  }\n  afterDraw(cb: (l: this) => void) {\n    this.afterDrawCbs.push(cb);\n  }\n\n  // 动画相关\n  startAnimate(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  setToFrame(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  // 合并到某个target上\n  combineTo(target: IWindow, params: IDrawToParams) {\n    if (this.offscreen) {\n      this.layerHandler.drawTo(target, [this], {\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        renderService: params.renderService,\n        x: params.x ?? this.stage.x,\n        y: params.y ?? this.stage.y,\n        width: this.viewWidth,\n        height: this.viewHeight,\n        stage: this.stage,\n        layer: this,\n        ...params\n      });\n      this.afterDrawCbs.forEach(c => c(this));\n    }\n  }\n\n  release(): void {\n    super.release();\n    this.layerHandler.release();\n    if (this.subLayers) {\n      this.subLayers.forEach(l => {\n        // l.layer.release();\n        application.layerService.releaseLayer(this.stage, l.layer);\n      });\n    }\n  }\n\n  drawTo(target: IWindow, params: IDrawToParams) {\n    this.layerHandler.drawTo(target, [this], {\n      // TODO: 多图层时不应该再用默认background\n      background: params.background ?? this.background,\n      renderService: params.renderService,\n      x: params.x ?? this.stage.x,\n      y: params.y ?? this.stage.y,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      stage: this.stage,\n      layer: this,\n      ...params\n    });\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/layer.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,4CAAyC;AAgBzC,4CAAyC;AACzC,4CAAyC;AAE5B,QAAA,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAO/E,MAAa,KAAM,SAAQ,aAAK;IAsB9B,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;IACrC,CAAC;IAKD,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,CAAC,CAAC;SACV;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IACD,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,CAAC,CAAC;SACV;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IACD,IAAI,SAAS;QACX,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,CAAC,CAAC;SACV;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IACD,IAAI,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,CAAC,CAAC;SACV;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;IAC/B,CAAC;IAGD,IAAI,UAAU;QAEZ,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAOD,YAAY,KAAa,EAAE,MAAe,EAAE,MAAe,EAAE,MAAoB;;QAC/E,KAAK,CAAC,EAAE,CAAC,CAAC;QACV,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,qBAAS,CAAC,GAAG,CAA4B,gCAAwB,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE;YACnC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,CAAC;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,EAAE,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,eAAe,CAAC,uBAAgC,IAAI;QAClD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAClE,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,KAAK,CACrB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;gBAC1B,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;aAC/C;YACD,OAAO,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACpC,CAAC,CAAC,CACH,CAAC;QACF,IAAI,oBAAoB,EAAE;YACxB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACpB,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;SACJ;QACD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAEpB,yBAAW,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,QAAQ,CAAC,KAAc,EAAE,KAAc;QACrC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;IAGD,IAAI,CAAC,CAAS,EAAE,CAAS;QACvB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,MAAwB,EAAE,UAAkC;;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,MAAM,CACtB,CAAC,IAAI,CAAC,EACN;YACE,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,CAAC,EAAE,KAAK,CAAC,CAAC;YACV,CAAC,EAAE,KAAK,CAAC,CAAC;YACV,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI;YAEX,UAAU,EAAE,MAAA,MAAM,CAAC,UAAU,mCAAI,IAAI,CAAC,UAAU;YAChD,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,EACD,UAAU,CACX,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,CAAC,CAAS,EAAE,CAAS;QACzB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,UAAU,CAAC,CAAS,EAAE,CAAS;QAC7B,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IACD,SAAS,CAAC,EAAqB;QAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAGD,YAAY,CAAC,CAAS;QACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,UAAU,CAAC,CAAS;QAClB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,WAAwB,EAAE,MAA+B;QAC/D,OAAO;IACT,CAAC;IAGD,SAAS,CAAC,MAAe,EAAE,MAAqB;;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,kBAErC,UAAU,EAAE,MAAA,MAAM,CAAC,UAAU,mCAAI,IAAI,CAAC,UAAU,EAChD,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EACf,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EACf,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE,IAAI,CAAC,UAAU,EACvB,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,KAAK,EAAE,IAAI,IACR,MAAM,EACT,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACzC;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAEzB,yBAAW,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,MAAM,CAAC,MAAe,EAAE,MAAqB;;QAC3C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,kBAErC,UAAU,EAAE,MAAA,MAAM,CAAC,UAAU,mCAAI,IAAI,CAAC,UAAU,EAChD,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EACf,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EACf,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE,IAAI,CAAC,UAAU,EACvB,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,KAAK,EAAE,IAAI,IACR,MAAM,EACT,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;CACF;AA3ND,sBA2NC","file":"layer.js","sourcesContent":["import type { AABBBounds, IBoundsLike } from '@visactor/vutils';\nimport { application } from '../application';\nimport { container } from '../container';\nimport type {\n  IDrawToParams,\n  IGraphic,\n  IGroup,\n  ILayer,\n  ILayerDrawParams,\n  IStage,\n  IGlobal,\n  ILayerHandlerContribution,\n  IDrawContext,\n  ILayerHandlerDrawParams,\n  IDrawContribution,\n  IWindow,\n  ILayerParams\n} from '../interface';\nimport { Theme } from '../graphic/theme';\nimport { Group } from '../graphic/group';\n\nexport const LayerHandlerContribution = Symbol.for('LayerHandlerContribution');\n\ntype BlendMode = 'normal';\n\n// layer需要有多个，对于Canvas来说，layer可以绑定一个canvas或一个ImageData\n// 对于WebGL来说，layer对应一个FrameBuffer\n// 对于Native来说，layer保留一个FrameBufferHandler\nexport class Layer extends Group implements ILayer {\n  declare parent: any;\n\n  declare _dpr: number;\n  declare main: boolean;\n\n  declare readonly virtual: boolean;\n  declare afterDrawCbs: ((l: this) => void)[];\n\n  declare imageData?: ImageData;\n  // 混合模式，用于多图层混合\n  declare blendMode: BlendMode;\n\n  declare background: string;\n  declare opacity: number;\n\n  declare layer: this;\n  declare subLayers: Map<\n    number,\n    { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }\n  >;\n\n  get offscreen(): boolean {\n    return this.layerHandler.offscreen;\n  }\n\n  // stage控制\n  // width: number;\n  // height: number;\n  get width(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.width;\n  }\n  get height(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.height;\n  }\n  get viewWidth(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewWidth;\n  }\n  get viewHeight(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewHeight;\n  }\n  declare pickable: boolean;\n\n  get dirtyBound(): AABBBounds {\n    // this.getRootNode<any>();\n    throw new Error('暂不支持');\n  }\n\n  get dpr(): number {\n    return this._dpr;\n  }\n\n  declare stage?: IStage;\n  protected declare global: IGlobal;\n  protected declare window: IWindow;\n  protected declare layerHandler: ILayerHandlerContribution;\n\n  constructor(stage: IStage, global: IGlobal, window: IWindow, params: ILayerParams) {\n    super({});\n    this.stage = stage;\n    this.global = global;\n    this.window = window;\n    this.main = params.main;\n    this.layerHandler = container.get<ILayerHandlerContribution>(LayerHandlerContribution);\n    this.layerHandler.init(this, window, {\n      main: params.main,\n      canvasId: params.canvasId,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      zIndex: params.zIndex ?? 0\n    });\n    this.layer = this;\n    this.subLayers = new Map();\n    this.theme = new Theme();\n    this.background = 'rgba(0, 0, 0, 0)';\n    this.virtual = !!params.virtual;\n    this.afterDrawCbs = [];\n  }\n\n  combineSubLayer(removeIncrementalKey: boolean = true) {\n    const subLayers = Array.from(this.subLayers.values()).sort((a, b) => {\n      return a.zIndex - b.zIndex;\n    });\n    this.layerHandler.merge(\n      subLayers.map(l => {\n        if (l.layer.subLayers.size) {\n          l.layer.combineSubLayer(removeIncrementalKey);\n        }\n        return l.layer.getNativeHandler();\n      })\n    );\n    if (removeIncrementalKey) {\n      subLayers.forEach(l => {\n        l.group && (l.group.incremental = 0);\n      });\n    }\n    subLayers.forEach(l => {\n      // l.layer.release();\n      application.layerService.releaseLayer(this.stage, l.layer);\n    });\n    this.subLayers.clear();\n  }\n\n  getNativeHandler(): ILayerHandlerContribution {\n    return this.layerHandler;\n  }\n\n  setStage(stage?: IStage, layer?: ILayer) {\n    super.setStage(stage, this);\n  }\n\n  // 选中图层中的节点\n  pick(x: number, y: number): { graphic?: IGraphic; group?: IGroup } | false {\n    throw new Error('暂不支持');\n  }\n  // 绘制图层\n  render(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    const stage = this.stage;\n    this.layerHandler.render(\n      [this],\n      {\n        renderService: params.renderService,\n        x: stage.x,\n        y: stage.y,\n        width: this.viewWidth,\n        height: this.viewHeight,\n        stage: this.stage,\n        layer: this,\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        updateBounds: params.updateBounds\n      },\n      userParams\n    );\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n  resize(w: number, h: number) {\n    this.layerHandler.resize(w, h);\n  }\n  resizeView(w: number, h: number) {\n    this.layerHandler.resizeView(w, h);\n  }\n  setDpr(dpr: number) {\n    this.layerHandler.setDpr(dpr);\n  }\n  afterDraw(cb: (l: this) => void) {\n    this.afterDrawCbs.push(cb);\n  }\n\n  // 动画相关\n  startAnimate(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  setToFrame(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  // 合并到某个target上\n  combineTo(target: IWindow, params: IDrawToParams) {\n    if (this.offscreen) {\n      this.layerHandler.drawTo(target, [this], {\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        renderService: params.renderService,\n        x: this.stage.x,\n        y: this.stage.y,\n        width: this.viewWidth,\n        height: this.viewHeight,\n        stage: this.stage,\n        layer: this,\n        ...params\n      });\n      this.afterDrawCbs.forEach(c => c(this));\n    }\n  }\n\n  release(): void {\n    super.release();\n    this.layerHandler.release();\n    if (this.subLayers) {\n      this.subLayers.forEach(l => {\n        // l.layer.release();\n        application.layerService.releaseLayer(this.stage, l.layer);\n      });\n    }\n  }\n\n  drawTo(target: IWindow, params: IDrawToParams) {\n    this.layerHandler.drawTo(target, [this], {\n      // TODO: 多图层时不应该再用默认background\n      background: params.background ?? this.background,\n      renderService: params.renderService,\n      x: this.stage.x,\n      y: this.stage.y,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      stage: this.stage,\n      layer: this,\n      ...params\n    });\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n}\n"]}

package/cjs/core/stage.d.ts

@@ -1,6 +1,6 @@
-import type { IAABBBounds, IBounds, IBoundsLike, IMatrix } from '@visactor/vutils';
+import type { IBounds, IBoundsLike, IMatrix } from '@visactor/vutils';
 import { AABBBounds } from '@visactor/vutils';
-import type { IGraphic, IGroup, IExportType, IStage, IStageParams, ILayer, IColor, IOption3D, ICamera, vec3, IDirectionLight, ITicker, IRenderService, IPickerService, IPluginService, ISyncHook, IDrawContext, IWindow, ILayerService, ITimeline, IOptimizeType } from '../interface';
+import type { IGraphic, IGroup, IExportType, IStage, IStageParams, ILayer, IColor, IOption3D, ICamera, vec3, IDirectionLight, ITicker, IRenderService, IPickerService, IPluginService, ISyncHook, IDrawContext, IWindow, ILayerService } from '../interface';
 import type { Layer } from './layer';
 import { Group } from '../graphic';
 export declare class Stage extends Group implements IStage {
@@ -43,7 +43,6 @@ export declare class Stage extends Group implements IStage {
     ticker: ITicker;
     autoRender: boolean;
     _enableLayout: boolean;
-    htmlAttribute: boolean | string | any;
     increaseAutoRender: boolean;
     view3dTranform: boolean;
     readonly window: IWindow;
@@ -55,17 +54,11 @@ export declare class Stage extends Group implements IStage {
     private readonly eventSystem?;
     protected _beforeRender?: (stage: IStage) => void;
     protected _afterRender?: (stage: IStage) => void;
-    protected _skipRender?: number;
     protected _afterNextRenderCbs?: ((stage: IStage) => void)[];
     protected lastRenderparams?: Partial<IDrawContext>;
     protected interactiveLayer?: ILayer;
     protected supportInteractiveLayer: boolean;
-    protected timeline: ITimeline;
-    params: Partial<IStageParams>;
     constructor(params: Partial<IStageParams>);
-    optmize(params?: IOptimizeType): void;
-    protected optmizeRender(skipRenderWithOutRange?: boolean): void;
-    getTimeline(): ITimeline;
     get3dOptions(options: IOption3D): {
         center: {
             x?: number;
@@ -104,8 +97,6 @@ export declare class Stage extends Group implements IStage {
     disableDirtyBounds(): void;
     enableLayout(): void;
     disableLayout(): void;
-    enableHtmlAttribute(container?: any): void;
-    disableHtmlAttribute(): void;
     protected tryUpdateAABBBounds(): AABBBounds;
     combineLayer(ILayer1: ILayer, ILayer2: ILayer): ILayer;
     createLayer(canvasId?: string): ILayer;
@@ -141,8 +132,8 @@ export declare class Stage extends Group implements IStage {
         width: number;
         height: number;
     }): void;
-    renderToNewWindow(fullImage?: boolean, viewBox?: IAABBBounds): IWindow;
-    toCanvas(fullImage?: boolean, viewBox?: IAABBBounds): HTMLCanvasElement | null;
+    renderToNewWindow(fullImage?: boolean): IWindow;
+    toCanvas(fullImage?: boolean): HTMLCanvasElement | null;
     setCursor(mode?: string): void;
     getCursor(): string;
 }

package/cjs/core/stage.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Stage = void 0;
 
-const vutils_1 = require("@visactor/vutils"), window_1 = require("./window"), event_1 = require("../event"), container_1 = require("../container"), render_1 = require("../render"), graphic_1 = require("../graphic"), picker_service_1 = require("../picker/picker-service"), constants_1 = require("../plugins/constants"), auto_render_plugin_1 = require("../plugins/builtin-plugin/auto-render-plugin"), _3dview_transform_plugin_1 = require("../plugins/builtin-plugin/3dview-transform-plugin"), incremental_auto_render_plugin_1 = require("../plugins/builtin-plugin/incremental-auto-render-plugin"), html_attribute_plugin_1 = require("../plugins/builtin-plugin/html-attribute-plugin"), dirty_bounds_plugin_1 = require("../plugins/builtin-plugin/dirty-bounds-plugin"), flex_layout_plugin_1 = require("../plugins/builtin-plugin/flex-layout-plugin"), default_ticker_1 = require("../animate/default-ticker"), tapable_1 = require("../tapable"), light_1 = require("./light"), camera_1 = require("./camera"), constants_2 = require("../constants"), constants_3 = require("./constants"), animate_1 = require("../animate"), DefaultConfig = {
+const vutils_1 = require("@visactor/vutils"), window_1 = require("./window"), event_1 = require("../event"), container_1 = require("../container"), render_1 = require("../render"), graphic_1 = require("../graphic"), picker_service_1 = require("../picker/picker-service"), constants_1 = require("../plugins/constants"), auto_render_plugin_1 = require("../plugins/builtin-plugin/auto-render-plugin"), _3dview_transform_plugin_1 = require("../plugins/builtin-plugin/3dview-transform-plugin"), incremental_auto_render_plugin_1 = require("../plugins/builtin-plugin/incremental-auto-render-plugin"), dirty_bounds_plugin_1 = require("../plugins/builtin-plugin/dirty-bounds-plugin"), flex_layout_plugin_1 = require("../plugins/builtin-plugin/flex-layout-plugin"), default_ticker_1 = require("../animate/default-ticker"), tapable_1 = require("../tapable"), light_1 = require("./light"), camera_1 = require("./camera"), constants_2 = require("../constants"), constants_3 = require("./constants"), DefaultConfig = {
     WIDTH: 500,
     HEIGHT: 500,
     X: 0,
@@ -78,7 +78,7 @@ class Stage extends graphic_1.Group {
         }, this.afterRender = stage => {
             this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach((cb => cb(stage))), 
             this._afterNextRenderCbs = null;
-        }, this.params = params, this.theme = new graphic_1.Theme, this.hooks = {
+        }, this.theme = new graphic_1.Theme, this.hooks = {
             beforeRender: new tapable_1.SyncHook([ "stage" ]),
             afterRender: new tapable_1.SyncHook([ "stage" ])
         }, this.global = container_1.container.get(constants_2.VGlobal), this.window = container_1.container.get(window_1.VWindow), 
@@ -119,24 +119,10 @@ class Stage extends graphic_1.Group {
                 }
             }
         })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), 
-        params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), 
         params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), 
         this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, 
         this._afterRender = params.afterRender, this.ticker = params.ticker || default_ticker_1.defaultTicker, 
-        this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new animate_1.DefaultTimeline, 
-        this.ticker.addTimeline(this.timeline), this.timeline.pause(), this.optmize(params.optimize);
-    }
-    optmize(params) {
-        this.optmizeRender(null == params ? void 0 : params.skipRenderWithOutRange);
-    }
-    optmizeRender(skipRenderWithOutRange = !0) {
-        skipRenderWithOutRange && (this._skipRender = this.window.isVisible() ? 0 : 1, this.window.onVisibleChange((visible => {
-            visible ? (this.dirtyBounds && this.dirtyBounds.setValue(0, 0, this._viewBox.width(), this._viewBox.height()), 
-            this._skipRender > 1 && this.renderNextFrame(), this._skipRender = 0) : this._skipRender = 1;
-        })));
-    }
-    getTimeline() {
-        return this.timeline;
+        this.supportInteractiveLayer = !1 !== params.interactiveLayer;
     }
     get3dOptions(options) {
         const {center: center = {
@@ -233,14 +219,6 @@ class Stage extends graphic_1.Group {
             plugin.deactivate(this.pluginService);
         })));
     }
-    enableHtmlAttribute(container) {
-        this.htmlAttribute || (this.htmlAttribute = container, this.pluginService.register(new html_attribute_plugin_1.HtmlAttributePlugin));
-    }
-    disableHtmlAttribute() {
-        this.htmlAttribute && (this.htmlAttribute = !1, this.pluginService.findPluginsByName("HtmlAttributePlugin").forEach((plugin => {
-            plugin.deactivate(this.pluginService);
-        })));
-    }
     tryUpdateAABBBounds() {
         const viewBox = this._viewBox;
         return this._AABBBounds.setValue(viewBox.x1, viewBox.y1, viewBox.x2, viewBox.y2), 
@@ -267,14 +245,14 @@ class Stage extends graphic_1.Group {
     }
     tryInitInteractiveLayer() {
         this.supportInteractiveLayer && !this.interactiveLayer && (this.interactiveLayer = this.createLayer(), 
-        this.interactiveLayer.name = "_builtin_interactive", this.nextFrameRenderLayerSet.add(this.interactiveLayer));
+        this.interactiveLayer.name = "_builtin_interactive");
     }
     clearViewBox(color) {
         this.window.clearViewBox(this._viewBox, color);
     }
     render(layers, params) {
-        this.ticker.start(), this.timeline.resume(), this._skipRender || (this.lastRenderparams = params, 
-        this.hooks.beforeRender.call(this), (layers || this).forEach(((layer, i) => {
+        this.ticker.start(), this.lastRenderparams = params, this.hooks.beforeRender.call(this), 
+        (layers || this).forEach(((layer, i) => {
             layer.render({
                 renderService: this.renderService,
                 background: layer === this.defaultLayer ? this.background : void 0,
@@ -282,8 +260,7 @@ class Stage extends graphic_1.Group {
             }, Object.assign({
                 renderStyle: this.renderStyle
             }, params));
-        })), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this)), 
-        this._skipRender && this._skipRender++;
+        })), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this);
     }
     combineLayersToWindow() {
         this.forEach(((layer, i) => {
@@ -307,7 +284,7 @@ class Stage extends graphic_1.Group {
         })));
     }
     _doRenderInThisFrame() {
-        this.timeline.resume(), this.ticker.start(), this.nextFrameRenderLayerSet.size && !this._skipRender && (this.hooks.beforeRender.call(this), 
+        this.nextFrameRenderLayerSet.size && (this.ticker.start(), this.hooks.beforeRender.call(this), 
         this.forEach((layer => {
             this.nextFrameRenderLayerSet.has(layer) && layer.render({
                 renderService: this.renderService,
@@ -316,8 +293,7 @@ class Stage extends graphic_1.Group {
             }, Object.assign({
                 renderStyle: this.renderStyle
             }, this.lastRenderparams || {}));
-        })), this.combineLayersToWindow(), this.hooks.afterRender.call(this), this.nextFrameRenderLayerSet.clear()), 
-        this._skipRender && this._skipRender++;
+        })), this.combineLayersToWindow(), this.hooks.afterRender.call(this), this.nextFrameRenderLayerSet.clear());
     }
     resizeWindow(w, h, rerender = !0) {
         this.window.resize(w, h), rerender && this.render();
@@ -391,36 +367,31 @@ class Stage extends graphic_1.Group {
             }));
         }));
     }
-    renderToNewWindow(fullImage = !0, viewBox) {
+    renderToNewWindow(fullImage = !0) {
         const window = container_1.container.get(window_1.VWindow);
-        if (fullImage) window.create({
+        return fullImage ? window.create({
             width: this.viewWidth,
             height: this.viewHeight,
             dpr: this.window.dpr,
             canvasControled: !0,
             offscreen: !0,
             title: ""
-        }); else {
-            const width = viewBox ? viewBox.width() : Math.min(this.viewWidth, this.window.width - this.x), height = viewBox ? viewBox.height() : Math.min(this.viewHeight, this.window.height - this.y);
-            window.create({
-                width: width,
-                height: height,
-                dpr: this.window.dpr,
-                canvasControled: !0,
-                offscreen: !0,
-                title: ""
-            });
-        }
-        const x = viewBox ? -viewBox.x1 : 0, y = viewBox ? -viewBox.y1 : 0;
-        return this.renderTo(window, {
-            x: x,
-            y: y,
-            width: viewBox ? viewBox.x2 : window.width,
-            height: viewBox ? viewBox.y2 : window.height
+        }) : window.create({
+            width: Math.min(this.viewWidth, this.window.width - this.x),
+            height: Math.min(this.viewHeight, this.window.height - this.y),
+            dpr: this.window.dpr,
+            canvasControled: !0,
+            offscreen: !0,
+            title: ""
+        }), this.renderTo(window, {
+            x: 0,
+            y: 0,
+            width: window.width,
+            height: window.height
         }), window;
     }
-    toCanvas(fullImage = !0, viewBox) {
-        const c = this.renderToNewWindow(fullImage, viewBox).getNativeHandler();
+    toCanvas(fullImage = !0) {
+        const c = this.renderToNewWindow(fullImage).getNativeHandler();
         return c.nativeCanvas ? c.nativeCanvas : null;
     }
     setCursor(mode) {