Browse Source

WebGLRenderer: Removed unroll* methods.

Mr.doob 10 years ago
parent
commit
417e47d928
1 changed files with 23 additions and 45 deletions
  1. 23 45
      src/renderers/WebGLRenderer.js

+ 23 - 45
src/renderers/WebGLRenderer.js

@@ -1690,7 +1690,19 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				setupMatrices( object, camera );
 
-				unrollImmediateBufferMaterial( webglObject );
+				var material = object.material;
+
+				if ( material.transparent ) {
+
+					webglObject.transparent = material;
+					webglObject.opaque = null;
+
+				} else {
+
+					webglObject.opaque = material;
+					webglObject.transparent = null;
+
+				}
 
 			}
 
@@ -1782,9 +1794,17 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				if ( webglObject && ( object.frustumCulled === false || _frustum.intersectsObject( object ) === true ) ) {
 
-					unrollBufferMaterial( webglObject );
+					var material = object.material;
+
+					if ( material.transparent ) {
+
+						transparentObjects.push( webglObject );
+
+					} else {
+
+						opaqueObjects.push( webglObject );
 
-					webglObject.render = true;
+					}
 
 					if ( _this.sortObjects === true ) {
 
@@ -1896,48 +1916,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	};
 
-	function unrollImmediateBufferMaterial ( globject ) {
-
-		var object = globject.object,
-			material = object.material;
-
-		if ( material.transparent ) {
-
-			globject.transparent = material;
-			globject.opaque = null;
-
-		} else {
-
-			globject.opaque = material;
-			globject.transparent = null;
-
-		}
-
-	}
-
-	function unrollBufferMaterial ( globject ) {
-
-		var object = globject.object;
-		var material = object.material;
-
-		if ( material ) {
-
-			globject.material = material;
-
-			if ( material.transparent ) {
-
-				transparentObjects.push( globject );
-
-			} else {
-
-				opaqueObjects.push( globject );
-
-			}
-
-		}
-
-	}
-
 	// Materials
 
 	var shaderIDs = {