quick fix spacebar dishes

hull() was not working properly with such a wide bottom shape - since envelope was using a bottom square that was 6.25uX6.25u. that might spell trouble for 2x2 POS keycaps though... this should be changed to a skin() function down the line

README.md

@@ -198,9 +198,7 @@ Prints from this library are still challenging, despite all efforts to the contr
 That's it, if you have any questions feel free to open an issue or leave a comment on thingiverse!
 
 ## TODO:
- * replace linear_extrude_shape_hull with skin_extrude_shape_hull or something, to enable concave extrusions
- * replace current ISO enter shape with one that works for `skin()`
- * generate dishes via math?
+moved to [TODO doc](./TODO.md)
 
 ## Contributions welcome
 

TODO.md

@@ -1,5 +1,11 @@
 TODO:
-  * Make flat stem support default
+  * implement key_shape_at_progress which allows you to query for the exact 2d outline of the keycap at a given height
+    * this makes certain functions easier - building the envelope for instance
+    * requires breaking out shape_slice, and creating a polygon of the skin_shape_slice slices
+  * dishes add / remove height from keycaps, particularly spherical dishes
+    * a bandaid solution would be to allow you to modify where the keytop is along the progression of the keycap
+      * you can't just set a new total_depth because of how width_difference and height_difference work
+    * the true solution would be to rewrite how the dishes work to make them very graduated at the edges
   * implement regular polygon for skin extrusions
   * switch to skin-shaped extrusions by default
   * kailh choc has a non-square key unit; should I get that working for layouts etc? 

src/dishes/3d_surface.scad

@@ -6,7 +6,7 @@ module 3d_surface_dish(width, height, depth, inverted) {
   // it doesn't have to be dead reckoning for anything but sculpted sides
   // we know the angle of the sides from the width difference, height difference,
   // skew and tilt of the top. it's a pain to calculate though
-  scale_factor = 1.11;
+  scale_factor = 1.05;
   // the edges on this behave differently than with the previous dish implementations
   scale([width*scale_factor/$3d_surface_size/2,height*scale_factor/$3d_surface_size/2,depth])
     rotate([inverted ? 0:180,0,180])

src/dishes/spherical.scad

@@ -1,4 +1,8 @@
 module spherical_dish(width, height, depth, inverted){
+  // these variables take into account corner_radius and corner_sculpting, resulting in a more correct dish
+  // they don't fix the core issue though (dishes adding / subtracting height on the edges of the keycap), so I've disabled them
+  // new_width = $key_shape_type == "sculpted_square" ? width - distance_between_circumscribed_and_inscribed($corner_radius + $corner_sculpting(1)) : width;
+  // new_height = $key_shape_type == "sculpted_square" ? height - distance_between_circumscribed_and_inscribed($corner_radius + $corner_sculpting(1)) : height;
 
   //same thing as the cylindrical dish here, but we need the corners to just touch - so we have to find the hypotenuse of the top
   chord = pow((pow(width,2) + pow(height, 2)),0.5); //getting diagonal of the top

src/features/legends.scad

@@ -1,9 +1,9 @@
-module keytext(text, position, font_size, depth) {
+module keytext(text, position, font_size, font_face, depth) {
   woffset = (top_total_key_width()/3.5) * position[0];
   hoffset = (top_total_key_height()/3.5) * -position[1];
   translate([woffset, hoffset, -depth]){
     color($tertiary_color) linear_extrude(height=$dish_depth + depth){
-      text(text=text, font=$font, size=font_size, halign="center", valign="center");
+      text(text=text, font=font_face, size=font_size, halign="center", valign="center");
     }
   }
 }
@@ -12,14 +12,14 @@ module legends(depth=0) {
   if (len($front_legends) > 0) {
     front_of_key() {
       for (i=[0:len($front_legends)-1]) {
-        rotate([90,0,0]) keytext($front_legends[i][0], $front_legends[i][1], $front_legends[i][2], depth);
+        rotate([90,0,0]) keytext($front_legends[i][0], $front_legends[i][1], $front_legends[i][2], $front_legends[i][3], depth);
   	  }
     }
   }
   if (len($legends) > 0) {
     top_of_key() {
       for (i=[0:len($legends)-1]) {
-        keytext($legends[i][0], $legends[i][1], $legends[i][2], depth);
+        keytext($legends[i][0], $legends[i][1], $legends[i][2], $legends[i][3], depth);
       }
     }
   }

src/functions.scad

@@ -1,10 +1,11 @@
 include <constants.scad>
+include <settings.scad>
 
 // I use functions when I need to compute special variables off of other special variables
 // functions need to be explicitly included, unlike special variables, which
 // just need to have been set before they are used. hence this file
 
-function stem_height() = $total_depth - $dish_depth - $stem_inset;
+function stem_height() = $total_depth - ($dish_depth * ($inverted_dish ? -1 : 1))  - $stem_inset;
 
 // cherry stem dimensions
 function outer_cherry_stem(slop) = [7.2 - slop * 2, 5.5 - slop * 2];
@@ -23,6 +24,10 @@ function cherry_cross(slop, extra_vertical = 0) = [
   [1.15 + slop / 3, 4.23 + extra_vertical + slop / 3 + SMALLEST_POSSIBLE],
 ];
 
+// TODO add side_sculpting
+function key_width_at_progress(progress = 0) = $bottom_key_width + ($unit * ($key_length - 1)) - $width_difference;
+function key_height_at_progress(progress = 0) = $bottom_key_height + ($unit * ($key_height - 1)) - $height_difference + $side_sculpting(progress);
+
 // actual mm key width and height
 function total_key_width(delta = 0) = $bottom_key_width + $unit * ($key_length - 1) - delta;
 function total_key_height(delta = 0) = $bottom_key_height + $unit * ($key_height - 1) - delta;
@@ -47,3 +52,7 @@ function extra_keytop_length_for_flat_sides() = ($width_difference * vertical_in
 function add_rounding(p, radius)=[for(i=[0:len(p)-1])[p[i].x,p[i].y, radius]];
 // computes millimeter length from unit length
 function unit_length(length) = $unit * (length - 1) + 18.16;
+
+// if you have a radius of an inscribed circle, this function gives you the extra length for the radius of the circumscribed circle
+// and vice versa. used to find the edge of a rounded_square
+function distance_between_circumscribed_and_inscribed(radius) = (pow(2, 0.5) - 1) * radius;

src/key.scad

@@ -17,7 +17,7 @@ use <libraries/scad-utils/lists.scad>
 use <libraries/scad-utils/shapes.scad>
 use <libraries/skin.scad>
 
-// key shape including dish. used as the ouside and inside shape in hollow_key(). allows for itself to be shrunk in depth and width / height
+// key shape including dish. used as the outside and inside shape in hollow_key(). allows for itself to be shrunk in depth and width / height
 module shape(thickness_difference, depth_difference=0){
   dished(depth_difference, $inverted_dish) {
     color($primary_color) shape_hull(thickness_difference, depth_difference, $inverted_dish ? 200 : 0);
@@ -46,12 +46,13 @@ module minkowski_object() {
   }
 }
 
-module envelope(depth_difference=0) {
-  s = 1.5;
+module envelope(depth_difference=0, extra_floor_depth=0) {
+  size = 1.5;
+  
   hull(){
-    cube([total_key_width() * s, total_key_height() * s, 0.01], center = true);
+    translate([0,0,extra_floor_depth]) cube([key_width_at_progress(extra_floor_depth / $total_depth) * size, key_height_at_progress(extra_floor_depth / $total_depth) * size, 0.01], center = true);
     top_placement(SMALLEST_POSSIBLE + depth_difference){
-      cube([top_total_key_width() * s, top_total_key_height() * s, 0.01], center = true);
+      cube([top_total_key_width() * size, top_total_key_height() * size, 0.01], center = true);
     }
   }
 }
@@ -64,12 +65,12 @@ module dished(depth_difference = 0, inverted = false) {
     children();
     difference(){
       union() {
-        // envelope is needed to "fill in" the rest of the keycap
-        envelope(depth_difference);
+        // envelope is needed to "fill in" the rest of the keycap. intersections with small objects are much faster than differences with large objects
+        envelope(depth_difference, $stem_inset);
         if (inverted) top_placement(depth_difference) color($secondary_color) _dish(inverted);
       }
       if (!inverted) top_placement(depth_difference) color($secondary_color) _dish(inverted);
-      /* %top_placement(depth_difference) _dish(); */
+      // %top_placement(depth_difference) _dish();
     }
   }
 }
@@ -79,6 +80,7 @@ module dished(depth_difference = 0, inverted = false) {
 module _dish(inverted=$inverted_dish) {
   translate([$dish_offset_x,0,0]) color($secondary_color) 
   dish(top_total_key_width() + $dish_overdraw_width, top_total_key_height() + $dish_overdraw_height, $dish_depth, inverted);
+  // %dish(top_total_key_width() + $dish_overdraw_width, top_total_key_height() + $dish_overdraw_height, $dish_depth, inverted);
 }
 
 // puts its children at each keystem position provided
@@ -239,7 +241,7 @@ module key(inset=false) {
     };
 
     if ($inner_shape_type != "disable") {
-      translate([0,0,-SMALLEST_POSSIBLE]) {
+      translate([0,0,-SMALLEST_POSSIBLE]) { // avoids moire
         inner_total_shape();
       }
     }
@@ -249,10 +251,12 @@ module key(inset=false) {
     };
   }
 
-  // if $stem_inset is less than zero, we add the
+  // semi-hack to make sure negative inset stems don't poke through the top of the keycap
   if ($stem_inset < 0) {
-    stems_and_stabilizers();
-  }
+    dished(0, $inverted_dish) {
+      stems_and_stabilizers();
+    }
+  } 
 }
 
 // actual full key with space carved out and keystem/stabilizer connectors

src/key_profiles.scad

@@ -14,6 +14,8 @@ include <key_profiles/regular_polygon.scad>
 include <key_profiles/cherry.scad>
 include <key_profiles/dss.scad>
 include <key_profiles/asa.scad>
+include <key_profiles/typewriter.scad>
+include <key_profiles/hex.scad>
 
 // man, wouldn't it be so cool if functions were first order
 module key_profile(key_profile_type, row, column=0) {
@@ -35,6 +37,10 @@ module key_profile(key_profile_type, row, column=0) {
     hipro_row(row, column) children();
   } else if (key_profile_type == "grid") {
     grid_row(row, column) children();
+  } else if (key_profile_type == "typewriter") {
+    typewriter_row(row, column) children();
+  } else if (key_profile_type == "hex") { // reddit.com/r/MechanicalKeyboards/comments/kza7ji
+    hex_row(row, column) children();
   } else if (key_profile_type == "hexagon") {
     hexagonal_row(row, column) children();
   } else if (key_profile_type == "octagon") {

src/key_profiles/asa.scad

@@ -1,42 +1,44 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module asa_row(row=3, column = 0) {
-  $key_shape_type = "sculpted_square";
-  $bottom_key_height = 18.06;
-  $bottom_key_width = 18.05;      // Default (R3)
-  $total_depth = 10.35;           // Default (R3)
+$key_shape_type = "sculpted_square";
+  $bottom_key_height = 18.15;
+  $bottom_key_width = 18.10;      // Default (R3)
+  $total_depth = 10.75;           // Default (R3)
   $top_tilt = 1.5;                // Default (R3)
-  $width_difference = 5.05;
-  $height_difference = 5.56;
+  $width_difference = 6.20;
+  $height_difference = 6.55;
   $dish_type = "spherical";
-  $dish_depth = 1.2;
+  $dish_depth = 1.3;
   $dish_skew_x = 0;
   $dish_skew_y = 0;
   $top_skew = 1.75;
   $stem_inset = 1.2;
   $height_slices = 10;
+
   $corner_radius = 1;
+  $more_side_sculpting_factor = 0.4;
+
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2);
 
   // this is _incredibly_ intensive
   //$rounded_key = true;
 
   if (row == 1){
-    $bottom_key_width = 17.95;
-    $width_difference = 4.95;
-    $total_depth = 10.65;
-    $top_tilt = 7;
+    $total_depth = 10.5;
+    $top_tilt = 9.33;
     children();
   } else if (row == 2) {
-    $bottom_key_width = 18.17;
-    $width_difference = 5.17;
-    $total_depth = 9.65;
-    $top_tilt = 3.25;
+    $total_depth = 9.95;
+    $top_tilt = 4;
     children();
   } else if (row == 4){
-    $bottom_key_width = 18.02;
-    $width_difference = 5.02;
-    $total_depth = 11.9;
+    $total_depth = 12.55;
     $top_tilt = 0.43;
     children();
-  } else {
+  }else{
     children();
-  }
+  }  		
 }

src/key_profiles/cherry.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 // based off GMK keycap set
 
 module cherry_row(row=3, column=0) {

src/key_profiles/dcs.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module dcs_row(row=3, column=0) {
   $bottom_key_width = 18.16;
   $bottom_key_height = 18.16;

src/key_profiles/dsa.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module dsa_row(row=3, column = 0) {
   $key_shape_type = "sculpted_square";
   $bottom_key_width = 18.24; // 18.4;
@@ -11,8 +14,12 @@ module dsa_row(row=3, column = 0) {
   $dish_skew_x = 0;
   $dish_skew_y = 0;
   $height_slices = 10;
-  $enable_side_sculpting = true;
+
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2);
+  
   $corner_radius = 1;
+  $more_side_sculpting_factor = 0.4;
 
   $top_tilt_y = side_tilt(column);
   extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;

src/key_profiles/dss.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module dss_row(n=3, column=0) {
   $key_shape_type = "sculpted_square";
   $bottom_key_width = 18.24;
@@ -10,10 +13,13 @@ module dss_row(n=3, column=0) {
   $dish_skew_y = 0;
   $top_skew = 0;
   $height_slices = 10;
-  $enable_side_sculpting = true;
   // might wanna change this if you don't minkowski
   // do you even minkowski bro
   $corner_radius = 1;
+  $more_side_sculpting_factor = 0.4;
+
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2);
 
   // this is _incredibly_ intensive
   /* $rounded_key = true; */

src/key_profiles/g20.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module g20_row(row=3, column = 0) {
   $bottom_key_width = 18.16;
   $bottom_key_height = 18.16;

src/key_profiles/grid.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module grid_row(row=3, column = 0) {
   $bottom_key_width = 18.16;
   $bottom_key_height = 18.16;

src/key_profiles/hex.scad

@@ -0,0 +1,62 @@
+include <../constants.scad>
+// Regular polygon shapes CIRCUMSCRIBE the sphere of diameter $bottom_key_width
+// This is to make tiling them easier, like in the case of hexagonal keycaps etc
+
+// this function doesn't set the key shape, so you can't use it directly without some fiddling
+module hex_row(n=3, column=0) {
+  $bottom_key_width = $unit - 0.5;
+  $bottom_key_height = $unit - 0.5;
+  
+  $width_difference = 0;
+  $height_difference = 0;
+  
+  $dish_type = "spherical";
+  $key_shape_type = "hexagon";
+
+  $stem_inset = -2.5;
+  $stem_throw = 3;
+
+  // $dish_depth = 1;
+
+  $top_skew = 0;
+  $height_slices = 1;
+  $stem_support_type = "disable";
+  
+  $dish_overdraw_width = -8.25;
+  $dish_overdraw_height = -8.25;
+//   $corner_radius = 1;
+
+  // this is _incredibly_ intensive
+  /* $rounded_key = true; */
+
+  $top_tilt_y = side_tilt(column);
+  extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
+
+  base_depth = 4;
+  if (n <= 1){
+    $total_depth = base_depth + 2.5 + extra_height;
+    $top_tilt = -13;
+
+    children();
+  } else if (n == 2) {
+    $total_depth = base_depth + 0.5 + extra_height;
+    $top_tilt = -7;
+
+    children();
+  } else if (n == 3) {
+    $total_depth = base_depth + extra_height;
+    $top_tilt = 0;
+
+    children();
+  } else if (n == 4){
+    $total_depth = base_depth + 0.5 + extra_height;
+    $top_tilt = 7;
+
+    children();
+  } else {
+    $total_depth = base_depth + extra_height;
+    $top_tilt = 0;
+
+    children();
+  }
+}

src/key_profiles/hipro.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module hipro_row(row=3, column=0) {
   $key_shape_type = "sculpted_square";
 
@@ -12,7 +15,12 @@ module hipro_row(row=3, column=0) {
   $dish_skew_y = 0;
   $top_skew = 0;
   $height_slices = 10;
+
   $corner_radius = 1;
+  $more_side_sculpting_factor = 0.4;
+
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2);
 
   $top_tilt_y = side_tilt(column);
   extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;

src/key_profiles/mt3.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 // This is an imperfect attempt to clone the MT3 profile
 module mt3_row(row=3, column=0, deep_dish=false) {
   $key_shape_type = "sculpted_square";
@@ -14,11 +17,13 @@ module mt3_row(row=3, column=0, deep_dish=false) {
   $top_skew = 0;
   $height_slices = 10;
 
-  $corner_sculpting_factor = 2;
   $corner_radius = 0.0125;
-
   $more_side_sculpting_factor = 0.75;
 
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2) * 2;
+
+
   $top_tilt_y = side_tilt(column);
   extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
 

src/key_profiles/oem.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module oem_row(row=3, column = 0) {
   $bottom_key_width = 18.05;
   $bottom_key_height = 18.05;

src/key_profiles/regular_polygon.scad

@@ -1,3 +1,5 @@
+use <../functions.scad>
+include <../settings.scad>
 include <../constants.scad>
 // Regular polygon shapes CIRCUMSCRIBE the sphere of diameter $bottom_key_width
 // This is to make tiling them easier, like in the case of hexagonal keycaps etc

src/key_profiles/sa.scad

@@ -1,3 +1,6 @@
+use <../functions.scad>
+include <../settings.scad>
+
 module sa_row(n=3, column=0) {
   $key_shape_type = "sculpted_square";
   $bottom_key_width = 18.4;
@@ -10,7 +13,12 @@ module sa_row(n=3, column=0) {
   $dish_skew_y = 0;
   $top_skew = 0;
   $height_slices = 10;
+
   $corner_radius = 1;
+  $more_side_sculpting_factor = 0.4;
+
+  $side_sculpting = function(progress) (1 - progress) * 4.5;
+  $corner_sculpting = function(progress) pow(progress, 2);
 
   // this is _incredibly_ intensive
   /* $rounded_key = true; */

src/key_profiles/typewriter.scad

@@ -0,0 +1,59 @@
+use <../functions.scad>
+include <../settings.scad>
+include <../constants.scad>
+// Regular polygon shapes CIRCUMSCRIBE the sphere of diameter $bottom_key_width
+// This is to make tiling them easier, like in the case of hexagonal keycaps etc
+
+// this function doesn't set the key shape, so you can't use it directly without some fiddling
+module typewriter_row(n=3, column=0) {
+  $bottom_key_width = $unit - 0.5;
+  $bottom_key_height = $unit - 0.5;
+  $width_difference = 0;
+  $height_difference = 0;
+  $dish_type = "spherical";
+  $key_shape_type = "circular";
+  $inverted_dish = true;
+  $stem_inset = -4.5;
+  $stem_throw = 5;
+  $dish_depth = 4;
+  $dish_skew_x = 0;
+  $dish_skew_y = 0;
+  $top_skew = 0;
+  $height_slices = 1;
+  $stem_support_type = "disable";
+//   $corner_radius = 1;
+
+  // this is _incredibly_ intensive
+  /* $rounded_key = true; */
+
+  $top_tilt_y = side_tilt(column);
+  extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
+
+  base_depth = 3.5;
+  if (n <= 1){
+    $total_depth = base_depth + 2.5 + extra_height;
+    $top_tilt = -13;
+
+    children();
+  } else if (n == 2) {
+    $total_depth = base_depth + 0.5 + extra_height;
+    $top_tilt = -7;
+
+    children();
+  } else if (n == 3) {
+    $total_depth = base_depth + extra_height;
+    $top_tilt = 0;
+
+    children();
+  } else if (n == 4){
+    $total_depth = base_depth + 0.5 + extra_height;
+    $top_tilt = 7;
+
+    children();
+  } else {
+    $total_depth = base_depth + extra_height;
+    $top_tilt = 0;
+
+    children();
+  }
+}

src/key_transformations.scad

@@ -158,15 +158,17 @@ module flat_support() {
   children();
 }
 
-module legend(text, position=[0,0], size=undef) {
+module legend(text, position=[0,0], size=undef, font=undef) {
     font_size = size == undef ? $font_size : size;
-    $legends = [for(L=[$legends, [[text, position, font_size]]], a=L) a];
+    font_face = font == undef ? $font : font;
+    $legends = [for(L=[$legends, [[text, position, font_size, font_face]]], a=L) a];
     children();
 }
 
-module front_legend(text, position=[0,0], size=undef) {
+module front_legend(text, position=[0,0], size=undef, font=undef) {
     font_size = size == undef ? $font_size : size;
-    $front_legends = [for(L=[$front_legends, [[text, position, font_size]]], a=L) a];
+    font_face = font == undef ? $font : font;
+    $front_legends = [for(L=[$front_legends, [[text, position, font_size, font_face]]], a=L) a];
     children();
 }
 
@@ -206,7 +208,7 @@ module sideways() {
  * then we extend the line created by the slope of the keytop to that line
  * the angle of the latter line off the ground is $top_tilt, and
  * you can create a right triangle with the adjacent edge being $bottom_key_height/2
- * raised up $total_depth. this gets you x, the component of the extended 
+ * raised up $total_depth. this gets you x, the component of the extended
  * keytop slope line, and y, a component of the first perpendicular line.
  * by a very similar triangle you get r and s, where x is the hypotenuse of that
  * right triangle and the right angle is again against the first perpendicular line
@@ -229,7 +231,7 @@ module backside() {
   s = cos(-$top_tilt) * x;
 
   q = atan2(s, (y + b - r));
-  
+
   translate([0,0,cos(q) * total_key_height()/2])
     rotate([-90 - q, 0,0]) children();
 }
@@ -285,4 +287,4 @@ module resin() {
   $stem_inner_slop = 0;
   $stem_support_type = "disable";
   children();
-}
+}

src/key_types.scad

@@ -1,4 +1,6 @@
 include <functions.scad>
+use <key_sizes.scad>
+use <key_transformations.scad>
 
 module spacebar() {
   $inverted_dish = $dish_type != "disable";

src/layouts/hhkb/default.scad

@@ -0,0 +1,21 @@
+include <../layout.scad>
+
+hhkb_layout = [
+  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+  [1.5,1,1,1,1,1,1,1,1,1,1,1,1,1.5],
+  [1.75,1,1,1,1,1,1,1,1,1,1,1,2.25],
+  [2.25,1,1,1,1,1,1,1,1,1,1,1.75,1],
+  [-1.5,1,1.5,6,1.5,1]
+];
+
+hhkb_legends = [
+  ["Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "\\", "`"],
+  ["Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "Delete"],
+  ["Ctrl", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Return"],
+  ["Shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "Shift", "Fn"],
+  ["", "Alt", "Cmd", "", "Cmd", "Alt"],
+];
+
+module hhkb_default(profile) {
+  layout(hhkb_layout, profile, hhkb_legends) children();
+}

src/layouts/layout.scad

@@ -1,3 +1,8 @@
+use <../key_transformations.scad>
+use <../key_profiles.scad>
+use <../key_sizes.scad>
+use <../key_types.scad>
+
 // sums all values, unless a value is negative, in which case it makes it positive
 // dirty hack to allow for large gaps in keysets
 function abs_sum(list, x=0) =

src/libraries/3d_surface.scad

@@ -3,7 +3,7 @@
 include <../functions.scad>
 
 module 3d_surface(size=$3d_surface_size, step=$3d_surface_step, bottom=-SMALLEST_POSSIBLE){
-  function p(x, y) = [ x, y, max(0,$surface_function(x, y)) ];
+  function p(x, y) = [ x, y, max(0,$surface_function(x, y) * $corner_smoothing_surface_function(x,y)) ];
   function p0(x, y) = [ x, y, bottom ];
   function rev(b, v) = b ? v : [ v[3], v[2], v[1], v[0] ];
   function face(x, y) = [ p(x, y + step), p(x + step, y + step), p(x + step, y), p(x + step, y), p(x, y), p(x, y + step) ];
@@ -41,7 +41,7 @@ module polar_3d_surface(size, step, bottom=-SMALLEST_POSSIBLE){
   function p(x, y) = [
     $surface_distribution_function(to_polar(x, size), size),
     $surface_distribution_function(to_polar(y, size), size),
-    max(0,$surface_function($surface_distribution_function(to_polar(x, size), size), $surface_distribution_function(to_polar(y, size), size)))
+    max(0,$surface_function($surface_distribution_function(to_polar(x, size), size), $surface_distribution_function(to_polar(y, size), size)) * $corner_smoothing_surface_function($surface_distribution_function(to_polar(x, size), size), $surface_distribution_function(to_polar(y, size), size)))
   ];
   function p0(x, y) = [ x, y, bottom ];
   function rev(b, v) = b ? v : [ v[3], v[2], v[1], v[0] ];

src/settings.scad

@@ -76,8 +76,10 @@ $rounded_cherry_stem_d = 5.5;
 // Inset stem requires support but is more accurate in some profiles
 // can be negative to make outset stems!
 $stem_inset = 0;
-// How many degrees to rotate the stems. useful for sideways keycaps, maybe
+// How many degrees to rotate the stems. useful for sideways keycaps
 $stem_rotation = 0;
+// How many degrees to rotate the keycap, but _not_ inside features (the stem). 
+$keycap_rotation = 0;
 
 /* [Shape] */
 
@@ -195,29 +197,29 @@ $shape_facets =30;
 // "flat" / "dished" / "disable"
 $inner_shape_type = "flat";
 
-// When sculpting sides using sculpted_square, how much in should the tops come
-$side_sculpting_factor = 4.5;
-// When sculpting corners, how much extra radius should be added
-$corner_sculpting_factor = 1;
-// When doing more side sculpting corners, how much extra radius should be added
-$more_side_sculpting_factor = 0.4;
+// default side_sculpting function, linear
+$side_sculpting = function(progress) 0;
+$corner_sculpting = function(progress) 0;
+
+// you probably shouldn't touch this, it's internal to sculpted_square
+// modify side sculpting with the $side_sculpting function in the key profile files
+$more_side_sculpting_factor = 0;
 
 // 3d surface functions (still in beta)
 
 // 3d surface settings
 // unused for now
-$3d_surface_size = 20;
-// resolution in each axis. 10 = 10 divisions per x/y = 100 points total. 
-// 5 = 20 divisions per x/y
-$3d_surface_step = 1;
+$3d_surface_size = 1;
+// 3d surface point resolution. $3d_surface_size / $3d_surface_step = steps per x / y
+$3d_surface_step = 1/20;
 
 // monotonically increasing function that distributes the points of the surface mesh
 // only for polar_3d_surface right now
 // if it's linear it's a grid. sin(dim) * size concentrates detail around the edges
 sinusoidal_surface_distribution = function(dim,size) sin(dim) * size;
-linear_surface_distribution = function(dim,size) sin(dim) * size;
+linear_surface_distribution = function(dim,size) dim;
 
-$surface_distribution_function = linear_surface_distribution;
+$surface_distribution_function = sinusoidal_surface_distribution;
 
 // the function that actually determines what the surface is.
 // feel free to override, the last one wins
@@ -236,6 +238,10 @@ bumps_surface = function(x,y) sin(20*x)*cos(20*y)/3+1;
 
 $surface_function = bumps_surface; // bumps_surface;
 
+// can be used to smooth the corners of the 3d surface function, to make the dishes add / subtract less height. can really do anything it's just multiplying, but that's what I use it for
+$corner_smoothing_surface_function = function(x,y) 1;
+// $corner_smoothing_surface_function = function(x,y) (1 - pow(abs(x), 5)/$3d_surface_size) * (1 - pow(abs(y),5)/$3d_surface_size);
+
 // ripples
 /* 
 // Rosenbrock's banana

src/shapes.scad

@@ -28,6 +28,8 @@ module key_shape(size, delta, progress = 0) {
     regular_polygon_shape(size, delta, progress);
   } else if ($key_shape_type == "octagon") {
     regular_polygon_shape(size, delta, progress, sides=8);
+  } else if ($key_shape_type == "circular") {
+    regular_polygon_shape(size, delta, progress, sides=36);
   } else {
     echo("Warning: unsupported $key_shape_type");
   }

src/shapes/ISO_enter.scad

@@ -59,11 +59,11 @@ function skin_iso_enter_shape(size, delta, progress, thickness_difference) =
     add_rounding(
       iso_enter_vertices(
         size,
-        delta,
+        [delta.x - $side_sculpting(progress), delta.y - $side_sculpting(progress)],
         progress,
         thickness_difference
       ),
-      $corner_radius
+      $corner_radius + $corner_sculpting(progress)
     ),
     $shape_facets
   );

src/shapes/sculpted_square.scad

@@ -13,9 +13,9 @@ module sculpted_square_shape(size, delta, progress) {
   width_difference = delta[0];
   height_difference = delta[1];
   // makes the sides bow
-  extra_side_size =  side_sculpting(progress);
+  extra_side_size =  $side_sculpting(progress);
   // makes the rounded corners of the keycap grow larger as they move upwards
-  extra_corner_size = corner_sculpting(progress);
+  extra_corner_size = $corner_sculpting(progress);
 
   // computed values for this slice
   extra_width_this_slice = (width_difference - extra_side_size) * progress;
@@ -71,9 +71,9 @@ function skin_sculpted_square_shape(size, delta, progress, thickness_difference)
     width_difference = delta[0],
     height_difference = delta[1],
     // makes the sides bow
-    extra_side_size =  side_sculpting(progress),
+    extra_side_size =  $side_sculpting(progress),
     // makes the rounded corners of the keycap grow larger as they move upwards
-    extra_corner_size = corner_sculpting(progress),
+    extra_corner_size = $corner_sculpting(progress),
 
     // computed values for this slice
     extra_width_this_slice = (width_difference - extra_side_size) * progress,