@visactor/vrender-core 0.16.20-alpha.4 → 0.16.21

package/es/core/graphic-utils.d.ts

@@ -5,17 +5,14 @@ import { TextMeasure } from '@visactor/vutils';
 import type { IGraphicUtil, ITransformUtil, TransformType } from '../interface/core';
 export declare class DefaultGraphicUtil implements IGraphicUtil {
     protected readonly contributions: IContributionProvider<ITextMeasure>;
-    get canvas(): ICanvas;
-    get context(): IContext2d | null;
-    _canvas?: ICanvas;
-    _context?: IContext2d | null;
+    readonly global: IGlobal;
+    canvas?: ICanvas;
+    context?: IContext2d | null;
     _textMeasure: ITextMeasure;
     configured: boolean;
-    global: IGlobal;
-    constructor(contributions: IContributionProvider<ITextMeasure>);
+    constructor(contributions: IContributionProvider<ITextMeasure>, global: IGlobal);
     get textMeasure(): ITextMeasure;
     configure(global: IGlobal, env: EnvType): void;
-    tryInitCanvas(): void;
     bindTextMeasure(tm: ITextMeasure): void;
     measureText(text: string, tc: TextOptionsType, method?: 'native' | 'simple' | 'quick'): {
         width: number;

package/es/core/graphic-utils.js

@@ -16,23 +16,17 @@ import { TextMeasureContribution } from "./contributions/textMeasure/textMeasure
 
 import { ContributionProvider } from "../common/contribution-provider";
 
+import { wrapCanvas } from "../canvas/util";
+
 import { DefaultTextStyle } from "../graphic/config";
 
 import { Matrix, TextMeasure } from "@visactor/vutils";
 
-import { canvasAllocate } from "../allocator/canvas-allocate";
-
-import { application } from "../application";
+import { VGlobal } from "../constants";
 
 let DefaultGraphicUtil = class {
-    get canvas() {
-        return this.tryInitCanvas(), this._canvas;
-    }
-    get context() {
-        return this.tryInitCanvas(), this._context;
-    }
-    constructor(contributions) {
-        this.contributions = contributions, this.configured = !1, this.global = application.global, 
+    constructor(contributions, global) {
+        this.contributions = contributions, this.global = global, this.configured = !1, 
         this.global.hooks.onSetEnv.tap("graphic-util", ((lastEnv, env, global) => {
             this.configured = !1, this.configure(global, env);
         }));
@@ -41,15 +35,16 @@ let DefaultGraphicUtil = class {
         return this._textMeasure || this.configure(this.global, this.global.env), this._textMeasure;
     }
     configure(global, env) {
-        this.configured || (this.contributions.getContributions().forEach((contribution => {
+        if (this.configured) return;
+        const canvas = wrapCanvas({
+            nativeCanvas: global.createCanvas({
+                width: 100,
+                height: 100
+            })
+        });
+        this.canvas = canvas, this.context = canvas.getContext("2d"), this.contributions.getContributions().forEach((contribution => {
             contribution.configure(this, env);
-        })), this.configured = !0);
-    }
-    tryInitCanvas() {
-        if (!this._canvas) {
-            const canvas = canvasAllocate.shareCanvas();
-            this._canvas = canvas, this._context = canvas.getContext("2d");
-        }
+        })), this.configured = !0;
     }
     bindTextMeasure(tm) {
         this._textMeasure = tm;
@@ -78,7 +73,7 @@ let DefaultGraphicUtil = class {
     }
 };
 
-DefaultGraphicUtil = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(TextMeasureContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultGraphicUtil);
+DefaultGraphicUtil = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(TextMeasureContribution)), __param(1, inject(VGlobal)), __metadata("design:paramtypes", [ Object, Object ]) ], DefaultGraphicUtil);
 
 export { DefaultGraphicUtil };
 

package/es/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 '../common/inversify-lite';\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 { 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 { canvasAllocate } from '../allocator/canvas-allocate';\nimport { application } from '../application';\n\n@injectable()\nexport class DefaultGraphicUtil implements IGraphicUtil {\n  get canvas(): ICanvas {\n    this.tryInitCanvas();\n    return this._canvas;\n  }\n  get context(): IContext2d | null {\n    this.tryInitCanvas();\n    return this._context;\n  }\n  _canvas?: ICanvas;\n  _context?: IContext2d | null;\n  _textMeasure: ITextMeasure;\n  configured: boolean;\n  global: IGlobal;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(TextMeasureContribution)\n    protected readonly contributions: IContributionProvider<ITextMeasure>\n  ) {\n    this.configured = false;\n    this.global = application.global;\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    this.contributions.getContributions().forEach(contribution => {\n      contribution.configure(this, env);\n    });\n    this.configured = true;\n  }\n\n  tryInitCanvas() {\n    if (!this._canvas) {\n      const canvas = canvasAllocate.shareCanvas();\n      this._canvas = canvas;\n      this._context = canvas.getContext('2d');\n    }\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 '../common/inversify-lite';\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"]}

package/es/core/layer-service.d.ts

@@ -1,15 +1,12 @@
 import type { ILayer, IStage, IGlobal, ILayerParams, LayerMode, ILayerHandlerContribution } from '../interface';
 import type { ILayerService } from '../interface/core';
 export declare class DefaultLayerService implements ILayerService {
+    readonly global: IGlobal;
     layerMap: Map<IStage, ILayer[]>;
     staticLayerCountInEnv: number;
     dynamicLayerCountInEnv: number;
     inited: boolean;
-    global: IGlobal;
-    static idprefix: string;
-    static prefix_count: number;
-    static GenerateLayerId(): string;
-    constructor();
+    constructor(global: IGlobal);
     tryInit(): void;
     getStageLayer(stage: IStage): ILayer[];
     getRecommendedLayerType(layerMode?: LayerMode): LayerMode;

package/es/core/layer-service.js

@@ -1,27 +1,28 @@
-var DefaultLayerService_1, __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
     var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
     if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }, __metadata = this && this.__metadata || function(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
+}, __param = this && this.__param || function(paramIndex, decorator) {
+    return function(target, key) {
+        decorator(target, key, paramIndex);
+    };
 };
 
-import { injectable } from "../common/inversify-lite";
+import { inject, injectable } from "../common/inversify-lite";
 
 import { Layer } from "./layer";
 
+import { VGlobal } from "../constants";
+
 import { container } from "../container";
 
 import { DynamicLayerHandlerContribution, StaticLayerHandlerContribution, VirtualLayerHandlerContribution } from "./constants";
 
-import { application } from "../application";
-
-let DefaultLayerService = DefaultLayerService_1 = class {
-    static GenerateLayerId() {
-        return `${DefaultLayerService_1.idprefix}_${DefaultLayerService_1.prefix_count++}`;
-    }
-    constructor() {
-        this.layerMap = new Map, this.global = application.global;
+let DefaultLayerService = class {
+    constructor(global) {
+        this.global = global, this.layerMap = new Map;
     }
     tryInit() {
         this.inited || (this.staticLayerCountInEnv = this.global.getStaticCanvasCount(), 
@@ -41,7 +42,6 @@ let DefaultLayerService = DefaultLayerService_1 = class {
     createLayer(stage, options = {
         main: !1
     }) {
-        var _a;
         this.tryInit();
         let layerMode = this.getRecommendedLayerType(options.layerMode);
         layerMode = options.canvasId ? "static" : layerMode;
@@ -49,7 +49,7 @@ let DefaultLayerService = DefaultLayerService_1 = class {
             main: !1
         }, options), {
             layerMode: layerMode,
-            canvasId: null !== (_a = options.canvasId) && void 0 !== _a ? _a : DefaultLayerService_1.GenerateLayerId(),
+            canvasId: options.canvasId,
             layerHandler: layerHandler
         })), stageLayers = this.layerMap.get(stage) || [];
         return stageLayers.push(layer), this.layerMap.set(stage, stageLayers), this.staticLayerCountInEnv--, 
@@ -76,8 +76,7 @@ let DefaultLayerService = DefaultLayerService_1 = class {
     }
 };
 
-DefaultLayerService.idprefix = "visactor_layer", DefaultLayerService.prefix_count = 0, 
-DefaultLayerService = DefaultLayerService_1 = __decorate([ injectable(), __metadata("design:paramtypes", []) ], DefaultLayerService);
+DefaultLayerService = __decorate([ injectable(), __param(0, inject(VGlobal)), __metadata("design:paramtypes", [ Object ]) ], DefaultLayerService);
 
 export { DefaultLayerService };
 //# sourceMappingURL=layer-service.js.map

package/es/core/layer-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/layer-service.ts"],"names":[],"mappings":"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","file":"layer-service.js","sourcesContent":["import { inject, injectable } from '../common/inversify-lite';\nimport type { ILayer, IStage, IGlobal, ILayerParams, LayerMode, ILayerHandlerContribution } from '../interface';\nimport { Layer } from './layer';\nimport type { ILayerService } from '../interface/core';\nimport { container } from '../container';\nimport {\n  DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution,\n  VirtualLayerHandlerContribution\n} from './constants';\nimport { application } from '../application';\n\n@injectable()\nexport class DefaultLayerService implements ILayerService {\n  declare layerMap: Map<IStage, ILayer[]>;\n  declare staticLayerCountInEnv: number;\n  declare dynamicLayerCountInEnv: number;\n  declare inited: boolean;\n  declare global: IGlobal;\n  static idprefix: string = 'visactor_layer';\n  static prefix_count: number = 0;\n\n  static GenerateLayerId() {\n    return `${DefaultLayerService.idprefix}_${DefaultLayerService.prefix_count++}`;\n  }\n\n  constructor() {\n    this.layerMap = new Map();\n    this.global = application.global;\n  }\n\n  tryInit() {\n    if (!this.inited) {\n      this.staticLayerCountInEnv = this.global.getStaticCanvasCount();\n      this.dynamicLayerCountInEnv = this.global.getDynamicCanvasCount();\n      this.inited = true;\n    }\n  }\n\n  getStageLayer(stage: IStage) {\n    return this.layerMap.get(stage);\n  }\n\n  getRecommendedLayerType(layerMode?: LayerMode): LayerMode {\n    if (layerMode) {\n      return layerMode;\n    }\n    // 默认推荐实体canvas，不行就推荐离屏canvas，最次才是virtual\n    if (this.staticLayerCountInEnv !== 0) {\n      return 'static';\n    } else if (this.dynamicLayerCountInEnv !== 0) {\n      return 'dynamic';\n    }\n    return 'virtual';\n  }\n\n  getLayerHandler(layerMode: LayerMode) {\n    let layerHandler: ILayerHandlerContribution;\n    if (layerMode === 'static') {\n      layerHandler = container.get<ILayerHandlerContribution>(StaticLayerHandlerContribution);\n    } else if (layerMode === 'dynamic') {\n      layerHandler = container.get<ILayerHandlerContribution>(DynamicLayerHandlerContribution);\n    } else {\n      layerHandler = container.get<ILayerHandlerContribution>(VirtualLayerHandlerContribution);\n    }\n    return layerHandler;\n  }\n\n  createLayer(stage: IStage, options: Partial<ILayerParams> = { main: false }): ILayer {\n    this.tryInit();\n    let layerMode = this.getRecommendedLayerType(options.layerMode);\n    layerMode = options.canvasId ? 'static' : layerMode;\n    const layerHandler = this.getLayerHandler(layerMode);\n    const layer = new Layer(stage, this.global, stage.window, {\n      main: false,\n      ...options,\n      layerMode,\n      canvasId: options.canvasId ?? DefaultLayerService.GenerateLayerId(),\n      layerHandler\n    });\n    const stageLayers = this.layerMap.get(stage) || [];\n    stageLayers.push(layer);\n    this.layerMap.set(stage, stageLayers);\n    this.staticLayerCountInEnv--;\n    return layer;\n  }\n\n  prepareStageLayer(stage: IStage) {\n    let mainHandler: ILayerHandlerContribution;\n    stage.forEachChildren((l: ILayer) => {\n      const handler = l.getNativeHandler();\n      if (handler.type === 'virtual') {\n        handler.mainHandler = mainHandler;\n        mainHandler.secondaryHandlers.push(handler);\n      } else {\n        mainHandler = handler;\n        mainHandler.secondaryHandlers = [];\n      }\n    });\n  }\n\n  releaseLayer(stage: IStage, layer: ILayer): void {\n    layer.release();\n    const stageLayers = this.layerMap.get(stage) || [];\n    this.layerMap.set(\n      stage,\n      stageLayers.filter(l => l !== layer)\n    );\n  }\n\n  layerCount(stage: IStage): number {\n    return (this.layerMap.get(stage) || []).length;\n  }\n  restLayerCount(stage: IStage): number {\n    // TODO: 设置精确的值\n    if (this.global.env === 'browser') {\n      return 10;\n    }\n    return 0;\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/layer-service.ts"],"names":[],"mappings":"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","file":"layer-service.js","sourcesContent":["import { inject, injectable } from '../common/inversify-lite';\nimport type { ILayer, IStage, IGlobal, ILayerParams, LayerMode, ILayerHandlerContribution } from '../interface';\nimport { Layer } from './layer';\nimport type { ILayerService } from '../interface/core';\nimport { VGlobal } from '../constants';\nimport { container } from '../container';\nimport {\n  DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution,\n  VirtualLayerHandlerContribution\n} from './constants';\n\n@injectable()\nexport class DefaultLayerService implements ILayerService {\n  declare layerMap: Map<IStage, ILayer[]>;\n  declare staticLayerCountInEnv: number;\n  declare dynamicLayerCountInEnv: number;\n  declare inited: boolean;\n  constructor(@inject(VGlobal) public readonly global: IGlobal) {\n    this.layerMap = new Map();\n  }\n\n  tryInit() {\n    if (!this.inited) {\n      this.staticLayerCountInEnv = this.global.getStaticCanvasCount();\n      this.dynamicLayerCountInEnv = this.global.getDynamicCanvasCount();\n      this.inited = true;\n    }\n  }\n\n  getStageLayer(stage: IStage) {\n    return this.layerMap.get(stage);\n  }\n\n  getRecommendedLayerType(layerMode?: LayerMode): LayerMode {\n    if (layerMode) {\n      return layerMode;\n    }\n    // 默认推荐实体canvas，不行就推荐离屏canvas，最次才是virtual\n    if (this.staticLayerCountInEnv !== 0) {\n      return 'static';\n    } else if (this.dynamicLayerCountInEnv !== 0) {\n      return 'dynamic';\n    }\n    return 'virtual';\n  }\n\n  getLayerHandler(layerMode: LayerMode) {\n    let layerHandler: ILayerHandlerContribution;\n    if (layerMode === 'static') {\n      layerHandler = container.get<ILayerHandlerContribution>(StaticLayerHandlerContribution);\n    } else if (layerMode === 'dynamic') {\n      layerHandler = container.get<ILayerHandlerContribution>(DynamicLayerHandlerContribution);\n    } else {\n      layerHandler = container.get<ILayerHandlerContribution>(VirtualLayerHandlerContribution);\n    }\n    return layerHandler;\n  }\n\n  createLayer(stage: IStage, options: Partial<ILayerParams> = { main: false }): ILayer {\n    this.tryInit();\n    let layerMode = this.getRecommendedLayerType(options.layerMode);\n    layerMode = options.canvasId ? 'static' : layerMode;\n    const layerHandler = this.getLayerHandler(layerMode);\n    const layer = new Layer(stage, this.global, stage.window, {\n      main: false,\n      ...options,\n      layerMode,\n      canvasId: options.canvasId,\n      layerHandler\n    });\n    const stageLayers = this.layerMap.get(stage) || [];\n    stageLayers.push(layer);\n    this.layerMap.set(stage, stageLayers);\n    this.staticLayerCountInEnv--;\n    return layer;\n  }\n\n  prepareStageLayer(stage: IStage) {\n    let mainHandler: ILayerHandlerContribution;\n    stage.forEachChildren((l: ILayer) => {\n      const handler = l.getNativeHandler();\n      if (handler.type === 'virtual') {\n        handler.mainHandler = mainHandler;\n        mainHandler.secondaryHandlers.push(handler);\n      } else {\n        mainHandler = handler;\n        mainHandler.secondaryHandlers = [];\n      }\n    });\n  }\n\n  releaseLayer(stage: IStage, layer: ILayer): void {\n    layer.release();\n    const stageLayers = this.layerMap.get(stage) || [];\n    this.layerMap.set(\n      stage,\n      stageLayers.filter(l => l !== layer)\n    );\n  }\n\n  layerCount(stage: IStage): number {\n    return (this.layerMap.get(stage) || []).length;\n  }\n  restLayerCount(stage: IStage): number {\n    // TODO: 设置精确的值\n    if (this.global.env === 'browser') {\n      return 10;\n    }\n    return 0;\n  }\n}\n"]}

package/es/core/stage.d.ts

@@ -51,11 +51,10 @@ export declare class Stage extends Group implements IStage {
     readonly window: IWindow;
     private readonly global;
     readonly renderService: IRenderService;
-    pickerService?: IPickerService;
+    readonly pickerService: IPickerService;
     readonly pluginService: IPluginService;
     readonly layerService: ILayerService;
-    private _eventSystem?;
-    private get eventSystem();
+    private readonly eventSystem?;
     protected _beforeRender?: (stage: IStage) => void;
     protected _afterRender?: (stage: IStage) => void;
     protected _skipRender?: number;
@@ -65,12 +64,10 @@ export declare class Stage extends Group implements IStage {
     protected supportInteractiveLayer: boolean;
     protected timeline: ITimeline;
     params: Partial<IStageParams>;
-    constructor(params?: Partial<IStageParams>);
-    protected tryInitEventSystem(): void;
+    constructor(params: Partial<IStageParams>);
     preventRender(prevent: boolean): void;
-    optmize(params: IOptimizeType): void;
+    optmize(params?: IOptimizeType): void;
     protected optmizeRender(skipRenderWithOutRange?: boolean): void;
-    protected _onVisibleChange: (visible: boolean) => void;
     getTimeline(): ITimeline;
     get3dOptions(options: IOption3D): {
         center: {

package/es/core/stage.js

@@ -34,14 +34,12 @@ import { DirectionalLight } from "./light";
 
 import { OrthoCamera } from "./camera";
 
+import { VGlobal } from "../constants";
+
 import { LayerService } from "./constants";
 
 import { DefaultTimeline } from "../animate";
 
-import { application } from "../application";
-
-import { isBrowserEnv } from "../env-check";
-
 const DefaultConfig = {
     WIDTH: 500,
     HEIGHT: 500,
@@ -109,15 +107,9 @@ export class Stage extends Group {
     get defaultLayer() {
         return this.at(0);
     }
-    get eventSystem() {
-        return this._eventSystem;
-    }
-    constructor(params = {}) {
+    constructor(params) {
         var _a;
-        super({}), this._onVisibleChange = visible => {
-            this._skipRender < 0 || (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);
-        }, this.beforeRender = stage => {
+        super({}), this.beforeRender = stage => {
             this._beforeRender && this._beforeRender(stage);
         }, this.afterRender = stage => {
             this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach((cb => cb(stage))), 
@@ -125,10 +117,10 @@ export class Stage extends Group {
         }, this.params = params, this.theme = new Theme, this.hooks = {
             beforeRender: new SyncHook([ "stage" ]),
             afterRender: new SyncHook([ "stage" ])
-        }, this.global = application.global, !this.global.env && isBrowserEnv() && this.global.setEnv("browser"), 
-        this.window = container.get(VWindow), this.renderService = container.get(RenderService), 
-        this.pluginService = container.get(PluginService), this.layerService = container.get(LayerService), 
-        this.pluginService.active(this, params), this.window.create({
+        }, this.global = container.get(VGlobal), this.window = container.get(VWindow), this.renderService = container.get(RenderService), 
+        this.pickerService = container.get(PickerService), this.pluginService = container.get(PluginService), 
+        this.layerService = container.get(LayerService), this.pluginService.active(this, params), 
+        this.window.create({
             width: params.width,
             height: params.height,
             container: params.container,
@@ -137,24 +129,15 @@ export class Stage extends Group {
             title: params.title || "",
             canvas: params.canvas
         }), this._viewBox = new AABBBounds, params.viewBox ? this._viewBox.setValue(params.viewBox.x1, params.viewBox.y1, params.viewBox.x2, params.viewBox.y2) : this._viewBox.setValue(0, 0, this.width, this.height), 
-        this.state = "normal", this.renderCount = 0, this.tryInitEventSystem(), this._subView = !(this._viewBox.width() === this.width && this._viewBox.height() === this.height), 
+        this.state = "normal", this.renderCount = 0, this._subView = !(this._viewBox.width() === this.width && this._viewBox.height() === this.height), 
         this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig.BACKGROUND, 
-        this.appendChild(this.layerService.createLayer(this, {
+        this.appendChild(this.layerService.createLayer(this, params.canvas && isString(params.canvas) ? {
+            main: !0,
+            canvasId: params.canvas
+        } : {
             main: !0
         })), this.nextFrameRenderLayerSet = new Set, this.willNextFrameRender = !1, this.stage = this, 
-        this.renderStyle = params.renderStyle, 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 || defaultTicker, 
-        this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new DefaultTimeline, 
-        this.ticker.addTimeline(this.timeline), this.timeline.pause(), params.optimize || (params.optimize = {}), 
-        this.optmize(params.optimize), params.background && isString(this._background) && this._background.includes("/") && this.setAttributes({
-            background: this._background
-        });
-    }
-    tryInitEventSystem() {
-        this.global.supportEvent && !this._eventSystem && (this._eventSystem = new EventSystem(Object.assign({
+        this.renderStyle = params.renderStyle, this.global.supportEvent && (this.eventSystem = new EventSystem(Object.assign({
             targetElement: this.window,
             resolution: this.window.dpr || this.global.devicePixelRatio,
             rootNode: this,
@@ -174,17 +157,29 @@ export class Stage extends Group {
                     return this.viewBox.height();
                 }
             }
-        }, this.params.event)));
+        }, params.event))), 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 || defaultTicker, 
+        this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new DefaultTimeline, 
+        this.ticker.addTimeline(this.timeline), this.timeline.pause(), this.optmize(params.optimize), 
+        params.background && isString(this._background) && this._background.includes("/") && this.setAttributes({
+            background: this._background
+        });
     }
     preventRender(prevent) {
-        prevent ? this._skipRender = -1 / 0 : !1 !== this.params.optimize.skipRenderWithOutRange ? this._skipRender = this.window.isVisible() ? 0 : 1 : this._skipRender = 0;
+        prevent ? this._skipRender = -1 / 0 : this.params && this.params.optimize && !1 !== this.params.optimize.skipRenderWithOutRange ? this._skipRender = this.window.isVisible() ? 0 : 1 : this._skipRender = 0;
     }
     optmize(params) {
-        this.optmizeRender(params.skipRenderWithOutRange), this.params.optimize = params;
+        this.optmizeRender(null == params ? void 0 : params.skipRenderWithOutRange);
     }
-    optmizeRender(skipRenderWithOutRange = !1) {
+    optmizeRender(skipRenderWithOutRange = !0) {
         skipRenderWithOutRange && (this._skipRender = this._skipRender < 0 ? this._skipRender : this.window.isVisible() ? 0 : 1, 
-        this.window.onVisibleChange(this._onVisibleChange));
+        this.window.onVisibleChange((visible => {
+            this._skipRender < 0 || (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;
@@ -268,8 +263,8 @@ export class Stage extends Group {
         if (this.dirtyBounds) return;
         this.dirtyBounds = new Bounds;
         let plugin = this.pluginService.findPluginsByName("DirtyBoundsPlugin")[0];
-        plugin ? plugin.activate(this.pluginService) : (plugin = new DirtyBoundsPlugin, 
-        this.pluginService.register(plugin));
+        plugin || (plugin = new DirtyBoundsPlugin, this.pluginService.register(plugin)), 
+        plugin.activate(this.pluginService);
     }
     disableDirtyBounds() {
         this.dirtyBounds && (this.dirtyBounds = null, this.pluginService.findPluginsByName("DirtyBoundsPlugin").forEach((plugin => {
@@ -359,13 +354,13 @@ export class Stage extends Group {
             layer.render({
                 renderService: this.renderService,
                 background: layer === this.defaultLayer ? this.background : void 0,
-                updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
+                updateBounds: !!this.dirtyBounds
             }, Object.assign({
                 renderStyle: this.renderStyle
             }, params)));
         })), this.interactiveLayer && !layerList.includes(this.interactiveLayer) && this.interactiveLayer.render({
             renderService: this.renderService,
-            updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
+            updateBounds: !!this.dirtyBounds
         }, Object.assign({
             renderStyle: this.renderStyle
         }, params));
@@ -407,7 +402,6 @@ export class Stage extends Group {
         throw new Error("暂不支持");
     }
     pick(x, y) {
-        this.pickerService || (this.pickerService = container.get(PickerService));
         const result = this.pickerService.pick(this.children, new Point(x, y), {
             bounds: this.AABBBounds
         });
@@ -439,7 +433,7 @@ export class Stage extends Group {
                 renderService: this.renderService,
                 background: layer === this.defaultLayer ? this.background : void 0,
                 clear: 0 === i,
-                updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
+                updateBounds: !!this.dirtyBounds
             }));
         }));
     }