From 984dafab748fa591583e011815c0da77535113b1 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 16 Mar 2019 00:55:26 -0400 Subject: simplify further --- shelves.hs | 7 ++----- 1 file 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 { shelfSideDimX :: Inches } -shelves' :: Shelf -> [(V3 Double, V3 Double)] -shelves' Shelf{..} = [(p, V3 shelfLength shelfWidth shelfThickness) | p <- shelvesPos] +modelShelf :: Shelf -> Model3d +modelShelf Shelf{..} = transBoxes [(p, V3 shelfLength shelfWidth shelfThickness) | p <- shelvesPos] where shelfHeight = sum shelfHeights + (shelfThickness * (fromIntegral (length shelfHeights) + 1)) @@ -45,9 +45,6 @@ myShelf = Shelf { shelfSideDimX = 0.5 } -modelShelf :: Shelf -> Model3d -modelShelf = transBoxes . shelves' - data BunkBed = BunkBed { bunkBedWidth :: Inches, bunkBedLength :: Inches, -- cgit v1.2.3