Cleanup, work towards allowing for placements to interact across rooms

src/Dodge/Placement/PlaceSpot.hs

@@ -3,11 +3,10 @@
 -- | deals with placement of objects within the world
 -- after they have had their coordinates set by the layout
 module Dodge.Placement.PlaceSpot
-    ( shiftPlacement
-    , shiftPointBy
-    , invShiftPointBy
-    , placeSpot
+    ( placeSpot
     ) where
+import Dodge.LevelGen.LevelStructure
+import Dodge.Placement.Shift
 import Dodge.Data
 import Dodge.Path
 import Dodge.Placement.PlaceSpot.Block
@@ -73,18 +72,7 @@ placeSpotRoomRand rm i f plmnt w =
     let (ps,g) = runState (_rmRandPSs rm !! i) $_randGen w
     in placeSpot (w & randGen .~ g,rm) (plmnt & plSpot .~ f ps)
 
-shiftPlacement :: (Point2,Float) -> Placement -> Placement
-shiftPlacement shift plmnt = case plmnt of
-    Placement {} -> plmnt & plSpot %~ shiftPSBy shift 
-        & plIDCont %~ fmap (fmap $ shiftPlacement shift)
-    PlacementUsingPos p f -> PlacementUsingPos (shiftPoint3By shift p)
-        (fmap (shiftPlacement shift) f)
-    RandomPlacement rpl -> RandomPlacement $ fmap (shiftPlacement shift) rpl
 
-shiftPSBy :: (Point2,Float) -> PlacementSpot -> PlacementSpot
-shiftPSBy (pos,rot) ps = ps
-    & psPos %~ shiftPointBy (pos,rot)
-    & psRot %~ (+ rot)
 
 -- the Int here is some id that is assigned when the placement is placed
 placeSpotID :: PlacementSpot -> PSType -> World -> (Int, World)