summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-03-16 00:55:26 -0400
committerAndrew Cady <d@jerkface.net>2019-03-16 00:55:26 -0400
commit984dafab748fa591583e011815c0da77535113b1 (patch)
treecd1fd34868ab21c7893f6201f80105f74d572e1d
parent52529d8c43bcb7561731505982d35b75b090a640 (diff)
simplify further
-rw-r--r--shelves.hs7
1 files changed, 2 insertions, 5 deletions
diff --git a/shelves.hs b/shelves.hs
index 2428015..6cd0f4c 100644
--- a/shelves.hs
+++ b/shelves.hs
@@ -22,8 +22,8 @@ data Shelf = Shelf {
22 shelfSideDimX :: Inches 22 shelfSideDimX :: Inches
23} 23}
24 24
25shelves' :: Shelf -> [(V3 Double, V3 Double)] 25modelShelf :: Shelf -> Model3d
26shelves' Shelf{..} = [(p, V3 shelfLength shelfWidth shelfThickness) | p <- shelvesPos] 26modelShelf Shelf{..} = transBoxes [(p, V3 shelfLength shelfWidth shelfThickness) | p <- shelvesPos]
27 where 27 where
28 shelfHeight = sum shelfHeights + (shelfThickness * (fromIntegral (length shelfHeights) + 1)) 28 shelfHeight = sum shelfHeights + (shelfThickness * (fromIntegral (length shelfHeights) + 1))
29 29
@@ -45,9 +45,6 @@ myShelf = Shelf {
45 shelfSideDimX = 0.5 45 shelfSideDimX = 0.5
46} 46}
47 47
48modelShelf :: Shelf -> Model3d
49modelShelf = transBoxes . shelves'
50
51data BunkBed = BunkBed { 48data BunkBed = BunkBed {
52 bunkBedWidth :: Inches, 49 bunkBedWidth :: Inches,
53 bunkBedLength :: Inches, 50 bunkBedLength :: Inches,