Twirl a fixed distance; inner rings twirl tighter

[nt3d] / medusa.html
diff --git a/medusa.html b/medusa.html

index e82d9e53e75ba13949961beae30a1059c9c22031..87e9301b9d7723652f06a77ea3e425b74e9a59d9 100644 (file)
--- a/medusa.html
+++ b/medusa.html
@@ -3,36 +3,41 @@
      <title>Medusa</title>
      <script type="text/javascript" src="nt3d.js"></script>
      <script type="text/javascript">
      <title>Medusa</title>
      <script type="text/javascript" src="nt3d.js"></script>
      <script type="text/javascript">
-      function medusa(first_ring_radius, num_rings, ring_spacing, num_fingers, finger_radius, finger_faces, finger_points, finger_twirl, finger_height) {
-        var finger_crosssection = nt3d.circle(finger_radius, finger_faces);
+      function finger(params, finger_crosssection, ring_radius, finger_angle) {
+        var path = [];
+        var twirl_angle = params.finger_twirl_distance / (ring_radius * 2 * Math.PI);
+        console.log(twirl_angle);
+        for (var finger_point = 0; finger_point <= params.finger_points; finger_point++) {
+          var angle = (finger_angle + twirl_angle * finger_point / params.finger_points) * 2 * Math.PI;
+          var x = ring_radius * Math.cos(angle);
+          var y = ring_radius * Math.sin(angle);
+          path.push([x, y, params.finger_height * finger_point / params.finger_points]);
+        }
+        return nt3d.extrude(path, finger_crosssection, [0, 0, 1], nt3d.pathnormals_from_point(path, [0, 0, 0]));
+      }
+      function medusa(params) {
+        var finger_crosssection = nt3d.circle(params.finger_radius, params.finger_faces);
          var fingers = [];
          var fingers = [];
-        for (var ring_num = 0; ring_num < num_rings; ring_num++) {
-          var ring_radius = first_ring_radius + ring_num * ring_spacing;
+        for (var ring_num = 0; ring_num < params.num_rings; ring_num++) {
+          var ring_radius = params.first_ring_radius + ring_num * params.ring_spacing;
+          var num_fingers = Math.round((ring_radius * 2 * Math.PI) / params.finger_spacing);
            for (var finger_num = 0; finger_num < num_fingers; finger_num++) {
              var finger_angle = finger_num / num_fingers;
            for (var finger_num = 0; finger_num < num_fingers; finger_num++) {
              var finger_angle = finger_num / num_fingers;
-            var path = [];
-            for (var finger_point = 0; finger_point <= finger_points; finger_point++) {
-              var angle = (finger_angle + finger_twirl * finger_point / finger_points) * 2 * Math.PI;
-              var x = ring_radius * Math.cos(angle);
-              var y = ring_radius * Math.sin(angle);
-              path.push([x, y, finger_height * finger_point / finger_points]);
-            }
-            var finger = nt3d.extrude(path, finger_crosssection, [0, 0, 1], nt3d.pathnormals_from_point(path, [0, 0, 0]));
-            fingers = fingers.concat(finger);
+            fingers = fingers.concat(finger(params, finger_crosssection, ring_radius, finger_angle));
            }
          }
  
          return fingers;
        }
            }
          }
  
          return fingers;
        }
-      var params = [["First ring radius", 20],
-                    ["Number of rings", 10],
-                    ["Space between rings", 10],
-                    ["Number of fingers", 5],
-                    ["Finger radius", 3],
-                    ["Finger faces", 5],
-                    ["Finger points", 20],
-                    ["Finger twirl (in turns)", .1],
-                    ["Finger height", 100]];
+      var params = [["first_ring_radius", 20],
+                    ["num_rings", 4],
+                    ["ring_spacing", 10, "Space Between Rings"],
+                    ["finger_spacing", 10],
+                    ["finger_radius", 3],
+                    ["finger_faces", 3],
+                    ["finger_points", 20],
+                    ["finger_twirl_distance", 50],
+                    ["finger_height", 100]];
      </script>
    </head>
    <body onload="nt3d.framework(medusa, params)">
      </script>
    </head>
    <body onload="nt3d.framework(medusa, params)">