Sphere*Geometry clean up.

src/extras/geometries/SphereBufferGeometry.js

@@ -16,12 +16,12 @@ THREE.SphereBufferGeometry = function ( radius, widthSegments, heightSegments, p
 		phiStart: phiStart,
 		phiLength: phiLength,
 		thetaStart: thetaStart,
-		thetaLength: thetaLength 
+		thetaLength: thetaLength
 	};
 
 	radius = radius || 50;
 
-	widthSegments = Math.max( 3, Math.floor( widthSegments ) || 8 );
+	widthSegments = Math.max( 2, Math.floor( widthSegments ) || 8 );
 	heightSegments = Math.max( 2, Math.floor( heightSegments ) || 6 );
 
 	phiStart = phiStart !== undefined ? phiStart : 0;
@@ -36,25 +36,21 @@ THREE.SphereBufferGeometry = function ( radius, widthSegments, heightSegments, p
 	var normals = new THREE.BufferAttribute( new Float32Array( vertexCount * 3 ), 3);
 	var uvs = new THREE.BufferAttribute( new Float32Array( vertexCount * 2 ), 2 );
 
-	this.addAttribute( 'position', positions );
-	this.addAttribute( 'normal', normals );
-	this.addAttribute( 'uv', uvs );
-
-	var x, y, u, v, px, py, pz, index = 0, vertices = [], normal = new THREE.Vector3();
+	var index = 0, vertices = [], normal = new THREE.Vector3();
 
-	for ( y = 0; y <= heightSegments; y ++ ) {
+	for ( var y = 0; y <= heightSegments; y ++ ) {
 
 		var verticesRow = [];
 
-		v = y / heightSegments;
+		var v = y / heightSegments;
 
-		for ( x = 0; x <= widthSegments; x ++ ) {
+		for ( var x = 0; x <= widthSegments; x ++ ) {
 
-			u = x / widthSegments;
+			var u = x / widthSegments;
 
-			px = - radius * Math.cos( phiStart + u * phiLength ) * Math.sin( thetaStart + v * thetaLength );
-			py = radius * Math.cos( thetaStart + v * thetaLength );
-			pz = radius * Math.sin( phiStart + u * phiLength ) * Math.sin( thetaStart + v * thetaLength );
+			var px = - radius * Math.cos( phiStart + u * phiLength ) * Math.sin( thetaStart + v * thetaLength );
+			var py = radius * Math.cos( thetaStart + v * thetaLength );
+			var pz = radius * Math.sin( phiStart + u * phiLength ) * Math.sin( thetaStart + v * thetaLength );
 
 			normal.set( px, py, pz ).normalize();
 
@@ -73,39 +69,31 @@ THREE.SphereBufferGeometry = function ( radius, widthSegments, heightSegments, p
 	}
 
 	var indices = [];
-	var ul;
-	for ( y = 0, ul = heightSegments - 1; y < ul; y++ ) {
 
-		for ( x = 0; x < widthSegments; x++ ) {
+	for ( var y = 0; y < heightSegments; y ++ ) {
 
-			var v1 = vertices[y][x + 1];
-			var v2 = vertices[y][x];
-			var v3 = vertices[y + 1][x];
-			var v4 = vertices[y + 1][x + 1];
+		for ( var x = 0; x < widthSegments; x ++ ) {
+
+			var v1 = vertices[ y     ][ x + 1 ];
+			var v2 = vertices[ y     ][ x     ];
+			var v3 = vertices[ y + 1 ][ x     ];
+			var v4 = vertices[ y + 1 ][ x + 1 ];
 
 			if ( y !== 0 ) indices.push( v1, v2, v4 );
-			indices.push( v2, v3, v4 );
+			if ( y !== heightSegments - 1 ) indices.push( v2, v3, v4 );
 
 		}
-	}
-
-	y = heightSegments;
-
-	for ( x = 0; x < widthSegments; x++ ) {
-
-		var v2 = vertices[y][x];
-		var v3 = vertices[y - 1][x];
-		var v4 = vertices[y - 1][x + 1];
-
-		indices.push( v2, v4, v3 );
 
 	}
 
 	this.addAttribute( 'index', new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );
+	this.addAttribute( 'position', positions );
+	this.addAttribute( 'normal', normals );
+	this.addAttribute( 'uv', uvs );
 
 	this.boundingSphere = new THREE.Sphere( new THREE.Vector3(), radius );
 
 };
 
 THREE.SphereBufferGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
-THREE.SphereBufferGeometry.prototype.constructor = THREE.SphereBufferGeometry;
+THREE.SphereBufferGeometry.prototype.constructor = THREE.SphereBufferGeometry;

src/extras/geometries/SphereGeometry.js

@@ -17,12 +17,12 @@ THREE.SphereGeometry = function ( radius, widthSegments, heightSegments, phiStar
 		phiStart: phiStart,
 		phiLength: phiLength,
 		thetaStart: thetaStart,
-		thetaLength: thetaLength 
+		thetaLength: thetaLength
 	};
 
 	radius = radius || 50;
 
-	widthSegments = Math.max( 3, Math.floor( widthSegments ) || 8 );
+	widthSegments = Math.max( 2, Math.floor( widthSegments ) || 8 );
 	heightSegments = Math.max( 2, Math.floor( heightSegments ) || 6 );
 
 	phiStart = phiStart !== undefined ? phiStart : 0;