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

DirectGeometry: material is no longer used.

上级 1eb6d85e
......@@ -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 );
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册