@visactor/vrender-core 0.16.0-alpha.0 → 0.16.0-alpha.2

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

@@ -1,4 +1,4 @@
-import type { ILayer, IStage, IGlobal, ILayerParams } from '../interface';
+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;
@@ -9,7 +9,10 @@ export declare class DefaultLayerService implements ILayerService {
     constructor(global: IGlobal);
     tryInit(): void;
     getStageLayer(stage: IStage): ILayer[];
-    createLayer(stage: IStage, options?: ILayerParams): ILayer;
+    getRecommendedLayerType(layerMode?: LayerMode): LayerMode;
+    getLayerHandler(layerMode: LayerMode): ILayerHandlerContribution;
+    createLayer(stage: IStage, options?: Partial<ILayerParams>): ILayer;
+    prepareStageLayer(stage: IStage): void;
     releaseLayer(stage: IStage, layer: ILayer): void;
     layerCount(stage: IStage): number;
     restLayerCount(stage: IStage): number;

package/cjs/core/layer-service.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultLayerService = void 0;
 
-const inversify_lite_1 = require("../common/inversify-lite"), layer_1 = require("./layer"), constants_1 = require("../constants");
+const inversify_lite_1 = require("../common/inversify-lite"), layer_1 = require("./layer"), constants_1 = require("../constants"), container_1 = require("../container"), constants_2 = require("./constants");
 
 let DefaultLayerService = class {
     constructor(global) {
@@ -29,16 +29,35 @@ let DefaultLayerService = class {
     getStageLayer(stage) {
         return this.layerMap.get(stage);
     }
+    getRecommendedLayerType(layerMode) {
+        return layerMode || (0 !== this.staticLayerCountInEnv ? "static" : 0 !== this.dynamicLayerCountInEnv ? "dynamic" : "virtual");
+    }
+    getLayerHandler(layerMode) {
+        let layerHandler;
+        return layerHandler = "static" === layerMode ? container_1.container.get(constants_2.StaticLayerHandlerContribution) : "dynamic" === layerMode ? container_1.container.get(constants_2.DynamicLayerHandlerContribution) : container_1.container.get(constants_2.VirtualLayerHandlerContribution), 
+        layerHandler;
+    }
     createLayer(stage, options = {
         main: !1
     }) {
         this.tryInit();
-        const layer = new layer_1.Layer(stage, this.global, stage.window, Object.assign(Object.assign({}, options), {
-            virtual: 0 === this.staticLayerCountInEnv
+        const layerMode = this.getRecommendedLayerType(options.layerMode), layerHandler = this.getLayerHandler(layerMode), layer = new layer_1.Layer(stage, this.global, stage.window, Object.assign(Object.assign({
+            main: !1
+        }, options), {
+            layerMode: layerMode,
+            layerHandler: layerHandler
         })), stageLayers = this.layerMap.get(stage) || [];
         return stageLayers.push(layer), this.layerMap.set(stage, stageLayers), this.staticLayerCountInEnv--, 
         layer;
     }
+    prepareStageLayer(stage) {
+        let mainHandler;
+        stage.forEachChildren((l => {
+            const handler = l.getNativeHandler();
+            "virtual" === handler.type ? (handler.mainHandler = mainHandler, mainHandler.secondaryHandlers.push(handler)) : (mainHandler = handler, 
+            mainHandler.secondaryHandlers = []);
+        }));
+    }
     releaseLayer(stage, layer) {
         layer.release();
         const stageLayers = this.layerMap.get(stage) || [];

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/layer-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAA8D;AAE9D,mCAAgC;AAEhC,4CAAuC;AAGhC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAK9B,YAA6C,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;QAC1D,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;YAChE,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAClE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACpB;IACH,CAAC;IAED,aAAa,CAAC,KAAa;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,UAAwB,EAAE,IAAI,EAAE,KAAK,EAAE;QAChE,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,IAAI,aAAK,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,kCACnD,OAAO,KACV,OAAO,EAAE,IAAI,CAAC,qBAAqB,KAAK,CAAC,IACzC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACnD,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,YAAY,CAAC,KAAa,EAAE,KAAa;QACvC,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,GAAG,CACf,KAAK,EACL,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CACrC,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IACjD,CAAC;IACD,cAAc,CAAC,KAAa;QAE1B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE;YACjC,OAAO,EAAE,CAAC;SACX;QACD,OAAO,CAAC,CAAC;IACX,CAAC;CACF,CAAA;AApDY,mBAAmB;IAD/B,IAAA,2BAAU,GAAE;IAME,WAAA,IAAA,uBAAM,EAAC,mBAAO,CAAC,CAAA;;GALjB,mBAAmB,CAoD/B;AApDY,kDAAmB","file":"layer-service.js","sourcesContent":["import { inject, injectable } from '../common/inversify-lite';\nimport type { ILayer, IStage, IGlobal, ILayerParams } from '../interface';\nimport { Layer } from './layer';\nimport type { ILayerService } from '../interface/core';\nimport { VGlobal } 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  createLayer(stage: IStage, options: ILayerParams = { main: false }): ILayer {\n    this.tryInit();\n    const layer = new Layer(stage, this.global, stage.window, {\n      ...options,\n      virtual: this.staticLayerCountInEnv === 0\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  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    const layerMode = this.getRecommendedLayerType(options.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      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/cjs/core/layer.d.ts

@@ -1,13 +1,12 @@
 import type { AABBBounds, IBoundsLike } from '@visactor/vutils';
-import type { IDrawToParams, IGraphic, IGroup, ILayer, ILayerDrawParams, IStage, IGlobal, ILayerHandlerContribution, IDrawContext, ILayerHandlerDrawParams, IDrawContribution, IWindow, ILayerParams } from '../interface';
+import type { IDrawToParams, IGraphic, IGroup, ILayer, ILayerDrawParams, IStage, IGlobal, ILayerHandlerContribution, IDrawContext, ILayerHandlerDrawParams, IDrawContribution, IWindow, ILayerParams, LayerMode } from '../interface';
 import { Group } from '../graphic/group';
-export declare const LayerHandlerContribution: unique symbol;
 type BlendMode = 'normal';
 export declare class Layer extends Group implements ILayer {
     parent: any;
     _dpr: number;
     main: boolean;
-    readonly virtual: boolean;
+    renderCount: number;
     afterDrawCbs: ((l: this) => void)[];
     imageData?: ImageData;
     blendMode: BlendMode;
@@ -21,6 +20,7 @@ export declare class Layer extends Group implements ILayer {
         drawContribution?: IDrawContribution;
     }>;
     get offscreen(): boolean;
+    get layerMode(): LayerMode;
     get width(): number;
     get height(): number;
     get viewWidth(): number;
@@ -40,6 +40,7 @@ export declare class Layer extends Group implements ILayer {
         graphic?: IGraphic;
         group?: IGroup;
     } | false;
+    protected tryRenderSecondaryLayer(params: ILayerDrawParams, userParams?: Partial<IDrawContext>): void;
     render(params: ILayerDrawParams, userParams?: Partial<IDrawContext>): void;
     resize(w: number, h: number): void;
     resizeView(w: number, h: number): void;

package/cjs/core/layer.js

@@ -2,16 +2,17 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Layer = exports.LayerHandlerContribution = void 0;
+}), exports.Layer = void 0;
 
-const application_1 = require("../application"), container_1 = require("../container"), theme_1 = require("../graphic/theme"), group_1 = require("../graphic/group");
-
-exports.LayerHandlerContribution = Symbol.for("LayerHandlerContribution");
+const application_1 = require("../application"), theme_1 = require("../graphic/theme"), group_1 = require("../graphic/group");
 
 class Layer extends group_1.Group {
     get offscreen() {
         return this.layerHandler.offscreen;
     }
+    get layerMode() {
+        return this.layerHandler.type;
+    }
     get width() {
         return this.stage ? this.stage.width : 0;
     }
@@ -33,15 +34,14 @@ class Layer extends group_1.Group {
     constructor(stage, global, window, params) {
         var _a;
         super({}), this.stage = stage, this.global = global, this.window = window, this.main = params.main, 
-        this.layerHandler = container_1.container.get(exports.LayerHandlerContribution), 
-        this.layerHandler.init(this, window, {
+        this.layerHandler = params.layerHandler, this.layerHandler.init(this, window, {
             main: params.main,
             canvasId: params.canvasId,
             width: this.viewWidth,
             height: this.viewHeight,
             zIndex: null !== (_a = params.zIndex) && void 0 !== _a ? _a : 0
         }), this.layer = this, this.subLayers = new Map, this.theme = new theme_1.Theme, 
-        this.background = "rgba(0, 0, 0, 0)", this.virtual = !!params.virtual, this.afterDrawCbs = [];
+        this.background = "rgba(0, 0, 0, 0)", this.afterDrawCbs = [];
     }
     combineSubLayer(removeIncrementalKey = !0) {
         const subLayers = Array.from(this.subLayers.values()).sort(((a, b) => a.zIndex - b.zIndex));
@@ -61,6 +61,11 @@ class Layer extends group_1.Group {
     pick(x, y) {
         throw new Error("暂不支持");
     }
+    tryRenderSecondaryLayer(params, userParams) {
+        this.layerHandler.secondaryHandlers && this.layerHandler.secondaryHandlers.length && this.layerHandler.secondaryHandlers.forEach((h => {
+            h.layer.renderCount = this.renderCount, h.layer.render(params, userParams);
+        }));
+    }
     render(params, userParams) {
         var _a;
         const stage = this.stage;
@@ -74,7 +79,7 @@ class Layer extends group_1.Group {
             layer: this,
             background: null !== (_a = params.background) && void 0 !== _a ? _a : this.background,
             updateBounds: params.updateBounds
-        }, userParams), this.afterDrawCbs.forEach((c => c(this)));
+        }, userParams), this.afterDrawCbs.forEach((c => c(this))), this.tryRenderSecondaryLayer(params, userParams);
     }
     resize(w, h) {
         this.layerHandler.resize(w, h);

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":"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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  LayerMode\n} from '../interface';\nimport { Theme } from '../graphic/theme';\nimport { Group } from '../graphic/group';\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  declare renderCount: number;\n\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  get layerMode(): LayerMode {\n    return this.layerHandler.type;\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 = params.layerHandler;\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.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  // 绘制依赖的副layer\n  protected tryRenderSecondaryLayer(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    if (this.layerHandler.secondaryHandlers && this.layerHandler.secondaryHandlers.length) {\n      this.layerHandler.secondaryHandlers.forEach(h => {\n        h.layer.renderCount = this.renderCount;\n        h.layer.render(params, userParams);\n      });\n    }\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    this.tryRenderSecondaryLayer(params, userParams);\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"]}

package/cjs/core/stage.d.ts

@@ -1,10 +1,12 @@
 import type { IAABBBounds, 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 { IExportType, IStage, IStageParams, ILayer, IColor, IOption3D, ICamera, vec3, IDirectionLight, ITicker, IRenderService, IPickerService, IPluginService, ISyncHook, IDrawContext, IWindow, ILayerService, ITimeline, IOptimizeType, LayerMode, PickResult } from '../interface';
 import type { Layer } from './layer';
 import { Group } from '../graphic';
+type IStageState = 'rendering' | 'normal';
 export declare class Stage extends Group implements IStage {
     parent: IStage | null;
+    state: IStageState;
     protected _viewBox: AABBBounds;
     private _background;
     private _subView;
@@ -108,15 +110,16 @@ export declare class Stage extends Group implements IStage {
     disableHtmlAttribute(): void;
     protected tryUpdateAABBBounds(): AABBBounds;
     combineLayer(ILayer1: ILayer, ILayer2: ILayer): ILayer;
-    createLayer(canvasId?: string): ILayer;
+    createLayer(layerMode?: LayerMode): ILayer;
     sortLayer(cb: (ILayer1: ILayer, layer2: ILayer) => number): void;
     removeLayer(ILayerId: number): ILayer | false;
     tryInitInteractiveLayer(): void;
     clearViewBox(color?: string): void;
     render(layers?: ILayer[], params?: Partial<IDrawContext>): void;
     protected combineLayersToWindow(): void;
-    renderNextFrame(layers?: ILayer[]): void;
+    renderNextFrame(layers?: ILayer[], force?: boolean): void;
     _doRenderInThisFrame(): void;
+    protected renderLayerList(layerList: ILayer[], params?: Partial<IDrawContext>): void;
     resizeWindow(w: number, h: number, rerender?: boolean): void;
     resize(w: number, h: number, rerender?: boolean): void;
     resizeView(w: number, h: number, rerender?: boolean): void;
@@ -125,10 +128,7 @@ export declare class Stage extends Group implements IStage {
     setDpr(dpr: number, rerender?: boolean): void;
     setOrigin(x: number, y: number): void;
     export(type: IExportType): HTMLCanvasElement | ImageData;
-    pick(x: number, y: number): {
-        graphic: IGraphic | null;
-        group: IGroup | null;
-    } | false;
+    pick(x: number, y: number): PickResult | false;
     startAnimate(t: number): void;
     setToFrame(t: number): void;
     release(): void;
@@ -146,3 +146,4 @@ export declare class Stage extends Group implements IStage {
     setCursor(mode?: string): void;
     getCursor(): string;
 }
+export {};

package/cjs/core/stage.js

@@ -93,7 +93,7 @@ class Stage extends graphic_1.Group {
             title: params.title || "",
             canvas: params.canvas
         }), this._viewBox = new vutils_1.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.renderCount = 0, 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, {
             main: !0
@@ -249,10 +249,10 @@ class Stage extends graphic_1.Group {
     combineLayer(ILayer1, ILayer2) {
         throw new Error("暂不支持");
     }
-    createLayer(canvasId) {
+    createLayer(layerMode) {
         const layer = this.layerService.createLayer(this, {
             main: !1,
-            canvasId: canvasId
+            layerMode: layerMode
         });
         return this.appendChild(layer), layer;
     }
@@ -273,51 +273,45 @@ class Stage extends graphic_1.Group {
         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) => {
-            layer.render({
-                renderService: this.renderService,
-                background: layer === this.defaultLayer ? this.background : void 0,
-                updateBounds: !!this.dirtyBounds
-            }, Object.assign({
-                renderStyle: this.renderStyle
-            }, params));
-        })), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this)), 
+        this.ticker.start(), this.timeline.resume();
+        const state = this.state;
+        this.state = "rendering", this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, 
+        this.hooks.beforeRender.call(this), this.renderLayerList(this.children), this.combineLayersToWindow(), 
+        this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this)), this.state = state, 
         this._skipRender && this._skipRender++;
     }
-    combineLayersToWindow() {
-        this.forEach(((layer, i) => {
-            layer.combineTo(this.window, {
-                clear: 0 === i,
-                x: this.x,
-                y: this.y,
-                width: this.viewWidth,
-                height: this.viewHeight,
-                renderService: this.renderService,
-                background: layer === this.defaultLayer ? this.background : void 0,
-                updateBounds: !!this.dirtyBounds
-            });
-        }));
-    }
-    renderNextFrame(layers) {
-        this.nextFrameRenderLayerSet.size !== this.childrenCount && (layers || this).forEach((layer => {
+    combineLayersToWindow() {}
+    renderNextFrame(layers, force) {
+        ("rendering" !== this.state || force) && (this.nextFrameRenderLayerSet.size !== this.childrenCount && (layers || this).forEach((layer => {
             this.nextFrameRenderLayerSet.add(layer);
         })), this.willNextFrameRender || (this.willNextFrameRender = !0, this.global.getRequestAnimationFrame()((() => {
             this._doRenderInThisFrame(), this.willNextFrameRender = !1;
-        })));
+        }))));
     }
     _doRenderInThisFrame() {
-        this.timeline.resume(), this.ticker.start(), this.nextFrameRenderLayerSet.size && !this._skipRender && (this.hooks.beforeRender.call(this), 
-        this.forEach((layer => {
-            this.nextFrameRenderLayerSet.has(layer) && layer.render({
+        this.timeline.resume(), this.ticker.start();
+        const state = this.state;
+        this.state = "rendering", this.layerService.prepareStageLayer(this), this.nextFrameRenderLayerSet.size && !this._skipRender && (this.hooks.beforeRender.call(this), 
+        this.renderLayerList(Array.from(this.nextFrameRenderLayerSet.values()), this.lastRenderparams || {}), 
+        this.combineLayersToWindow(), this.hooks.afterRender.call(this), this.nextFrameRenderLayerSet.clear()), 
+        this.state = state, this._skipRender && this._skipRender++;
+    }
+    renderLayerList(layerList, params) {
+        const list = [];
+        for (let i = 0; i < layerList.length; i++) {
+            let l = layerList[i];
+            "virtual" === l.layerMode && (l = l.getNativeHandler().mainHandler.layer), list.includes(l) || list.push(l);
+        }
+        list.forEach((layer => {
+            layer.renderCount > this.renderCount || (layer.renderCount = this.renderCount + 1, 
+            layer.render({
                 renderService: this.renderService,
                 background: layer === this.defaultLayer ? this.background : void 0,
                 updateBounds: !!this.dirtyBounds
             }, Object.assign({
                 renderStyle: this.renderStyle
-            }, this.lastRenderparams || {}));
-        })), this.combineLayersToWindow(), this.hooks.afterRender.call(this), this.nextFrameRenderLayerSet.clear()), 
-        this._skipRender && this._skipRender++;
+            }, params)));
+        }));
     }
     resizeWindow(w, h, rerender = !0) {
         this.window.resize(w, h), rerender && this.render();