diff --git a/bower.json b/bower.json index a6eaa0c5e863be07459367110ff012de0e88c536..0df1f893e1e969ddcc192f54554b5bd69d7dd579 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "three.js", - "version": "0.0.68", + "version": "0.0.69", "homepage": "http://threejs.org/", "description": "JavaScript 3D library", "main": "build/three.js", diff --git a/build/three.js b/build/three.js index 7e496a817f6813e6ee2acd35e22eb897691cf526..636b15d6dfe3ccf36523b964ffc7c77438de74b5 100644 --- a/build/three.js +++ b/build/three.js @@ -4,7 +4,7 @@ * @author mrdoob / http://mrdoob.com/ */ -var THREE = { REVISION: '69dev' }; +var THREE = { REVISION: '69' }; // browserify support @@ -33572,9 +33572,7 @@ THREE.EdgesHelper = function ( object, hex ) { } - geometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( numEdges * 2 * 3 ), 3 ) ); - - var coords = geometry.attributes.position.array; + var coords = new Float32Array( numEdges * 2 * 3 ); var index = 0; @@ -33598,6 +33596,8 @@ THREE.EdgesHelper = function ( object, hex ) { } + geometry.addAttribute( 'position', new THREE.BufferAttribute( coords, 3 ) ); + THREE.Line.call( this, geometry, new THREE.LineBasicMaterial( { color: color } ), THREE.LinePieces ); this.matrix = object.matrixWorld; diff --git a/build/three.min.js b/build/three.min.js index 4d9804c6516588f670e67a85c6571daedc565cdb..a88b4afa7797e85ead3935eb94de73016652c1be 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -1,5 +1,5 @@ // threejs.org/license -'use strict';var THREE={REVISION:"69dev"};"object"===typeof module&&(module.exports=THREE);void 0===Math.sign&&(Math.sign=function(a){return 0>a?-1:0a?-1:0t;t++){d[0]=r[g[t]];d[1]=r[g[(t+1)%3]];d.sort(f);var s=d.toString();void 0===e[s]?(e[s]={vert1:d[0],vert2:d[1],face1:q,face2:void 0},p++):e[s].face2=q}h.addAttribute("position",new THREE.BufferAttribute(new Float32Array(6* -p),3));d=h.attributes.position.array;f=0;for(s in e)if(g=e[s],void 0===g.face2||.9999>k[g.face1].normal.dot(k[g.face2].normal))p=n[g.vert1],d[f++]=p.x,d[f++]=p.y,d[f++]=p.z,p=n[g.vert2],d[f++]=p.x,d[f++]=p.y,d[f++]=p.z;THREE.Line.call(this,h,new THREE.LineBasicMaterial({color:c}),THREE.LinePieces);this.matrix=a.matrixWorld;this.matrixAutoUpdate=!1};THREE.EdgesHelper.prototype=Object.create(THREE.Line.prototype); +THREE.EdgesHelper=function(a,b){var c=void 0!==b?b:16777215,d=[0,0],e={},f=function(a,b){return a-b},g=["a","b","c"],h=new THREE.BufferGeometry,k=a.geometry.clone();k.mergeVertices();k.computeFaceNormals();for(var n=k.vertices,k=k.faces,p=0,q=0,m=k.length;qt;t++){d[0]=r[g[t]];d[1]=r[g[(t+1)%3]];d.sort(f);var s=d.toString();void 0===e[s]?(e[s]={vert1:d[0],vert2:d[1],face1:q,face2:void 0},p++):e[s].face2=q}d=new Float32Array(6*p);f=0;for(s in e)if(g=e[s],void 0===g.face2|| +.9999>k[g.face1].normal.dot(k[g.face2].normal))p=n[g.vert1],d[f++]=p.x,d[f++]=p.y,d[f++]=p.z,p=n[g.vert2],d[f++]=p.x,d[f++]=p.y,d[f++]=p.z;h.addAttribute("position",new THREE.BufferAttribute(d,3));THREE.Line.call(this,h,new THREE.LineBasicMaterial({color:c}),THREE.LinePieces);this.matrix=a.matrixWorld;this.matrixAutoUpdate=!1};THREE.EdgesHelper.prototype=Object.create(THREE.Line.prototype); THREE.FaceNormalsHelper=function(a,b,c,d){this.object=a;this.size=void 0!==b?b:1;a=void 0!==c?c:16776960;d=void 0!==d?d:1;b=new THREE.Geometry;c=0;for(var e=this.object.geometry.faces.length;c