Browse Source

remove multiview attribute from renderer

Fernando Serrano 6 years ago
parent
commit
c0090c138f

+ 0 - 2
src/renderers/WebGLRenderer.js

@@ -316,8 +316,6 @@ function WebGLRenderer( parameters ) {
 
 
 	var multiview = new WebGLMultiview( _this, _gl );
 	var multiview = new WebGLMultiview( _this, _gl );
 
 
-	this.multiview = multiview;
-
 	// shadow map
 	// shadow map
 
 
 	var shadowMap = new WebGLShadowMap( _this, objects, capabilities.maxTextureSize );
 	var shadowMap = new WebGLShadowMap( _this, objects, capabilities.maxTextureSize );

+ 0 - 13
src/renderers/webgl/WebGLMultiview.js

@@ -26,18 +26,6 @@ function WebGLMultiview( renderer, gl ) {
 
 
 	}
 	}
 
 
-	function getNumViews() {
-
-		if ( renderTarget && renderer.getRenderTarget() === renderTarget ) {
-
-			return renderTarget.numViews;
-
-		}
-
-		return 0;
-
-	}
-
 	function getCameraArray( camera ) {
 	function getCameraArray( camera ) {
 
 
 		if ( camera.isArrayCamera ) return camera.cameras;
 		if ( camera.isArrayCamera ) return camera.cameras;
@@ -218,7 +206,6 @@ function WebGLMultiview( renderer, gl ) {
 
 
 	this.attachRenderTarget = attachRenderTarget;
 	this.attachRenderTarget = attachRenderTarget;
 	this.detachRenderTarget = detachRenderTarget;
 	this.detachRenderTarget = detachRenderTarget;
-	this.getNumViews = getNumViews;
 	this.updateCameraProjectionMatricesUniform = updateCameraProjectionMatricesUniform;
 	this.updateCameraProjectionMatricesUniform = updateCameraProjectionMatricesUniform;
 	this.updateCameraViewMatricesUniform = updateCameraViewMatricesUniform;
 	this.updateCameraViewMatricesUniform = updateCameraViewMatricesUniform;
 	this.updateObjectMatricesUniforms = updateObjectMatricesUniforms;
 	this.updateObjectMatricesUniforms = updateObjectMatricesUniforms;

+ 3 - 1
src/renderers/webgl/WebGLProgram.js

@@ -6,6 +6,7 @@ import { WebGLUniforms } from './WebGLUniforms.js';
 import { WebGLShader } from './WebGLShader.js';
 import { WebGLShader } from './WebGLShader.js';
 import { ShaderChunk } from '../shaders/ShaderChunk.js';
 import { ShaderChunk } from '../shaders/ShaderChunk.js';
 import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
 import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
+import { WebGLMultiviewRenderTarget } from '../WebGLMultiviewRenderTarget.js';
 
 
 var programIdCount = 0;
 var programIdCount = 0;
 
 
@@ -340,7 +341,8 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 
 	var prefixVertex, prefixFragment;
 	var prefixVertex, prefixFragment;
 
 
-	var numMultiviewViews = renderer.multiview.getNumViews();
+	var renderTarget = renderer.getRenderTarget();
+	var numMultiviewViews = renderTarget instanceof WebGLMultiviewRenderTarget ? renderTarget.numViews : 0;
 
 
 	if ( material.isRawShaderMaterial ) {
 	if ( material.isRawShaderMaterial ) {