From 9a7740cdfbd8de0082bdbffc64b1454b202d1976 Mon Sep 17 00:00:00 2001
From: Bob <rsheldiii@gmail.com>
Date: Sun, 12 Jan 2020 19:19:30 -0500
Subject: [PATCH] double_sculpting=false turns off extra height

---
 src/key_profiles/dcs.scad           | 2 +-
 src/key_profiles/dsa.scad           | 2 +-
 src/key_profiles/g20.scad           | 2 +-
 src/key_profiles/grid.scad          | 6 ++++--
 src/key_profiles/hipro.scad         | 2 +-
 src/key_profiles/oem.scad           | 3 ++-
 src/key_profiles/sa.scad            | 2 +-
 src/layouts/lets_split/default.scad | 2 +-
 src/layouts/planck/mit.scad         | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/key_profiles/dcs.scad b/src/key_profiles/dcs.scad
index 67d3204..cc6ec8d 100644
--- a/src/key_profiles/dcs.scad
+++ b/src/key_profiles/dcs.scad
@@ -11,7 +11,7 @@ module dcs_row(row=3, column=0) {
   $top_skew = 1.75;
 
   $top_tilt_y = side_tilt(column);
-  extra_height = extra_side_tilt_height(column);
+  extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   // this dish depth should match the depth of the uberdishing in fully sculpted mode
   // but it doesn't, and it's very slight for any reasonable double sculpting
diff --git a/src/key_profiles/dsa.scad b/src/key_profiles/dsa.scad
index fee6b09..a440fa9 100644
--- a/src/key_profiles/dsa.scad
+++ b/src/key_profiles/dsa.scad
@@ -15,7 +15,7 @@ module dsa_row(row=3, column = 0) {
   $corner_radius = 0.25;
 
   $top_tilt_y = side_tilt(column);
-  extra_height = extra_side_tilt_height(column);
+  extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   depth_raisers = [0, 3.5, 1, 0, 1, 3];
   if (row < 1 || row > 4) {
diff --git a/src/key_profiles/g20.scad b/src/key_profiles/g20.scad
index 27e7d69..794da41 100644
--- a/src/key_profiles/g20.scad
+++ b/src/key_profiles/g20.scad
@@ -17,7 +17,7 @@ module g20_row(row=3, column = 0) {
   $rounded_key = true;
 
   $top_tilt_y = side_tilt(column);
-  extra_height = extra_side_tilt_height(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   $total_depth = 6 + abs((row-3) * 0.5) + extra_height;
 
diff --git a/src/key_profiles/grid.scad b/src/key_profiles/grid.scad
index e06c3e8..2528e11 100644
--- a/src/key_profiles/grid.scad
+++ b/src/key_profiles/grid.scad
@@ -21,8 +21,10 @@ module grid_row(row=3, column = 0) {
   //also,
   /* $rounded_key = true; */
 
-  $top_tilt_y = column * 3 * $double_sculpt_modifier;
-  $total_depth = 6 + abs((row-3) * 0.5);
+  $top_tilt_y = side_tilt(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
+
+  $total_depth = 6 + abs((row-3) * 0.5) + extra_height;
 
   if (row == 5 || row == 0) {
     /* $top_tilt =  -18.55; */
diff --git a/src/key_profiles/hipro.scad b/src/key_profiles/hipro.scad
index de5d6d9..f456b51 100644
--- a/src/key_profiles/hipro.scad
+++ b/src/key_profiles/hipro.scad
@@ -18,7 +18,7 @@ module hipro_row(row=3, column=0) {
   $corner_radius = 0.25;
 
   $top_tilt_y = side_tilt(column);
-  extra_height = extra_side_tilt_height(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   if (row <= 1){
     $total_depth = 13.7 + extra_height;
diff --git a/src/key_profiles/oem.scad b/src/key_profiles/oem.scad
index f961a76..cb0275b 100644
--- a/src/key_profiles/oem.scad
+++ b/src/key_profiles/oem.scad
@@ -10,7 +10,8 @@ module oem_row(row=3) {
   $top_skew = 1.75;
   $stem_inset = 1.2;
 
-  $top_tilt_y = column * 3 * $double_sculpt_modifier;
+  $top_tilt_y = side_tilt(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   if (row == 5 || row == 0) {
     $total_depth = 11.2;
diff --git a/src/key_profiles/sa.scad b/src/key_profiles/sa.scad
index 3f51c4b..ad53a43 100644
--- a/src/key_profiles/sa.scad
+++ b/src/key_profiles/sa.scad
@@ -18,7 +18,7 @@ module sa_row(n=3, column=0) {
   /* $rounded_key = true; */
 
   $top_tilt_y = side_tilt(column);
-  extra_height = extra_side_tilt_height(column);
+  extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
 
   // 5th row is usually unsculpted or the same as the row below it
   // making a super-sculpted top row (or bottom row!) would be real easy
diff --git a/src/layouts/lets_split/default.scad b/src/layouts/lets_split/default.scad
index 30602ac..e3824de 100644
--- a/src/layouts/lets_split/default.scad
+++ b/src/layouts/lets_split/default.scad
@@ -9,5 +9,5 @@ lets_split_mapping = [
 ];
 
 module lets_split_default(profile) {
-  layout(lets_split_mapping, profile, row_sculpting_offset=1);
+  layout(lets_split_mapping, profile, row_sculpting_offset=1) children();
 }
diff --git a/src/layouts/planck/mit.scad b/src/layouts/planck/mit.scad
index 681633e..fb77f2d 100644
--- a/src/layouts/planck/mit.scad
+++ b/src/layouts/planck/mit.scad
@@ -11,5 +11,5 @@ planck_layout_mapping = [
 ];
 
 module planck_mit(profile) {
-  layout(planck_layout_mapping, profile, row_sculpting_offset=1);
+  layout(planck_layout_mapping, profile, row_sculpting_offset=1) children();
 }