X-Git-Url: http://git.scottworley.com/nt3d/blobdiff_plain/2f6b97f8bc892064a1ca781c11b08104182f862a..f72a4188261299dcb24dd9a0d4ebb91fa0479227:/nt3d.js?ds=inline

diff --git a/nt3d.js b/nt3d.js
index 3d87ffb..5f7fad7 100644
--- a/nt3d.js
+++ b/nt3d.js
@@ -92,7 +92,7 @@ nt3d = {
 			var rot1axis = this.unit(this.cross([0,0,1], shapenormals[i]));
 			var rot1angle = this.angle_between([0,0,1], this.unit(shapenormals[i]));
 			if (rot1angle > 1e-7) {
-				loop = this.rotate(loop, rot1axis, rot1angle);
+				loop = this.rotate_about_origin(loop, rot1axis, rot1angle);
 			}
 
 			// 2. Rotate around shapenormals[i] so that [1,0,0]
@@ -100,7 +100,7 @@ nt3d = {
 			var rot2axis = this.unit(shapenormals[i]);
 			var rot2angle = this.angle_between([1,0,0], this.unit(fixedpathnormals[i]));
 			if (rot2angle > 1e-7) {
-				loop = this.rotate(loop, rot2axis, rot2angle);
+				loop = this.rotate_about_origin(loop, rot2axis, rot2angle);
 			}
 			// This would probably be faster and more numerically stable
 			// if the two rotations were applied as one combined operation
@@ -140,6 +140,9 @@ nt3d = {
 		        a[1] - b[1],
 		        a[2] - b[2]];
 	},
+	neg: function(a) {
+		return [-a[0], -a[1], -a[2]];
+	},
 	dot: function(a, b) {
 		return a[0]*b[0] + a[1]*b[1] + a[2]*b[2];
 	},
@@ -170,7 +173,7 @@ nt3d = {
 	angle_between: function(a, b) { // a and b must be unit vectors
 		return Math.acos(this.dot(a, b));
 	},
-	rotate: function(points, axis, angle) { // axis must be a unit vector
+	rotate_about_origin: function(points, axis, angle) { // axis must be a unit vector
 		// From http://inside.mines.edu/~gmurray/ArbitraryAxisRotation/
 		var cosangle = Math.cos(angle);
 		var sinangle = Math.sin(angle);
@@ -185,11 +188,31 @@ nt3d = {
 		}
 		return rotated;
 	},
+	rotate: function(points, center, axis, angle) { // axis must be a unit vector
+		return this.translate(
+			this.rotate_about_origin(
+				this.translate(points, this.neg(center)),
+				axis,
+				angle),
+			center);
+	},
 	go: function() {
+		// Remove any previous download links
+		var old_download_link = document.getElementById("nt3d_download");
+		if (old_download_link) {
+			old_download_link.parentNode.removeChild(old_download_link);
+		}
+
+		// Continue in a callback, so that there's not a stale download
+		// link hanging around while we process.
+		setTimeout(function(the_this) { (function() {
+
 		// Get params from form
 		var params = [];
 		for (var i = 0; i < this.user_params.length; i++) {
-			params[i] = this.form.elements["param"+i].value;
+			var as_string = this.form.elements["param"+i].value;
+			var as_num = +as_string;
+			params[i] = isNaN(as_num) ? as_string : as_num;
 		}
 
 		// Run user_function
@@ -216,11 +239,6 @@ nt3d = {
 		}
 		this.stl += "endsolid " + this.user_function.name + "\n";
 
-		// Remove any previous download links
-		var old_download_link = document.getElementById("nt3d_download");
-		if (old_download_link) {
-			old_download_link.parentNode.removeChild(old_download_link);
-		}
 
 		// Offer result as download
 		var download_link = document.createElement("a");
@@ -231,6 +249,8 @@ nt3d = {
 		download_link.setAttribute("href", "data:application/sla," + encodeURIComponent(this.stl));
 		this.ui.appendChild(download_link);
 		setTimeout(function() { download_link.setAttribute("style", "-webkit-transition: background-color 0.4s; -moz-transition: background-color 0.4s; -o-transition: background-color 0.4s; -ms-transition: background-color 0.4s; transition: background-color 0.4s; background-color: inherit"); }, 0);
+
+		}).call(the_this); }, 0, this); // (We were in a callback this whole time, remember?)
 	},
 	framework: function (f, params) {
 		this.user_function = f;