Use a params object rather than loose arguments

[nt3d] / serrated.html

diff --git a/serrated.html b/serrated.html
index 99de7ed54b2e19b5f9de81d4a165f73496914a2e..f688d5d2688cdf1e04ef5ddfbfd977e8e7d888d0 100644 (file)
--- a/serrated.html
+++ b/serrated.html
@@ -3,42 +3,42 @@
     <title>Serrated</title>
     <script type="text/javascript" src="nt3d.js"></script>
     <script type="text/javascript">
     <title>Serrated</title>
     <script type="text/javascript" src="nt3d.js"></script>
     <script type="text/javascript">

-      function serrated(length, thickness, depth, serration_count, arc, steps_per_serration, edge_bevel_angle) {
+      function serrated(params) {

         var tau = 2 * Math.PI;
         var tau = 2 * Math.PI;

-        var path_length = serration_count * steps_per_serration;
+        var path_length = params.num_serrations * params.steps_per_serration;

         var path = [];
         for (var i = 0; i <= path_length; i++) {
         var path = [];
         for (var i = 0; i <= path_length; i++) {

-          path[i] = [length*i/path_length,0,0];
+          path[i] = [params.length*i/path_length,0,0];

         }
         }

-        var serration_length = length / serration_count;
+        var serration_length = params.length / params.num_serrations;

         var serration_half_length = serration_length / 2;
         var serration_half_length = serration_length / 2;

-        var serration_radius = serration_half_length / Math.sin(tau * arc / 2);
+        var serration_radius = serration_half_length / Math.sin(tau * params.arc / 2);

         var serration_max_height = Math.sqrt(serration_radius*serration_radius - serration_half_length*serration_half_length);
         // This emits a Sabre Grind.  TODO: Support a double bevel.
         // http://en.wikipedia.org/wiki/Grind#Typical_grinds
         // http://www.allaboutpocketknives.com/images/aapk_content/blade_bevel.JPG
         var serration_max_height = Math.sqrt(serration_radius*serration_radius - serration_half_length*serration_half_length);
         // This emits a Sabre Grind.  TODO: Support a double bevel.
         // http://en.wikipedia.org/wiki/Grind#Typical_grinds
         // http://www.allaboutpocketknives.com/images/aapk_content/blade_bevel.JPG

-        var edge_height = thickness / (2 * Math.tan(tau * edge_bevel_angle));
+        var edge_height = params.thickness / (2 * Math.tan(tau * params.edge_bevel_angle));

         function shape(i) {
         function shape(i) {

-          var serration_progress = (i % steps_per_serration) / steps_per_serration;
+          var serration_progress = (i % params.steps_per_serration) / params.steps_per_serration;

           var serration_x = serration_progress * serration_length - serration_half_length;
           var serration_height = serration_max_height - Math.sqrt(serration_radius*serration_radius - serration_x*serration_x);
           var serration_x = serration_progress * serration_length - serration_half_length;
           var serration_height = serration_max_height - Math.sqrt(serration_radius*serration_radius - serration_x*serration_x);

-          if (arc < 0) serration_height *= -1;
-          var blade_height = depth + serration_height;
-          return [[0,                          0,           0],
-                  [blade_height - edge_height, 0,           0],
-                  [blade_height,               thickness/2, 0],
-                  [blade_height - edge_height, thickness,   0],
-                  [0,                          thickness,   0]];
+          if (params.arc < 0) serration_height *= -1;
+          var blade_height = params.depth + serration_height;
+          return [[0,                          0,                  0],
+                  [blade_height - edge_height, 0,                  0],
+                  [blade_height,               params.thickness/2, 0],
+                  [blade_height - edge_height, params.thickness,   0],
+                  [0,                          params.thickness,   0]];

         }
        return nt3d.extrude(path, shape, [1,0,0], [0,0,1]);
       }
         }
        return nt3d.extrude(path, shape, [1,0,0], [0,0,1]);
       }

-      var params = [["Blade length", 100],
-                    ["Blade thickness", 2],
-                    ["Blade depth", 10],
-                    ["Number of serrations", 10],
-                    ["Arc of each serration (in turns)", .2],
-                    ["Steps per serration", 11],
-                    ["Edge bevel angle (in turns)", .05]];
+      var params = [["length", 100, ],
+                    ["thickness", 2],
+                    ["depth", 10],
+                    ["num_serrations", 10],
+                    ["arc", .2, "Arc of Each Serration (in turns)"],
+                    ["steps_per_serration", 11],
+                    ["edge_bevel_angle", .05, "Edge Bevel Angle (in turns)"]];

     </script>
   </head>
   <body onload="nt3d.framework(serrated, params)">
     </script>
   </head>
   <body onload="nt3d.framework(serrated, params)">