Generalise path generation for arbitrary rooms

src/Dodge/Room/Procedural.hs

@@ -13,6 +13,7 @@ import Dodge.Data
 import Dodge.Room.Data
 import Dodge.Room.Placement
 import Dodge.Room.Link
+import Dodge.Room.Path
 import Dodge.Default.Room
 import Dodge.Item.Consumable
 import Dodge.Item.Equipment
@@ -26,9 +27,9 @@ import Geometry
 import Picture
 import Data.Tile
 
-import Data.List
-import Data.Function (on)
-import qualified Data.Tuple.Extra as Tup
+--import Data.List
+--import Data.Function (on)
+--import qualified Data.Tuple.Extra as Tup
 import qualified Data.Map as M
 import Control.Lens
 import Control.Monad
@@ -73,29 +74,7 @@ Creates a rectangular room, automatically creates links and pathfinding graph at
 roomRectAutoLinks :: Float -> Float -> Room
 roomRectAutoLinks x y = roomRect x y ((ceiling x - 40) `div` 60) ((ceiling y - 40) `div` 60)
 
-makeGrid :: Float -> Int -> Float -> Int -> [(Point2,Point2)]
-makeGrid x nx y ny 
-    = nub 
-    . concatMap doublePair 
-    . concatMap (\p -> map (Tup.both (p +.+)) $ makeRect x y)
-    $ gridPoints x nx y ny
 
-gridPoints :: Float -> Int -> Float -> Int -> [Point2]
-gridPoints x nx y ny = [V2 a b | a <- take nx $ scanl (+) 0 $ repeat x
-                              , b <- take ny $ scanl (+) 0 $ repeat y
-                       ]
-
-makeRect :: Float -> Float -> [(Point2,Point2)]
-makeRect x y = map (bimap toV2 toV2) [((0,0),(x,0))
-               ,((0,0),(0,y))
-               ,((x,y),(x,0))
-               ,((x,y),(0,y))
-               ]
-
-linksAndPath :: [(Point2,Float)] -> [(Point2,Point2)] -> [(Point2,Point2)]
-linksAndPath lnks subpth = subpth ++ concatMap linkClosest lnks
-  where 
-    linkClosest (p,_) = doublePair (p, minimumBy (compare `on` dist p) $ map fst subpth)
 {- Combines two rooms into one room.
 Combines into one big bound, concatenates the rest.  -}
 combineRooms :: Room -> Room -> Room