Refactor, try to limit dependencies

src/Dodge/Placement/Instance/Block.hs

@@ -1,26 +1,28 @@
 module Dodge.Placement.Instance.Block where
-import Dodge.Data
-import Geometry
-import Color
-import LensHelp
-import Dodge.Default.Wall
-import Dodge.Default.Block
 
---decoratedBlock :: (Block -> Shape) -> Material -> Color -> Float -> [Point2] -> PSType
+import Color
+import Dodge.Data.GenWorld
+import Dodge.Default.Block
+import Dodge.Default.Wall
+import Geometry
+import LensHelp
+
 decoratedBlock :: BlSh -> Material -> Color -> Float -> [Point2] -> PSType
 decoratedBlock decf mat col h ps = PutBlock bl wl $ reverse ps
   where
-    bl = defaultBlock
-        & blDraw .~ BlockDraws [BlockDrawColHeightPoss col h (reverse ps),BlockDrawBlSh decf]
+    bl =
+        defaultBlock
+            & blDraw .~ BlockDraws [BlockDrawColHeightPoss col h (reverse ps), BlockDrawBlSh decf]
             --(\bl' -> noPic (colorSH col (upperPrismPoly h $ reverse ps) <> decf bl'))
-        & blHeight .~ h
-        & blMaterial .~ mat
-    wl = defaultWall 
-        & wlColor .~ col 
-        & wlRotateTo .~ False  
-        & wlOpacity .~ SeeAbove
-        & wlMaterial .~ mat
-        & wlHeight .~ h
+            & blHeight .~ h
+            & blMaterial .~ mat
+    wl =
+        defaultWall
+            & wlColor .~ col
+            & wlRotateTo .~ False
+            & wlOpacity .~ SeeAbove
+            & wlMaterial .~ mat
+            & wlHeight .~ h
 
 lowBlock :: Material -> Color -> Float -> [Point2] -> PSType
 lowBlock = decoratedBlock BlShMempty