Skip to content

Fix WebXR multiview regression #17385

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −36
Draft

Fix WebXR multiview regression #17385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 6 additions & 36 deletions packages/dev/core/src/Rendering/objectRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,22 +463,6 @@ export class ObjectRenderer {
this._sceneUBOs.push(this._scene.createSceneUniformBuffer(`Scene ubo #${index} for ${this.name}`, false));
}

private _getSceneUBO(): UniformBuffer {
if (this._currentFrameId !== this._engine.frameId) {
this._currentSceneUBOIndex = 0;
this._currentFrameId = this._engine.frameId;
}

if (this._currentSceneUBOIndex >= this._sceneUBOs.length) {
this._createSceneUBO();
}

const ubo = this._sceneUBOs[this._currentSceneUBOIndex++];
ubo.unbindEffect();

return ubo;
}

/**
* Resets the refresh counter of the renderer and start back from scratch.
* Could be useful to re-render if it is setup to render only once.
Expand Down Expand Up @@ -592,28 +576,18 @@ export class ObjectRenderer {
* @param viewportHeight Height of the viewport to render to
*/
public initRender(viewportWidth: number, viewportHeight: number): void {
const engine = this._scene.getEngine();
const camera: Nullable<Camera> = this.activeCamera ?? this._scene.activeCamera;
this.onInitRenderingObservable.notifyObservers(this);

this._currentSceneCamera = this._scene.activeCamera;

if (this._useUBO) {
this._currentSceneUBO = this._scene.getSceneUniformBuffer();
this._currentSceneUBO.unbindEffect();
this._scene.setSceneUniformBuffer(this._getSceneUBO());
}

this.onInitRenderingObservable.notifyObservers(this);

if (camera) {
if (!this.dontSetTransformationMatrix) {
if (camera !== this._scene.activeCamera) {
this._scene.setTransformMatrix(camera.getViewMatrix(), camera.getProjectionMatrix(true));
this._scene.activeCamera = camera;
}
this._scene.activeCamera = camera;
this._engine.setViewport(camera.rigParent ? camera.rigParent.viewport : camera.viewport, viewportWidth, viewportHeight);
}

if (this._useUBO) {
this._scene.finalizeSceneUbo();
engine.setViewport(camera.rigParent ? camera.rigParent.viewport : camera.viewport, viewportWidth, viewportHeight);
}

this._defaultRenderListPrepared = false;
Expand All @@ -625,10 +599,6 @@ export class ObjectRenderer {
public finishRender() {
const scene = this._scene;

if (this._useUBO) {
this._scene.setSceneUniformBuffer(this._currentSceneUBO);
}

if (this._disableImageProcessing) {
scene.imageProcessingConfiguration._applyByPostProcess = this._currentApplyByPostProcessSetting;
}
Expand All @@ -638,7 +608,7 @@ export class ObjectRenderer {
if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
scene.setTransformMatrix(this._currentSceneCamera.getViewMatrix(), this._currentSceneCamera.getProjectionMatrix(true));
}
this._engine.setViewport(this._currentSceneCamera.viewport);
scene.getEngine().setViewport(this._currentSceneCamera.viewport);
}

scene.resetCachedMaterial();
Expand Down
Loading