Use a params object rather than loose arguments

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

index e82d9e53e75ba13949961beae30a1059c9c22031..69ea3ba39594dfb892b94b6816356b9d873f1d09 100644 (file)
--- a/medusa.html
+++ b/medusa.html
@@ -3,19 +3,19 @@
      <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 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 finger_num = 0; finger_num < num_fingers; finger_num++) {
-            var finger_angle = finger_num / num_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 = [];
              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;
+            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);
                var x = ring_radius * Math.cos(angle);
                var y = ring_radius * Math.sin(angle);
-              path.push([x, y, finger_height * finger_point / finger_points]);
+              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 finger = nt3d.extrude(path, finger_crosssection, [0, 0, 1], nt3d.pathnormals_from_point(path, [0, 0, 0]));
              fingers = fingers.concat(finger);
@@ -24,15 +24,15 @@
  
          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", 10],
+                    ["ring_spacing", 10, "Space Between Rings"],
+                    ["num_fingers", 5],
+                    ["finger_radius", 3],
+                    ["finger_faces", 5],
+                    ["finger_points", 20],
+                    ["finger_twirl", .1, "Finger Twirl (in turns)"],
+                    ["finger_height", 100]];
      </script>
    </head>
    <body onload="nt3d.framework(medusa, params)">
      </script>
    </head>
    <body onload="nt3d.framework(medusa, params)">