From 4533e97851cf96e8353ba2290ef969509f9e898e Mon Sep 17 00:00:00 2001 From: WestLangley Date: Fri, 24 Jun 2016 16:19:41 -0400 Subject: [PATCH] Removed UVs from geometry (#9220) --- examples/js/geometries/ConvexGeometry.js | 35 ++++-------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/examples/js/geometries/ConvexGeometry.js b/examples/js/geometries/ConvexGeometry.js index 39d5b279ae..062bb65213 100644 --- a/examples/js/geometries/ConvexGeometry.js +++ b/examples/js/geometries/ConvexGeometry.js @@ -21,7 +21,7 @@ THREE.ConvexGeometry = function( vertices ) { THREE.Geometry.call( this ); - var faces = [ [ 0, 1, 2 ], [ 0, 2, 1 ] ]; + var faces = [ [ 0, 1, 2 ], [ 0, 2, 1 ] ]; for ( var i = 3; i < vertices.length; i ++ ) { @@ -93,7 +93,7 @@ THREE.ConvexGeometry = function( vertices ) { // construct the new faces formed by the edges of the hole and the vertex for ( var h = 0; h < hole.length; h ++ ) { - faces.push( [ + faces.push( [ hole[ h ][ 0 ], hole[ h ][ 1 ], vertexId @@ -117,7 +117,7 @@ THREE.ConvexGeometry = function( vertices ) { // distance from face to origin var dist = n.dot( va ); - return n.dot( vertex ) >= dist; + return n.dot( vertex ) >= dist; } @@ -146,7 +146,7 @@ THREE.ConvexGeometry = function( vertices ) { */ function equalEdge( ea, eb ) { - return ea[ 0 ] === eb[ 1 ] && ea[ 1 ] === eb[ 0 ]; + return ea[ 0 ] === eb[ 1 ] && ea[ 1 ] === eb[ 0 ]; } @@ -159,17 +159,6 @@ THREE.ConvexGeometry = function( vertices ) { } - - /** - * XXX: Not sure if this is the correct approach. Need someone to review. - */ - function vertexUv( vertex ) { - - var mag = vertex.length(); - return new THREE.Vector2( vertex.x / mag, vertex.y / mag ); - - } - // Push vertices into `this.vertices`, skipping those inside the hull var id = 0; var newId = new Array( vertices.length ); // map from old vertex id to new id @@ -196,7 +185,7 @@ THREE.ConvexGeometry = function( vertices ) { // Convert faces into instances of THREE.Face3 for ( var i = 0; i < faces.length; i ++ ) { - this.faces.push( new THREE.Face3( + this.faces.push( new THREE.Face3( faces[ i ][ 0 ], faces[ i ][ 1 ], faces[ i ][ 2 ] @@ -204,19 +193,6 @@ THREE.ConvexGeometry = function( vertices ) { } - // Compute UVs - for ( var i = 0; i < this.faces.length; i ++ ) { - - var face = this.faces[ i ]; - - this.faceVertexUvs[ 0 ].push( [ - vertexUv( this.vertices[ face.a ] ), - vertexUv( this.vertices[ face.b ] ), - vertexUv( this.vertices[ face.c ] ) - ] ); - - } - this.computeFaceNormals(); this.computeVertexNormals(); @@ -224,3 +200,4 @@ THREE.ConvexGeometry = function( vertices ) { THREE.ConvexGeometry.prototype = Object.create( THREE.Geometry.prototype ); THREE.ConvexGeometry.prototype.constructor = THREE.ConvexGeometry; + -- GitLab