Removed more Face4 stuff.

docs/api/core/Geometry.html

@@ -73,7 +73,7 @@
 
 		<h3>.[page:Array faces]</h3>
 		<div>
-		Array of [page:Face3 triangles] or/and [page:Face4 quads].<br />
+		Array of [page:Face3 triangles].<br />
 		The array of faces describe how each vertex in the model is connected with each other.<br />
 		To signal an update in this array, [page:Geometry Geometry.elementsNeedUpdate] needs to be set to true.
 		</div>

examples/js/Octree.js

@@ -555,35 +555,17 @@
 				vertices = geometry.vertices,
 				centroid = face.centroid,
 				va = vertices[ face.a ], vb = vertices[ face.b ], vc = vertices[ face.c ], vd,
-				centroidToVert = this.utilVec31FaceBounds,
-				radius;
+				centroidToVert = this.utilVec31FaceBounds;
 			
-			// handle face type
-			
-			if ( face instanceof THREE.Face4 ) {
-				
-				vd = vertices[ face.d ];
-				
-				centroid.addVectors( va, vb ).add( vc ).add( vd ).divideScalar( 4 );
+			centroid.addVectors( va, vb ).add( vc ).divideScalar( 3 );
 				
-				radius = Math.max( centroidToVert.subVectors( centroid, va ).length(), centroidToVert.subVectors( centroid, vb ).length(), centroidToVert.subVectors( centroid, vc ).length(), centroidToVert.subVectors( centroid, vd ).length() );
-				
-			}
-			else {
-				
-				centroid.addVectors( va, vb ).add( vc ).divideScalar( 3 );
-				
-				radius = Math.max( centroidToVert.subVectors( centroid, va ).length(), centroidToVert.subVectors( centroid, vb ).length(), centroidToVert.subVectors( centroid, vc ).length() );
-				
-			}
-			
-			return radius;
+			return Math.max( centroidToVert.subVectors( centroid, va ).length(), centroidToVert.subVectors( centroid, vb ).length(), centroidToVert.subVectors( centroid, vc ).length() );
 			
 		},
 		
 		usesFaces: function () {
 			
-			return this.faces instanceof THREE.Face3 || this.faces instanceof THREE.Face4;
+			return this.faces instanceof THREE.Face3;
 			
 		}
 		
@@ -650,7 +632,7 @@
 		
 		if ( this.tree.scene ) {
 			
-			this.visual = new THREE.Mesh( new THREE.CubeGeometry( this.radiusOverlap * 2, this.radiusOverlap * 2, this.radiusOverlap * 2 ), new THREE.MeshBasicMaterial( { color: 0xFF0000, wireframe: true, wireframeLinewidth: 1 } ) );
+			this.visual = new THREE.Mesh( new THREE.CubeGeometry( this.radiusOverlap * 2, this.radiusOverlap * 2, this.radiusOverlap * 2 ), new THREE.MeshBasicMaterial( { color: 0xFF0000, wireframe: true, wireframeLinewidth: 1, opacity: 0.05, transparent: true } ) );
 			this.visual.position.copy( this.position );
 			this.tree.scene.add( this.visual );
 			

examples/js/exporters/OBJExporter.js

@@ -51,51 +51,16 @@ THREE.OBJExporter.prototype = {
 
 		}
 
-		// map
-
-		var count = 1; // OBJ values start by 1
-		var map = [ count ];
-
-		for ( var i = 0, l = geometry.faces.length; i < l; i ++ ) {
-
-			var face = geometry.faces[ i ];
-
-			if ( face instanceof THREE.Face3 ) {
-
-				count += 3;
-
-			} else if ( face instanceof THREE.Face4 ) {
-
-				count += 4;
-
-			}
-
-			map.push( count );
-
-		}
-
 		// faces
 
-		for ( var i = 0, l = geometry.faces.length; i < l; i ++ ) {
+		for ( var i = 0, j = 1, l = geometry.faces.length; i < l; i ++, j += 3 ) {
 
 			var face = geometry.faces[ i ];
 
 			output += 'f ';
-
-			if ( face instanceof THREE.Face3 ) {
-
-				output += ( face.a + 1 ) + '/' + ( map[ i ] ) + '/' + ( map[ i ] ) + ' ';
-				output += ( face.b + 1 ) + '/' + ( map[ i ] + 1 ) + '/' + ( map[ i ] + 1 ) + ' ';
-				output += ( face.c + 1 ) + '/' + ( map[ i ] + 2 ) + '/' + ( map[ i ] + 2 ) + '\n';
-
-			} else if ( face instanceof THREE.Face4 ) {
-
-				output += ( face.a + 1 ) + '/' + ( map[ i ] ) + '/' + ( map[ i ] ) + ' ';
-				output += ( face.b + 1 ) + '/' + ( map[ i ] + 1 ) + '/' + ( map[ i ] + 1 ) + ' ';
-				output += ( face.c + 1 ) + '/' + ( map[ i ] + 2 ) + '/' + ( map[ i ] + 2 ) + ' ';
-				output += ( face.d + 1 ) + '/' + ( map[ i ] + 3 ) + '/' + ( map[ i ] + 3 ) + '\n';
-
-			}
+			output += ( face.a + 1 ) + '/' + ( j ) + '/' + ( j ) + ' ';
+			output += ( face.b + 1 ) + '/' + ( j + 1 ) + '/' + ( j + 1 ) + ' ';
+			output += ( face.c + 1 ) + '/' + ( j + 2 ) + '/' + ( j + 2 ) + '\n';
 
 		}
 

examples/js/exporters/STLExporter.js

@@ -41,22 +41,10 @@ THREE.STLExporter.prototype = {
 			for (j = 0; j < geometry.faces.length; j++) {
 				face = geometry.faces[j];
 				normal = face.normal;
-				if (face instanceof THREE.Face3) {
-					vertex1 = this.getTransformedPosition (geometry.vertices[face.a], matrix, position);
-					vertex2 = this.getTransformedPosition (geometry.vertices[face.b], matrix, position);
-					vertex3 = this.getTransformedPosition (geometry.vertices[face.c], matrix, position);
-					this.addTriangleToContent (normal, vertex1, vertex2, vertex3);
-				} else if (face instanceof THREE.Face4) {
-					vertex1 = this.getTransformedPosition (geometry.vertices[face.a], matrix, position);
-					vertex2 = this.getTransformedPosition (geometry.vertices[face.b], matrix, position);
-					vertex3 = this.getTransformedPosition (geometry.vertices[face.c], matrix, position);
-					this.addTriangleToContent (normal, vertex1, vertex2, vertex3);
-
-					vertex1 = this.getTransformedPosition (geometry.vertices[face.a], matrix, position);
-					vertex2 = this.getTransformedPosition (geometry.vertices[face.c], matrix, position);
-					vertex3 = this.getTransformedPosition (geometry.vertices[face.d], matrix, position);
-					this.addTriangleToContent (normal, vertex1, vertex2, vertex3);
-				}
+				vertex1 = this.getTransformedPosition (geometry.vertices[face.a], matrix, position);
+				vertex2 = this.getTransformedPosition (geometry.vertices[face.b], matrix, position);
+				vertex3 = this.getTransformedPosition (geometry.vertices[face.c], matrix, position);
+				this.addTriangleToContent (normal, vertex1, vertex2, vertex3);
 			}
 		};
 		

utils/build/includes/webgl.json

@@ -77,7 +77,6 @@
 	"src/renderers/WebGLRenderTargetCube.js",
 	"src/renderers/renderables/RenderableVertex.js",
 	"src/renderers/renderables/RenderableFace3.js",
-	"src/renderers/renderables/RenderableFace4.js",
 	"src/renderers/renderables/RenderableObject.js",
 	"src/renderers/renderables/RenderableParticle.js",
 	"src/renderers/renderables/RenderableLine.js",