From 60a2945937481268545221602e1d68c63b473594 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 27 Aug 2014 19:22:34 -0400 Subject: [PATCH] Updated builds. --- build/three.js | 17 ++++++++++------- build/three.min.js | 38 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/build/three.js b/build/three.js index b63a8fa542..b4e62d93c0 100644 --- a/build/three.js +++ b/build/three.js @@ -8534,7 +8534,11 @@ THREE.Projector = function () { } - if ( sortElements === true ) _renderData.elements.sort( painterSort ); + if ( sortElements === true ) { + + _renderData.elements.sort( painterSort ); + + } return _renderData; @@ -10062,12 +10066,11 @@ THREE.Geometry.prototype = { var attributes = geometry.attributes; - var indices = attributes.index !== undefined && attributes.index.array; - var normals = attributes.normal !== undefined && attributes.normal.array; - var colors = attributes.color !== undefined && attributes.color.array; - var uvs = attributes.uv !== undefined && attributes.uv.array; - var vertices = attributes.position.array; + var indices = attributes.index !== undefined ? attributes.index.array : undefined; + var normals = attributes.normal !== undefined ? attributes.normal.array : undefined; + var colors = attributes.color !== undefined ? attributes.color.array : undefined; + var uvs = attributes.uv !== undefined ? attributes.uv.array : undefined; var tempNormals = []; var tempUVs = []; @@ -11053,7 +11056,7 @@ THREE.Script.prototype = { } -} +}; // File:src/cameras/Camera.js /** diff --git a/build/three.min.js b/build/three.min.js index 388add25a8..1ca677a37e 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -214,25 +214,25 @@ b[d];if(e instanceof h){f.array=new h(e);break}}a.attributes[c]=f}d=0;for(g=this THREE.Geometry=function(){this.id=THREE.GeometryIdCount++;this.uuid=THREE.Math.generateUUID();this.name="";this.type="Geometry";this.vertices=[];this.colors=[];this.faces=[];this.faceVertexUvs=[[]];this.morphTargets=[];this.morphColors=[];this.morphNormals=[];this.skinWeights=[];this.skinIndices=[];this.lineDistances=[];this.boundingSphere=this.boundingBox=null;this.hasTangents=!1;this.dynamic=!0;this.groupsNeedUpdate=this.buffersNeedUpdate=this.lineDistancesNeedUpdate=this.colorsNeedUpdate=this.tangentsNeedUpdate= this.normalsNeedUpdate=this.uvsNeedUpdate=this.elementsNeedUpdate=this.verticesNeedUpdate=!1}; THREE.Geometry.prototype={constructor:THREE.Geometry,applyMatrix:function(a){for(var b=(new THREE.Matrix3).getNormalMatrix(a),c=0,d=this.vertices.length;cd?-1:1,e.vertexTangents[c]=new THREE.Vector4(y.x,y.y,y.z,d);this.hasTangents=!0},computeLineDistances:function(){for(var a= -0,b=this.vertices,c=0,d=b.length;cd;d++)if(e[d]==e[(d+1)%3]){a.push(f);break}for(f=a.length-1;0<=f;f--)for(e=a[f],this.faces.splice(e,1),c=0,g=this.faceVertexUvs.length;cc&&(h[f].counter+=1,g=h[f].hash+"_"+ -h[f].counter,g in this.geometryGroups||(k={id:a++,faces3:[],materialIndex:f,vertices:0,numMorphTargets:m,numMorphNormals:n},this.geometryGroups[g]=k,this.geometryGroupsList.push(k))),this.geometryGroups[g].faces3.push(d),this.geometryGroups[g].vertices+=3}}(),toJSON:function(){function a(a,b,c){return c?a|1<d?-1:1,e.vertexTangents[c]=new THREE.Vector4(y.x, +y.y,y.z,d);this.hasTangents=!0},computeLineDistances:function(){for(var a=0,b=this.vertices,c=0,d=b.length;cd;d++)if(e[d]==e[(d+1)%3]){a.push(f);break}for(f=a.length-1;0<=f;f--)for(e=a[f],this.faces.splice(e,1),c=0,g=this.faceVertexUvs.length;cc&&(h[f].counter+=1,g=h[f].hash+"_"+h[f].counter,g in this.geometryGroups||(k={id:a++,faces3:[],materialIndex:f,vertices:0,numMorphTargets:m,numMorphNormals:n},this.geometryGroups[g]=k,this.geometryGroupsList.push(k))),this.geometryGroups[g].faces3.push(d),this.geometryGroups[g].vertices+=3}}(),toJSON:function(){function a(a,b,c){return c?a|1<