From 96f46dfeb2d31669237dd1512ea540a0abad8680 Mon Sep 17 00:00:00 2001 From: Fernando Serrano Date: Tue, 23 Apr 2019 10:35:45 +0200 Subject: [PATCH] Remove multiviewEnabled on renderer --- src/renderers/WebGLRenderer.js | 7 +++---- src/renderers/webgl/WebGLProgram.js | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 26e8462b66..976f7335cc 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -316,7 +316,6 @@ function WebGLRenderer( parameters ) { this.vr = vr; var multiview = this.multiview = new WebGLMultiview(_multiviewRequested, _gl, _canvas, extensions, capabilities ); - var multiviewEnabled = this.multiviewEnabled = multiview.isEnabled(); // shadow map @@ -1368,7 +1367,7 @@ function WebGLRenderer( parameters ) { function renderObjects( renderList, scene, camera, overrideMaterial ) { - if ( multiviewEnabled ) { + if ( multiview.isEnabled() ) { multiview.bindMultiviewFrameBuffer( camera ); @@ -1744,7 +1743,7 @@ function WebGLRenderer( parameters ) { if ( refreshProgram || _currentCamera !== camera ) { - if ( multiviewEnabled ) { + if ( multiview.isEnabled() ) { if ( false && vr.isPresenting() ) { @@ -1809,7 +1808,7 @@ function WebGLRenderer( parameters ) { material.isShaderMaterial || material.skinning ) { - if ( multiviewEnabled ) { + if ( multiview.isEnabled() ) { if ( vr.isPresenting() ) { diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index 3ca86a0c24..58d3efc736 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -430,7 +430,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters, 'uniform mat4 modelMatrix;', 'uniform vec3 cameraPosition;', - renderer.multiviewEnabled ? [ + renderer.multiview.isEnabled() ? [ 'uniform mat4 modelViewMatrix;', 'uniform mat3 normalMatrix;', 'uniform mat4 viewMatrices[2];', @@ -566,7 +566,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters, 'uniform vec3 cameraPosition;', - renderer.multiviewEnabled ? [ + renderer.multiview.isEnabled() ? [ 'uniform mat4 viewMatrices[2];', '#define viewMatrix viewMatrices[VIEW_ID]' @@ -627,7 +627,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters, prefixVertex = [ '#version 300 es\n', - renderer.multiviewEnabled ? [ + renderer.multiview.isEnabled() ? [ '#extension GL_OVR_multiview2 : require', 'layout(num_views = 2) in;', @@ -642,7 +642,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters, prefixFragment = [ '#version 300 es\n', - renderer.multiviewEnabled ? [ + renderer.multiview.isEnabled() ? [ '#extension GL_OVR_multiview2 : require', '#define VIEW_ID gl_ViewID_OVR' -- GitLab