Browse Source

WebGLRenderer: Reverted groups with single material. See #7057.

Mr.doob 10 years ago
parent
commit
f8073eb823
2 changed files with 3 additions and 11 deletions
  1. 2 2
      examples/webgl_buffergeometry_drawcalls.html
  2. 1 9
      src/renderers/WebGLRenderer.js

+ 2 - 2
examples/webgl_buffergeometry_drawcalls.html

@@ -150,7 +150,7 @@
 				particles.addAttribute( 'position', new THREE.BufferAttribute( particlePositions, 3 ).setDynamic( true ) );
 
 				// create the particle system
-				pointCloud = new THREE.PointCloud( particles, pMaterial );
+				pointCloud = new THREE.PointCloud( particles, new THREE.MultiMaterial( [ pMaterial ] ) );
 				group.add( pointCloud );
 
 				var geometry = new THREE.BufferGeometry();
@@ -168,7 +168,7 @@
 					transparent: true
 				} );
 
-				linesMesh = new THREE.LineSegments( geometry, material );
+				linesMesh = new THREE.LineSegments( geometry, new THREE.MultiMaterial( [ material ] ) );
 				group.add( linesMesh );
 
 				//

+ 1 - 9
src/renderers/WebGLRenderer.js

@@ -1342,10 +1342,10 @@ THREE.WebGLRenderer = function ( parameters ) {
 					}
 
 					var geometry = objects.update( object );
-					var groups = geometry.groups;
 
 					if ( material instanceof THREE.MeshFaceMaterial ) {
 
+						var groups = geometry.groups;
 						var materials = material.materials;
 
 						for ( var i = 0, l = groups.length; i < l; i ++ ) {
@@ -1361,14 +1361,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 						}
 
-					} else if ( groups.length > 0 ) {
-
-						for ( var i = 0, l = groups.length; i < l; i ++ ) {
-
-							pushRenderItem( object, geometry, material, _vector3.z, groups[ i ] );
-
-						}
-
 					} else {
 
 						pushRenderItem( object, geometry, material, _vector3.z );