fix minkowski top_placement and additive artisans

Fix preonic_default example

README.md

@@ -25,7 +25,19 @@ If you are technically inclined at all, this is definitely the best way to run t
 
 First, you'll need OpenSCAD: http://www.openscad.org/downloads.html. I highly recommend installing the development snapshot, as they generally support more features and are relatively stable. Development snapshots are listed in their own section on the downloads page.
 
-After you have openSCAD installed, you need to download the code and run it. running `git clone https://github.com/rsheldiii/KeyV2.git` if you have git, or downloading [this zip](https://github.com/rsheldiii/KeyV2/archive/master.zip) and extracting the directory should do it. Then all you need to do is open `keys.scad` with openSCAD and you are set! It is possible to edit this project with an external editor by checking off Design => 'Automatic Reload and Preview' in OpenSCAD.
+After you have openSCAD installed, you need to download the code and run it. running `git clone https://github.com/rsheldiii/openSCAD-projects.git` if you have git, or downloading [this zip](https://github.com/rsheldiii/openSCAD-projects/archive/master.zip) and extracting the directory should do it. 
+
+To make your own key, all you need to do is open `keys.scad` with openSCAD and modify this line:
+
+```
+dcs_row(5) legend("⇪", size=9) key();
+``` 
+
+To be whatever you want. For example, this is for a ctrl key on an OEM keyboard:  
+
+```u(1.25) oem_row(3) legend("ctrl", size=4.5) key();```
+
+It is possible to edit this project with an external editor by checking off Design => 'Automatic Reload and Preview' in OpenSCAD.
 
 All examples below assume you are running the library on your computer with OpenSCAD.
 

TODO.md

@@ -1,6 +1,5 @@
 TODO:
   * Make flat stem support default
-  * make flat inner shape default
   * support repositioning to print on the back surface of the keycap
   * implement regular polygon for skin extrusions
   * switch to skin-shaped extrusions by default

customizer.scad

@@ -3534,7 +3534,7 @@ module rounded_cherry_stem(depth, slop, throw) {
 
     // inside cross
     // translation purely for aesthetic purposes, to get rid of that awful lattice
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }
 // a safe theoretical distance between two vertices such that they don't collapse. hard to use
@@ -3734,7 +3734,7 @@ module box_cherry_stem(depth, slop, throw) {
     }
 
     // inside cross
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }
 module alps_stem(depth, slop, throw){
@@ -4098,12 +4098,12 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference() {
       cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "box_cherry") {
     difference() {
@@ -4113,7 +4113,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference() {
@@ -4123,7 +4123,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if(stem_type == "choc") {
     translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {
@@ -4372,7 +4372,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -4392,13 +4392,13 @@ module tines_support(stem_type, stem_support_height, slop) {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "alps"){
     centered_tines(stem_support_height);
@@ -6086,7 +6086,6 @@ module shape(thickness_difference, depth_difference=0){
   }
 }
 
-// Not currently used due to CGAL errors. Rounds the shape via minkowski
 module rounded_shape() {
   color($primary_color) minkowski(){
     // half minkowski in the z direction
@@ -6175,9 +6174,9 @@ module top_placement(depth_difference=0) {
   top_tilt_by_height = -$top_tilt / $key_height;
   top_tilt_y_by_length = $double_sculpted ? (-$top_tilt_y / $key_length) : 0;
 
-  minkowski_height = $rounded_key ? $minkowski_radius : 0;
+  // minkowski_height = $rounded_key ? $minkowski_radius : 0;
 
-  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference + minkowski_height/2]){
+  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference]){
     rotate([top_tilt_by_height, top_tilt_y_by_length,0]){
       children();
     }
@@ -6297,7 +6296,9 @@ module outer_total_shape(inset=false) {
 // takes all the bits and glues them together. requires configuration with special variables.
 module key(inset=false) {
   difference(){
-    outer_total_shape(inset);
+    outer_total_shape(inset) {
+      children();
+    };
 
     if ($inner_shape_type != "disable") {
       translate([0,0,-SMALLEST_POSSIBLE]) {

keys.scad

@@ -17,4 +17,4 @@ dcs_row(5) legend("⇪", size=9) key();
 } */
 
 // example layout
-/* preonic_default("dcs"); */
+/* preonic_default("dcs") key(); */

src/key.scad

@@ -24,7 +24,6 @@ module shape(thickness_difference, depth_difference=0){
   }
 }
 
-// Not currently used due to CGAL errors. Rounds the shape via minkowski
 module rounded_shape() {
   color($primary_color) minkowski(){
     // half minkowski in the z direction
@@ -113,9 +112,9 @@ module top_placement(depth_difference=0) {
   top_tilt_by_height = -$top_tilt / $key_height;
   top_tilt_y_by_length = $double_sculpted ? (-$top_tilt_y / $key_length) : 0;
 
-  minkowski_height = $rounded_key ? $minkowski_radius : 0;
+  // minkowski_height = $rounded_key ? $minkowski_radius : 0;
 
-  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference + minkowski_height/2]){
+  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference]){
     rotate([top_tilt_by_height, top_tilt_y_by_length,0]){
       children();
     }
@@ -235,7 +234,9 @@ module outer_total_shape(inset=false) {
 // takes all the bits and glues them together. requires configuration with special variables.
 module key(inset=false) {
   difference(){
-    outer_total_shape(inset);
+    outer_total_shape(inset) {
+      children();
+    };
 
     if ($inner_shape_type != "disable") {
       translate([0,0,-SMALLEST_POSSIBLE]) {

src/stem_supports/brim.scad

@@ -16,12 +16,12 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference() {
       cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "box_cherry") {
     difference() {
@@ -31,7 +31,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference() {
@@ -41,7 +41,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if(stem_type == "choc") {
     translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {

src/stem_supports/tines.scad

@@ -47,7 +47,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -67,13 +67,13 @@ module tines_support(stem_type, stem_support_height, slop) {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "alps"){
     centered_tines(stem_support_height);

src/stems/box_cherry.scad

@@ -11,6 +11,6 @@ module box_cherry_stem(depth, slop, throw) {
     }
 
     // inside cross
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }

src/stems/rounded_cherry.scad

@@ -7,6 +7,6 @@ module rounded_cherry_stem(depth, slop, throw) {
 
     // inside cross
     // translation purely for aesthetic purposes, to get rid of that awful lattice
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }

yarn.lock

@@ -445,12 +445,12 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-props@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz#93bb1cadfafd31da5bb8a9d4b41f471ec3a72dfe"
-  integrity sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
+  integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
   dependencies:
-    each-props "^1.3.0"
-    is-plain-object "^2.0.1"
+    each-props "^1.3.2"
+    is-plain-object "^5.0.0"
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -538,7 +538,7 @@ duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-each-props@^1.3.0:
+each-props@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
   integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
@@ -1178,6 +1178,11 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"