X-Git-Url: http://git.scottworley.com/nt3d/blobdiff_plain/88dc31f49b9a356855456a1e182d88f284430c96..refs/heads/master:/medusa.html?ds=sidebyside

diff --git a/medusa.html b/medusa.html
index e82d9e5..d96ec35 100644
--- a/medusa.html
+++ b/medusa.html
@@ -3,36 +3,48 @@
     <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_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);
+        var widen_scale = params.widen_amount / (Math.exp(params.widen_sharpness) - 1);
+        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 + widen_scale * Math.exp(finger_progress * params.widen_sharpness);
+          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 < 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;
-            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_num, ring_radius, finger_angle));
           }
         }
 
         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_twirl_period", 2, "Finger Twirl Period (1=same, 2=alternating)"],
+                    ["finger_height", 100],
+                    ["widen_sharpness", 2, "Widen Sharpness (0=disable widening)"],
+                    ["widen_amount", 30]];
     </script>
   </head>
   <body onload="nt3d.framework(medusa, params)">