From a849917326f0a162f9f6207a489e69abe927a2bd Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 18 Aug 2015 01:08:16 -0700 Subject: [PATCH] Updated builds. --- build/three.js | 4 ++-- build/three.min.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/three.js b/build/three.js index 1b1ee47b91..3fb64c5307 100644 --- a/build/three.js +++ b/build/three.js @@ -14061,6 +14061,7 @@ THREE.MaterialLoader.prototype = { if ( json.transparent !== undefined ) material.transparent = json.transparent; if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest; if ( json.wireframe !== undefined ) material.wireframe = json.wireframe; + if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth; // for PointCloudMaterial if ( json.size !== undefined ) material.size = json.size; @@ -15163,6 +15164,7 @@ THREE.Material.prototype = { if ( this.transparent === true ) data.transparent = this.transparent; if ( this.alphaTest > 0 ) data.alphaTest = this.alphaTest; if ( this.wireframe === true ) data.wireframe = this.wireframe; + if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth; return data; @@ -34263,8 +34265,6 @@ THREE.WireframeBufferGeometry = function ( geometry ) { var b = i + 1; var c = i + 2; - // TODO: Check for duplicates - indices.push( a, b, b, c, c, a ); } diff --git a/build/three.min.js b/build/three.min.js index cbf2648b70..e372765a15 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -308,7 +308,7 @@ THREE.BufferGeometryLoader.prototype={constructor:THREE.BufferGeometryLoader,loa c)for(d=0,e=c.length;d!==e;++d)g=c[d],b.addDrawcall(g.start,g.count);a=a.data.boundingSphere;void 0!==a&&(c=new THREE.Vector3,void 0!==a.center&&c.fromArray(a.center),b.boundingSphere=new THREE.Sphere(c,a.radius));return b}};THREE.MaterialLoader=function(a){this.manager=void 0!==a?a:THREE.DefaultLoadingManager}; THREE.MaterialLoader.prototype={constructor:THREE.MaterialLoader,load:function(a,b,c,d){var e=this,g=new THREE.XHRLoader(e.manager);g.setCrossOrigin(this.crossOrigin);g.load(a,function(a){b(e.parse(JSON.parse(a)))},c,d)},setCrossOrigin:function(a){this.crossOrigin=a},parse:function(a){var b=new THREE[a.type];void 0!==a.color&&b.color.setHex(a.color);void 0!==a.emissive&&b.emissive.setHex(a.emissive);void 0!==a.specular&&b.specular.setHex(a.specular);void 0!==a.shininess&&(b.shininess=a.shininess); void 0!==a.uniforms&&(b.uniforms=a.uniforms);void 0!==a.attributes&&(b.attributes=a.attributes);void 0!==a.vertexShader&&(b.vertexShader=a.vertexShader);void 0!==a.fragmentShader&&(b.fragmentShader=a.fragmentShader);void 0!==a.vertexColors&&(b.vertexColors=a.vertexColors);void 0!==a.shading&&(b.shading=a.shading);void 0!==a.blending&&(b.blending=a.blending);void 0!==a.side&&(b.side=a.side);void 0!==a.opacity&&(b.opacity=a.opacity);void 0!==a.transparent&&(b.transparent=a.transparent);void 0!==a.alphaTest&& -(b.alphaTest=a.alphaTest);void 0!==a.wireframe&&(b.wireframe=a.wireframe);void 0!==a.size&&(b.size=a.size);void 0!==a.sizeAttenuation&&(b.sizeAttenuation=a.sizeAttenuation);if(void 0!==a.materials)for(var c=0,d=a.materials.length;cthis.opacity&&(b.opacity=this.opacity); -!0===this.transparent&&(b.transparent=this.transparent);0