Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small changes to EngineView #12816

Merged
merged 2 commits into from
Aug 1, 2022
Merged

Small changes to EngineView #12816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f593df9
added before and after view observables, added id for view
RaananW Aug 1, 2022
757a60e
formatting
RaananW Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion packages/dev/core/src/Engines/Extensions/engine.views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import { Engine } from "../engine";
import type { Camera } from "../../Cameras/camera";
import type { Nullable } from "../../types";
import type { Scene } from "../../scene";
import { Observable } from "../../Misc/observable";

/**
* Class used to define an additional view for the engine
* @see https://doc.babylonjs.com/divingDeeper/scene/multiCanvas
*/
export class EngineView {
/**
* A randomly generated unique id
*/
readonly id: string;
/** Defines the canvas where to render the view */
target: HTMLCanvasElement;
/** Defines an optional camera used to render the view (will use active camera else) */
Expand Down Expand Up @@ -36,6 +41,15 @@ declare module "../../Engines/engine" {
*/
_onEngineViewChanged?: () => void;

/**
* Will be triggered before the view renders
*/
readonly onBeforeViewRenderObservable: Observable<EngineView>;
/**
* Will be triggered after the view rendered
*/
readonly onAfterViewRenderObservable: Observable<EngineView>;

/**
* Gets the current engine view
* @see https://doc.babylonjs.com/how_to/multi_canvases
Expand Down Expand Up @@ -63,6 +77,21 @@ declare module "../../Engines/engine" {
}
}

const _onBeforeViewRenderObservable = new Observable<EngineView>();
const _onAfterViewRenderObservable = new Observable<EngineView>();

Object.defineProperty(Engine.prototype, "onBeforeViewRenderObservable", {
get: function (this: Engine) {
return _onBeforeViewRenderObservable;
},
});

Object.defineProperty(Engine.prototype, "onAfterViewRenderObservable", {
get: function (this: Engine) {
return _onAfterViewRenderObservable;
},
});

Object.defineProperty(Engine.prototype, "inputElement", {
get: function (this: Engine) {
return this._inputElement;
Expand Down Expand Up @@ -96,7 +125,7 @@ Engine.prototype.registerView = function (canvas: HTMLCanvasElement, camera?: Ca
canvas.height = masterCanvas.height;
}

const newView = { target: canvas, camera, clearBeforeCopy, enabled: true };
const newView = { target: canvas, camera, clearBeforeCopy, enabled: true, id: (Math.random() * 100000).toFixed() };
this.views.push(newView);

if (camera) {
Expand Down Expand Up @@ -147,6 +176,7 @@ Engine.prototype._renderViews = function () {
if (!context) {
continue;
}
_onBeforeViewRenderObservable.notifyObservers(view);
const camera = view.camera;
let previewCamera: Nullable<Camera> = null;
let scene: Nullable<Scene> = null;
Expand Down Expand Up @@ -197,6 +227,7 @@ Engine.prototype._renderViews = function () {
if (previewCamera && scene) {
scene.activeCamera = previewCamera;
}
_onAfterViewRenderObservable.notifyObservers(view);
}

this.activeView = null;
Expand Down