From c3710826658bb7c724e1d3765b30ae10a9b59d14 Mon Sep 17 00:00:00 2001 From: WestLangley Date: Mon, 7 Jan 2013 22:37:46 -0500 Subject: [PATCH] Fixed UVs in LatheGeometry --- build/three.js | 7 ++++--- src/extras/geometries/LatheGeometry.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/three.js b/build/three.js index f28541fe2a..0dff8fd841 100644 --- a/build/three.js +++ b/build/three.js @@ -31736,7 +31736,7 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { phiStart = phiStart || 0; phiLength = phiLength || 2 * Math.PI; - var inversePointLength = 1.0 / points.length; + var inversePointLength = 1.0 / ( points.length - 1 ); var inverseSegments = 1.0 / segments; for ( var i = 0, il = segments; i <= il; i ++ ) { @@ -31776,9 +31776,9 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { this.faces.push( new THREE.Face4( a, b, c, d ) ); - var u0 = 1 - i * inverseSegments; + var u0 = i * inverseSegments; var v0 = j * inversePointLength; - var u1 = u0 - inverseSegments; + var u1 = u0 + inverseSegments; var v1 = v0 + inversePointLength; this.faceVertexUvs[ 0 ].push( [ @@ -31794,6 +31794,7 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { } + this.mergeVertices(); this.computeCentroids(); this.computeFaceNormals(); this.computeVertexNormals(); diff --git a/src/extras/geometries/LatheGeometry.js b/src/extras/geometries/LatheGeometry.js index 86f2e7de0e..6bfd883e3d 100644 --- a/src/extras/geometries/LatheGeometry.js +++ b/src/extras/geometries/LatheGeometry.js @@ -18,7 +18,7 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { phiStart = phiStart || 0; phiLength = phiLength || 2 * Math.PI; - var inversePointLength = 1.0 / points.length; + var inversePointLength = 1.0 / ( points.length - 1 ); var inverseSegments = 1.0 / segments; for ( var i = 0, il = segments; i <= il; i ++ ) { @@ -58,9 +58,9 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { this.faces.push( new THREE.Face4( a, b, c, d ) ); - var u0 = 1 - i * inverseSegments; + var u0 = i * inverseSegments; var v0 = j * inversePointLength; - var u1 = u0 - inverseSegments; + var u1 = u0 + inverseSegments; var v1 = v0 + inversePointLength; this.faceVertexUvs[ 0 ].push( [ @@ -76,6 +76,7 @@ THREE.LatheGeometry = function ( points, segments, phiStart, phiLength ) { } + this.mergeVertices(); this.computeCentroids(); this.computeFaceNormals(); this.computeVertexNormals(); -- GitLab