From 4bfdf068ce11b5587f6cffe8c55ecd229e966cad Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 5 Nov 2015 12:35:02 -0500 Subject: [PATCH] WebGLRenderer: Removed unused lights reference. --- src/renderers/WebGLRenderer.js | 24 ++++++++++++------------ src/renderers/webgl/WebGLShadowMap.js | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index a245869a17..c4e88f58cb 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -700,11 +700,11 @@ THREE.WebGLRenderer = function ( parameters ) { }; - this.renderBufferDirect = function ( camera, lights, fog, geometry, material, object, group ) { + this.renderBufferDirect = function ( camera, fog, geometry, material, object, group ) { setMaterial( material ); - var program = setProgram( camera, lights, fog, material, object ); + var program = setProgram( camera, fog, material, object ); var updateBuffers = false; var geometryProgram = geometry.id + '_' + program.id + '_' + material.wireframe; @@ -1156,19 +1156,19 @@ THREE.WebGLRenderer = function ( parameters ) { var overrideMaterial = scene.overrideMaterial; - renderObjects( opaqueObjects, camera, lights, fog, overrideMaterial ); - renderObjects( transparentObjects, camera, lights, fog, overrideMaterial ); + renderObjects( opaqueObjects, camera, fog, overrideMaterial ); + renderObjects( transparentObjects, camera, fog, overrideMaterial ); } else { // opaque pass (front-to-back order) state.setBlending( THREE.NoBlending ); - renderObjects( opaqueObjects, camera, lights, fog ); + renderObjects( opaqueObjects, camera, fog ); // transparent pass (back-to-front order) - renderObjects( transparentObjects, camera, lights, fog ); + renderObjects( transparentObjects, camera, fog ); } @@ -1350,7 +1350,7 @@ THREE.WebGLRenderer = function ( parameters ) { } - function renderObjects( renderList, camera, lights, fog, overrideMaterial ) { + function renderObjects( renderList, camera, fog, overrideMaterial ) { for ( var i = 0, l = renderList.length; i < l; i ++ ) { @@ -1368,7 +1368,7 @@ THREE.WebGLRenderer = function ( parameters ) { setMaterial( material ); - var program = setProgram( camera, lights, fog, material, object ); + var program = setProgram( camera, fog, material, object ); _currentGeometryProgram = ''; @@ -1380,7 +1380,7 @@ THREE.WebGLRenderer = function ( parameters ) { } else { - _this.renderBufferDirect( camera, lights, fog, geometry, material, object, group ); + _this.renderBufferDirect( camera, fog, geometry, material, object, group ); } @@ -1571,7 +1571,7 @@ THREE.WebGLRenderer = function ( parameters ) { } - function setProgram( camera, lights, fog, material, object ) { + function setProgram( camera, fog, material, object ) { _usedTextureUnits = 0; @@ -1811,7 +1811,7 @@ THREE.WebGLRenderer = function ( parameters ) { if ( object.receiveShadow && ! material._shadowPass ) { - refreshUniformsShadow( m_uniforms, lights, camera ); + refreshUniformsShadow( m_uniforms, camera ); } @@ -2121,7 +2121,7 @@ THREE.WebGLRenderer = function ( parameters ) { } - function refreshUniformsShadow ( uniforms, lights, camera ) { + function refreshUniformsShadow ( uniforms, camera ) { if ( uniforms.shadowMatrix ) { diff --git a/src/renderers/webgl/WebGLShadowMap.js b/src/renderers/webgl/WebGLShadowMap.js index 8492857ffb..2ad82724c4 100644 --- a/src/renderers/webgl/WebGLShadowMap.js +++ b/src/renderers/webgl/WebGLShadowMap.js @@ -270,7 +270,7 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) { if ( groupMaterial.visible === true ) { var depthMaterial = getDepthMaterial( object, groupMaterial, isPointLight, _lightPositionWorld ); - _renderer.renderBufferDirect( shadowCamera, _lights, null, geometry, depthMaterial, object, group ); + _renderer.renderBufferDirect( shadowCamera, null, geometry, depthMaterial, object, group ); } @@ -279,7 +279,7 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) { } else { var depthMaterial = getDepthMaterial( object, material, isPointLight, _lightPositionWorld ); - _renderer.renderBufferDirect( shadowCamera, _lights, null, geometry, depthMaterial, object, null ); + _renderer.renderBufferDirect( shadowCamera, null, geometry, depthMaterial, object, null ); } -- GitLab