提交 f8073eb8 编写于 作者: M Mr.doob

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

上级 8fe9093d
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
particles.addAttribute( 'position', new THREE.BufferAttribute( particlePositions, 3 ).setDynamic( true ) ); particles.addAttribute( 'position', new THREE.BufferAttribute( particlePositions, 3 ).setDynamic( true ) );
// create the particle system // create the particle system
pointCloud = new THREE.PointCloud( particles, pMaterial ); pointCloud = new THREE.PointCloud( particles, new THREE.MultiMaterial( [ pMaterial ] ) );
group.add( pointCloud ); group.add( pointCloud );
var geometry = new THREE.BufferGeometry(); var geometry = new THREE.BufferGeometry();
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
transparent: true transparent: true
} ); } );
linesMesh = new THREE.LineSegments( geometry, material ); linesMesh = new THREE.LineSegments( geometry, new THREE.MultiMaterial( [ material ] ) );
group.add( linesMesh ); group.add( linesMesh );
// //
......
...@@ -1342,10 +1342,10 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -1342,10 +1342,10 @@ THREE.WebGLRenderer = function ( parameters ) {
} }
var geometry = objects.update( object ); var geometry = objects.update( object );
var groups = geometry.groups;
if ( material instanceof THREE.MeshFaceMaterial ) { if ( material instanceof THREE.MeshFaceMaterial ) {
var groups = geometry.groups;
var materials = material.materials; var materials = material.materials;
for ( var i = 0, l = groups.length; i < l; i ++ ) { for ( var i = 0, l = groups.length; i < l; i ++ ) {
...@@ -1361,14 +1361,6 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -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 { } else {
pushRenderItem( object, geometry, material, _vector3.z ); pushRenderItem( object, geometry, material, _vector3.z );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册