diff --git a/build/three.js b/build/three.js index cb527a47d30e5def8cf2196d68275081b5452ca7..ce41799a3cfad3f7aa83975b13bf61de7be075bc 100644 --- a/build/three.js +++ b/build/three.js @@ -4992,8 +4992,6 @@ THREE.Geometry = function () { this.colors = []; // one-to-one vertex colors, used in ParticleSystem, Line and Ribbon this.normals = []; // one-to-one vertex normals, used in Ribbon - this.materials = []; - this.faces = []; this.faceUvs = [[]]; @@ -22817,18 +22815,6 @@ THREE.GeometryUtils = { uvs1 = geometry1.faceVertexUvs[ 0 ], uvs2 = geometry2.faceVertexUvs[ 0 ]; - /* - var geo1MaterialsMap = {}; - - for ( var i = 0; i < geometry1.materials.length; i ++ ) { - - var id = geometry1.materials[ i ].id; - - geo1MaterialsMap[ id ] = i; - - } - */ - if ( object2 instanceof THREE.Mesh ) { object2.matrixAutoUpdate && object2.updateMatrix(); @@ -22896,24 +22882,6 @@ THREE.GeometryUtils = { if ( face.materialIndex !== undefined ) { - /* - var material2 = geometry2.materials[ face.materialIndex ]; - var materialId2 = material2.id; - - var materialIndex = geo1MaterialsMap[ materialId2 ]; - - if ( materialIndex === undefined ) { - - materialIndex = geometry1.materials.length; - geo1MaterialsMap[ materialId2 ] = materialIndex; - - geometry1.materials.push( material2 ); - - } - - faceCopy.materialIndex = materialIndex; - */ - faceCopy.materialIndex = face.materialIndex; } @@ -22953,16 +22921,6 @@ THREE.GeometryUtils = { faces = geometry.faces, uvs = geometry.faceVertexUvs[ 0 ]; - /* - // materials - - if ( geometry.materials ) { - - cloneGeo.materials = geometry.materials.slice(); - - } - */ - // vertices for ( i = 0, il = vertices.length; i < il; i ++ ) { diff --git a/build/three.min.js b/build/three.min.js index a2e0c927c17e6dbb0c4b54426780ba436a5d08d3..319e7eb28cfc94d50e102c45c0f9ef2a03a4fc91 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -103,8 +103,8 @@ THREE.Face3.prototype={constructor:THREE.Face3,clone:function(){var a=new THREE. return a}};THREE.Face4=function(a,b,c,d,e,f,g){this.a=a;this.b=b;this.c=c;this.d=d;this.normal=e instanceof THREE.Vector3?e:new THREE.Vector3;this.vertexNormals=e instanceof Array?e:[];this.color=f instanceof THREE.Color?f:new THREE.Color;this.vertexColors=f instanceof Array?f:[];this.vertexTangents=[];this.materialIndex=g;this.centroid=new THREE.Vector3}; THREE.Face4.prototype={constructor:THREE.Face4,clone:function(){var a=new THREE.Face4(this.a,this.b,this.c,this.d);a.normal.copy(this.normal);a.color.copy(this.color);a.centroid.copy(this.centroid);a.materialIndex=this.materialIndex;var b,c;b=0;for(c=this.vertexNormals.length;b