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

WebXRManager: synchronize sizing with renderer #26905

Merged
merged 3 commits into from
Nov 3, 2023
Merged

WebXRManager: synchronize sizing with renderer #26905

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cb9fd8
WebXRManager: synchronize sizing with renderer
CodyJasonBennett Oct 6, 2023
993e19b
Update WebXRManager.js
CodyJasonBennett Oct 7, 2023
968399a
Update WebXRManager.js
CodyJasonBennett Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/renderers/webxr/WebXRManager.js
View file
Open in desktop
@@ -1,6 +1,7 @@
import { ArrayCamera } from '../../cameras/ArrayCamera.js';
import { EventDispatcher } from '../../core/EventDispatcher.js';
import { PerspectiveCamera } from '../../cameras/PerspectiveCamera.js';
import { Vector2 } from '../../math/Vector2.js';
import { Vector3 } from '../../math/Vector3.js';
import { Vector4 } from '../../math/Vector4.js';
import { RAD2DEG } from '../../math/MathUtils.js';
Expand Down Expand Up @@ -40,6 +41,9 @@ class WebXRManager extends EventDispatcher {
const controllers = [];
const controllerInputSources = [];

const currentSize = new Vector2();
let currentPixelRatio = null;

//

const cameraL = new PerspectiveCamera();
Expand Down Expand Up @@ -172,6 +176,9 @@ class WebXRManager extends EventDispatcher {

//

renderer.setPixelRatio( currentPixelRatio );
renderer.setSize( currentSize.width, currentSize.height, false );
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved

animation.stop();

scope.isPresenting = false;
Expand Down Expand Up @@ -263,6 +270,9 @@ class WebXRManager extends EventDispatcher {

}

currentPixelRatio = renderer.getPixelRatio();
renderer.getSize( currentSize );

if ( ( session.renderState.layers === undefined ) || ( renderer.capabilities.isWebGL2 === false ) ) {

const layerInit = {
Expand All @@ -277,6 +287,9 @@ class WebXRManager extends EventDispatcher {

session.updateRenderState( { baseLayer: glBaseLayer } );

renderer.setPixelRatio( 1 );
renderer.setSize( glBaseLayer.framebufferWidth, glBaseLayer.framebufferHeight, false );

newRenderTarget = new WebGLRenderTarget(
glBaseLayer.framebufferWidth,
glBaseLayer.framebufferHeight,
Expand Down Expand Up @@ -314,6 +327,9 @@ class WebXRManager extends EventDispatcher {

session.updateRenderState( { layers: [ glProjLayer ] } );

renderer.setPixelRatio( 1 );
renderer.setSize( glProjLayer.textureWidth, glProjLayer.textureHeight, false );

newRenderTarget = new WebGLRenderTarget(
glProjLayer.textureWidth,
glProjLayer.textureHeight,
Expand Down