Name r

[nt3d] / medusa.html

diff --git a/medusa.html b/medusa.html
index 87e9301b9d7723652f06a77ea3e425b74e9a59d9..9bd3dc7e877d95d8d0ede976d5365b56d2ec0f8a 100644 (file)
--- a/medusa.html
+++ b/medusa.html
@@ -3,15 +3,18 @@
     <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 finger(params, finger_crosssection, ring_radius, finger_angle) {
+      function finger(params, finger_crosssection, ring_num, ring_radius, finger_angle) {

         var path = [];
         var path = [];

-        var twirl_angle = params.finger_twirl_distance / (ring_radius * 2 * Math.PI);
-        console.log(twirl_angle);
+        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++) {
         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]);
+          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]));
       }
         }
         return nt3d.extrude(path, finger_crosssection, [0, 0, 1], nt3d.pathnormals_from_point(path, [0, 0, 0]));
       }


@@ -23,7 +26,7 @@
           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 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_radius, finger_angle));
+            fingers = fingers.concat(finger(params, finger_crosssection, ring_num, ring_radius, finger_angle));

           }
         }
 
           }
         }
 


@@ -37,6 +40,7 @@
                     ["finger_faces", 3],
                     ["finger_points", 20],
                     ["finger_twirl_distance", 50],
                     ["finger_faces", 3],
                     ["finger_points", 20],
                     ["finger_twirl_distance", 50],

+                    ["finger_twirl_period", 2, "Finger Twirl Period (1=same, 2=alternating)"],

                     ["finger_height", 100]];
     </script>
   </head>
                     ["finger_height", 100]];
     </script>
   </head>