Browse Source

WebGLRenderer: Clean up.

Mr.doob 10 years ago
parent
commit
2034b611f1
2 changed files with 6 additions and 8 deletions
  1. 4 4
      src/renderers/WebGLRenderer.js
  2. 2 4
      src/renderers/webgl/WebGLShadowMap.js

+ 4 - 4
src/renderers/WebGLRenderer.js

@@ -987,15 +987,16 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	}
 
-	this.renderBufferDirect = function ( camera, lights, fog, material, geometry, object ) {
+	this.renderBufferDirect = function ( camera, lights, fog, material, object ) {
 
 		if ( material.visible === false ) return;
 
+		var geometry = objects.geometries.get( object );
 		var program = setProgram( camera, lights, fog, material, object );
 
 		var updateBuffers = false,
 			wireframeBit = material.wireframe ? 1 : 0,
-			geometryProgram = 'direct_' + geometry.id + '_' + program.id + '_' + wireframeBit;
+			geometryProgram = geometry.id + '_' + program.id + '_' + wireframeBit;
 
 		if ( geometryProgram !== _currentGeometryProgram ) {
 
@@ -1853,7 +1854,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 			var webglObject = renderList[ i ];
 
 			var object = webglObject.object;
-			var buffer = objects.geometries.get( object );
 
 			setupMatrices( object, camera );
 
@@ -1872,7 +1872,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 			}
 
 			_this.setMaterialFaces( material );
-			_this.renderBufferDirect( camera, lights, fog, material, buffer, object );
+			_this.renderBufferDirect( camera, lights, fog, material, object );
 
 		}
 

+ 2 - 4
src/renderers/webgl/WebGLShadowMap.js

@@ -74,8 +74,7 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
 		var i, il, j, jl, n,
 
 		shadowMap, shadowMatrix, shadowCamera,
-		buffer, material,
-		webglObject, object, light,
+		webglObject, object, material, light,
 
 		lights = [],
 		k = 0,
@@ -274,7 +273,6 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
 				webglObject = _renderList[ j ];
 
 				object = webglObject.object;
-				buffer = _objects.geometries.get( object );
 
 				// culling is overriden globally for all objects
 				// while rendering depth map
@@ -309,7 +307,7 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
 				}
 
 				_renderer.setMaterialFaces( objectMaterial );
-				_renderer.renderBufferDirect( shadowCamera, _lights, fog, material, buffer, object );
+				_renderer.renderBufferDirect( shadowCamera, _lights, fog, material, object );
 
 			}