X-Git-Url: http://git.scottworley.com/nt3d/blobdiff_plain/bc3b43190ac5233013c555c9f027c2e6f77a5a00..08b46dbddc6defd45926a69631e3a09ea2273e45:/nt3d.js

diff --git a/nt3d.js b/nt3d.js
index 33e271b..7198e22 100644
--- a/nt3d.js
+++ b/nt3d.js
@@ -259,7 +259,14 @@ nt3d = {
 		        point[2] + offset[2]];
 	},
 	angle_between: function(a, b) { // a and b must be unit vectors
-		return Math.acos(this.dot(a, b));
+		var the_dot = this.dot(a, b);
+		if (the_dot <= -1) {
+			return Math.PI;
+		}
+		if (the_dot >= 1) {
+			return 0;
+		}
+		return Math.acos(the_dot);
 	},
 	rotate_about_origin: function(points, axis, angle) { // axis must be a unit vector
 		// From http://inside.mines.edu/~gmurray/ArbitraryAxisRotation/
@@ -281,8 +288,8 @@ nt3d = {
 		// by crossing a and b to get a rotation axis and using
 		// angle_between to get a rotation angle.
 		var angle = this.angle_between(this.unit(a), this.unit(b));
-		if (Math.abs(angle) < 1e-15) {
-			// No siginificant rotation to perform.  Bail to avoid
+		if (Math.abs(angle) < 1e-7) {
+			// No significant rotation to perform.  Bail to avoid
 			// NaNs and numerical error
 			return points;
 		}
@@ -297,6 +304,17 @@ nt3d = {
 				angle),
 			center);
 	},
+	point_equal: function(a, b, epsilon) {
+		return Math.abs(a[0] - b[0]) < epsilon &&
+		       Math.abs(a[1] - b[1]) < epsilon &&
+		       Math.abs(a[2] - b[2]) < epsilon;
+	},
+	degenerate_face_epsilon: 1e-10,
+	is_degenerate: function(a, b, c) {
+		return this.point_equal(a, b, this.degenerate_face_epsilon) ||
+		       this.point_equal(b, c, this.degenerate_face_epsilon) ||
+		       this.point_equal(c, a, this.degenerate_face_epsilon);
+	},
 	go: function() {
 		// Remove any previous download links
 		var old_download_link = document.getElementById("nt3d_download");
@@ -323,11 +341,10 @@ nt3d = {
 		if (this.points.length % 3 != 0) {
 			alert("Points list length not divisble by 3!");
 		}
-		var n = this.points.length / 3;
 		var nan_count = 0;
 		var nan_point_count = 0;
 		var nan_face_count = 0;
-		for (var i = 0; i < n; i++) {
+		for (var i = 0; i < this.points.length/3; i++) {
 			var nan_in_face = false;
 			for (var j = 0; j < 3; j++) {
 				var nan_in_point = false;
@@ -343,12 +360,27 @@ nt3d = {
 			if (nan_in_face) nan_face_count ++;
 		}
 		if (nan_count != 0) {
-			alert(nan_count + " NaNs in " + nan_point_count + " points in " + nan_face_count + " faces.");
+			alert(nan_count + " NaNs in " + nan_point_count + " points in " + nan_face_count + " faces (" + (100 * nan_face_count / (this.points.length/3)) + "% of faces).");
+		}
+
+		// Remove degenerate faces
+		var degenerate_face_count = 0;
+		for (var i = 0; i < this.points.length/3; i++) {
+			if (this.is_degenerate(this.points[i*3+0], 
+			                       this.points[i*3+1], 
+			                       this.points[i*3+2])) {
+				this.points.splice(i*3, 3);
+				i--;
+				degenerate_face_count ++;
+			}
+		}
+		if (degenerate_face_count != 0) {
+			console.log("Removed " + degenerate_face_count + " degenerate faces");
 		}
 
 		// Make STL
 		this.stl = "solid " + this.user_function.name + "\n";
-		for (var i = 0; i < n; i++) {
+		for (var i = 0; i < this.points.length/3; i++) {
 			var a = this.points[i*3+0];
 			var b = this.points[i*3+1];
 			var c = this.points[i*3+2];