X-Git-Url: http://git.scottworley.com/nt3d/blobdiff_plain/3bafa9bd82dbcd125a75e796f8b78ab63a560422..e06a4a20a8c49061c64714bf718061b5d695ef35:/medusa.html

diff --git a/medusa.html b/medusa.html
index 69ea3ba..9bd3dc7 100644
--- a/medusa.html
+++ b/medusa.html
@@ -3,35 +3,44 @@
     <title>Medusa</title>
     <script type="text/javascript" src="nt3d.js"></script>
     <script type="text/javascript">
+      function finger(params, finger_crosssection, ring_num, ring_radius, finger_angle) {
+        var path = [];
+        var twirl_amplitute = Math.cos((ring_num * 2 * Math.PI) / params.finger_twirl_period);
+        var twirl_angle = twirl_amplitute * params.finger_twirl_distance / (ring_radius * 2 * Math.PI);
+        for (var finger_point = 0; finger_point <= params.finger_points; finger_point++) {
+          var finger_progress = finger_point / params.finger_points;
+          var angle = (finger_angle + twirl_angle * finger_progress) * 2 * Math.PI;
+          var r = ring_radius;
+          var x = r * Math.cos(angle);
+          var y = r * Math.sin(angle);
+          var z = params.finger_height * finger_progress;
+          path.push([x, y, z]);
+        }
+        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 = [];
         for (var ring_num = 0; ring_num < params.num_rings; ring_num++) {
           var ring_radius = params.first_ring_radius + ring_num * params.ring_spacing;
-          for (var finger_num = 0; finger_num < params.num_fingers; finger_num++) {
-            var finger_angle = finger_num / params.num_fingers;
-            var path = [];
-            for (var finger_point = 0; finger_point <= params.finger_points; finger_point++) {
-              var angle = (finger_angle + params.finger_twirl * 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]);
-            }
-            var finger = nt3d.extrude(path, finger_crosssection, [0, 0, 1], nt3d.pathnormals_from_point(path, [0, 0, 0]));
-            fingers = fingers.concat(finger);
+          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;
+            fingers = fingers.concat(finger(params, finger_crosssection, ring_num, ring_radius, finger_angle));
           }
         }
 
         return fingers;
       }
       var params = [["first_ring_radius", 20],
-                    ["num_rings", 10],
+                    ["num_rings", 4],
                     ["ring_spacing", 10, "Space Between Rings"],
-                    ["num_fingers", 5],
+                    ["finger_spacing", 10],
                     ["finger_radius", 3],
-                    ["finger_faces", 5],
+                    ["finger_faces", 3],
                     ["finger_points", 20],
-                    ["finger_twirl", .1, "Finger Twirl (in turns)"],
+                    ["finger_twirl_distance", 50],
+                    ["finger_twirl_period", 2, "Finger Twirl Period (1=same, 2=alternating)"],
                     ["finger_height", 100]];
     </script>
   </head>