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

When rendering in a multi-canvas setup, always render the input view … #13320

Merged
merged 2 commits into from
Dec 7, 2022
Merged

When rendering in a multi-canvas setup, always render the input view … #13320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64cc3dd
When rendering in a multi-canvas setup, always render the input view …
carolhmj Dec 6, 2022
9ec1685
Review changes.
carolhmj Dec 7, 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
126 changes: 77 additions & 49 deletions 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 @@ -74,6 +74,11 @@ declare module "../../Engines/engine" {
* @returns the current engine
*/
unRegisterView(canvas: HTMLCanvasElement): Engine;

/**
* @internal
*/
_renderViewStep(view: EngineView): boolean;
}
}

Expand Down Expand Up @@ -156,6 +161,69 @@ Engine.prototype.unRegisterView = function (canvas: HTMLCanvasElement): Engine {
return this;
};

Engine.prototype._renderViewStep = function (view: EngineView): boolean {
const canvas = view.target;
const context = canvas.getContext("2d");
if (!context) {
return true;
}
const parent = this.getRenderingCanvas()!;

_onBeforeViewRenderObservable.notifyObservers(view);
const camera = view.camera;
let previewCamera: Nullable<Camera> = null;
let scene: Nullable<Scene> = null;
if (camera) {
scene = camera.getScene();

if (!scene || (scene.activeCameras && scene.activeCameras.length)) {
return true;
}

this.activeView = view;

previewCamera = scene.activeCamera;
scene.activeCamera = camera;
}

if (view.customResize) {
view.customResize(canvas);
} else {
// Set sizes
const width = Math.floor(canvas.clientWidth / this._hardwareScalingLevel);
const height = Math.floor(canvas.clientHeight / this._hardwareScalingLevel);

const dimsChanged = width !== canvas.width || parent.width !== canvas.width || height !== canvas.height || parent.height !== canvas.height;
if (canvas.clientWidth && canvas.clientHeight && dimsChanged) {
canvas.width = width;
canvas.height = height;
this.setSize(width, height);
}
}

if (!parent.width || !parent.height) {
return false;
}

// Render the frame
this._renderFrame();

this.flushFramebuffer();

// Copy to target
if (view.clearBeforeCopy) {
context.clearRect(0, 0, parent.width, parent.height);
}
context.drawImage(parent, 0, 0);

// Restore
if (previewCamera && scene) {
scene.activeCamera = previewCamera;
}
_onAfterViewRenderObservable.notifyObservers(view);
return true;
};

Engine.prototype._renderViews = function () {
if (!this.views || this.views.length === 0) {
return false;
Expand All @@ -167,67 +235,27 @@ Engine.prototype._renderViews = function () {
return false;
}

let inputElementView;
for (const view of this.views) {
if (!view.enabled) {
continue;
}
const canvas = view.target;
const context = canvas.getContext("2d");
if (!context) {
// Always render the view correspondent to the inputElement for last
if (canvas === this.inputElement) {
inputElementView = view;
continue;
}
_onBeforeViewRenderObservable.notifyObservers(view);
const camera = view.camera;
let previewCamera: Nullable<Camera> = null;
let scene: Nullable<Scene> = null;
if (camera) {
scene = camera.getScene();

if (scene.activeCameras && scene.activeCameras.length) {
continue;
}

this.activeView = view;

previewCamera = scene.activeCamera;
scene.activeCamera = camera;
}

if (view.customResize) {
view.customResize(canvas);
} else {
// Set sizes
const width = Math.floor(canvas.clientWidth / this._hardwareScalingLevel);
const height = Math.floor(canvas.clientHeight / this._hardwareScalingLevel);

const dimsChanged = width !== canvas.width || parent.width !== canvas.width || height !== canvas.height || parent.height !== canvas.height;
if (canvas.clientWidth && canvas.clientHeight && dimsChanged) {
canvas.width = width;
canvas.height = height;
this.setSize(width, height);
}
}

if (!parent.width || !parent.height) {
if (!this._renderViewStep(view)) {
return false;
}
}

// Render the frame
this._renderFrame();

this.flushFramebuffer();

// Copy to target
if (view.clearBeforeCopy) {
context.clearRect(0, 0, parent.width, parent.height);
}
context.drawImage(parent, 0, 0);

// Restore
if (previewCamera && scene) {
scene.activeCamera = previewCamera;
if (inputElementView) {
if (!this._renderViewStep(inputElementView)) {
return false;
}
_onAfterViewRenderObservable.notifyObservers(view);
}

this.activeView = null;
Expand Down