diff options
| author | Tom Short <tshort.rlists@gmail.com> | 2017-03-05 07:59:35 -0500 |
|---|---|---|
| committer | Tom Short <tshort.rlists@gmail.com> | 2017-03-05 07:59:35 -0500 |
| commit | d10c36c709bb98e44b84a3a88b589dab0765cfae (patch) | |
| tree | 6fc7ab772595d72c5057a35948b528f34aee0746 | |
| parent | dfc58c1b6c0f9eb1667222c3c855181e53241831 (diff) | |
Fix border discontinuities
| -rw-r--r-- | src/dactyl_keyboard/dactyl-manuform.clj | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/src/dactyl_keyboard/dactyl-manuform.clj b/src/dactyl_keyboard/dactyl-manuform.clj index 9f88ea0..0891c0e 100644 --- a/src/dactyl_keyboard/dactyl-manuform.clj +++ b/src/dactyl_keyboard/dactyl-manuform.clj @@ -371,37 +371,27 @@ (defn bottom-hull [& p] (hull p (bottom 10.001 p))) - -(def upper-brace-multiplier -4) - (defn wall-brace [place1 dx1 dy1 post1 place2 dx2 dy2 post2] (union (hull (place1 post1) - (place1 (scale [1 1 -3] post1)) - (place1 (translate [(* dx1 5) (* dy1 5) 0] (scale [1 1 -3] post1))) + (place1 (translate [0 0 -15] post1)) + (place1 (translate [(* dx1 5) (* dy1 5) -4] post1)) + (place1 (translate [(* dx1 5) (* dy1 5) -15] post1)) (place2 post2) - (place2 (scale [1 1 -3] post2)) - (place2 (translate [(* dx2 5) (* dy2 5) 0] (scale [1 1 -3] post2))) - ) + (place2 (translate [0 0 -15] post2)) + (place2 (translate [(* dx2 5) (* dy2 5) -4] post2)) + (place2 (translate [(* dx2 5) (* dy2 5) -15] post2))) (bottom-hull (place1 (translate [(* dx1 5) (* dy1 5) -15] post1)) (place1 (translate [0 0 -15] post1)) (place1 (translate [(* dx1 5) (* dy1 5) -15] post1)) (place2 (translate [0 0 -15] post2)) - (place2 (translate [(* dx2 5) (* dy2 5) -15] post2)) - ) - ; (hull - ; (translate [0 0 -19] (place1 (translate [0 0 -15] post1))) - ; (translate [0 0 -19] (place2 (translate [0 0 -15] post2))) - ; (place1 (translate [(* dx1 5) (* dy1 5) -15] post1)) - ; (place1 (translate [0 0 -15] post1)) - ; (place1 (translate [(* dx1 5) (* dy1 5) -15] post1)) - ; (place2 (translate [0 0 -15] post2)) - ; (place2 (translate [(* dx1 5) (* dy1 5) -15] post2)) - )) - -(defn key-wall-brace [x1 y1 dx1 dy1 post1 x2 y2 dx2 dy2 post2] (wall-brace (partial key-place x1 y1) dx1 dy1 post1 (partial key-place x2 y2) dx2 dy2 post2)) + (place2 (translate [(* dx2 5) (* dy2 5) -15] post2))))) + +(defn key-wall-brace [x1 y1 dx1 dy1 post1 x2 y2 dx2 dy2 post2] + (wall-brace (partial key-place x1 y1) dx1 dy1 post1 + (partial key-place x2 y2) dx2 dy2 post2)) (def case-walls (union |