Browse Source

DirectGeometry: material is no longer used.

Mr.doob 10 years ago
parent
commit
e1dd371caf
2 changed files with 4 additions and 7 deletions
  1. 2 2
      src/core/BufferGeometry.js
  2. 2 5
      src/core/DirectGeometry.js

+ 2 - 2
src/core/BufferGeometry.js

@@ -253,9 +253,9 @@ THREE.BufferGeometry.prototype = {
 
 	},
 
-	fromGeometry: function ( geometry, material ) {
+	fromGeometry: function ( geometry ) {
 
-		geometry.__directGeometry = new THREE.DirectGeometry().fromGeometry( geometry, material );
+		geometry.__directGeometry = new THREE.DirectGeometry().fromGeometry( geometry );
 
 		return this.fromDirectGeometry( geometry.__directGeometry );
 

+ 2 - 5
src/core/DirectGeometry.js

@@ -61,14 +61,11 @@ THREE.DirectGeometry.prototype = {
 
 	},
 
-	fromGeometry: function ( geometry, material ) {
-
-		material = material || { 'vertexColors': THREE.NoColors };
+	fromGeometry: function ( geometry ) {
 
 		var faces = geometry.faces;
 		var vertices = geometry.vertices;
 		var faceVertexUvs = geometry.faceVertexUvs;
-		var materialVertexColors = material.vertexColors;
 
 		var hasFaceVertexUv = faceVertexUvs[ 0 ] && faceVertexUvs[ 0 ].length > 0;
 		var hasFaceVertexUv2 = faceVertexUvs[ 1 ] && faceVertexUvs[ 1 ].length > 0;
@@ -138,7 +135,7 @@ THREE.DirectGeometry.prototype = {
 
 				this.colors.push( vertexColors[ 0 ], vertexColors[ 1 ], vertexColors[ 2 ] );
 
-			} else if ( materialVertexColors === THREE.FaceColors ) {
+			} else {
 
 				var color = face.color;