X-Git-Url: http://git.scottworley.com/nt3d/blobdiff_plain/fc382d22506415e4c481587aad501e25b96f11ba..72eac64d07af484314745fd0e9466e0f94915684:/torus_by_extrude.html

diff --git a/torus_by_extrude.html b/torus_by_extrude.html
index 323ad14..10ae92e 100644
--- a/torus_by_extrude.html
+++ b/torus_by_extrude.html
@@ -3,19 +3,18 @@
     <title>Torus by extrude</title>
     <script type="text/javascript" src="nt3d.js"></script>
     <script type="text/javascript">
-      function torus_by_extrude(torus_radius, cross_section_radius, long_steps, short_steps) {
-      	var cross_section = nt3d.circle(cross_section_radius, short_steps);
+      function torus_by_extrude(torus_radius, cross_section_radius, rotation, long_steps, short_steps) {
       	var path = nt3d.circle(torus_radius, long_steps);
-      	var cross_section_normals = nt3d.rotate_about_origin(path, [0,0,1], Math.PI/2);
-      	var path_normals = [];
-      	path_normals.length = long_steps;
-      	for (var i = 0; i < long_steps; i++) {
-      		path_normals[i] = [0, 0, 1];
-      	}
-      	return nt3d.closed_extrude(cross_section, path, cross_section_normals, path_normals);
+      	path = nt3d.rotate_about_origin(path, [0,1,0], rotation * 2*Math.PI);
+      	return nt3d.closed_extrude(
+      	  path,
+	  nt3d.circle(cross_section_radius, short_steps),
+	  nt3d.shapenormals_from_closed_path(path),
+	  [0, 0, 1]);
       }
       var params = [["Torus radus", 100],
                     ["Cross section radius", 40],
+                    ["Rotation (turns)", 0.001],
                     ["Steps around the long way", 50],
                     ["Steps around the short way", 16]];
     </script>