2 files changed, 56 insertions, 12 deletions

@@ -0,0 +1,56 @@
+-- Alternate implementation of Map with functions
+
+module Fallen.FunMap
+( Map,
+  emptyMap,
+  dimension,
+  inBounds,
+  getTileAtPos,
+  findTileInMap,
+  updateMap,
+  legalMoves,
+  fillMapRect
+) where
+  import Fallen.Tiles
+  import Fallen.Point
+  import Data.List
+  import Fallen.Util
+  import Data.Maybe
+  
+  data Map = Map {
+    dimension :: (Int, Int),
+    mapdata :: Point -> Tile,
+    background :: Tile
+    }
+  
+  -- emptyMap :: Int -> Int -> Tile -> Map
+  emptyMap w h t = Map { dimension=(w,h), mapdata=(\p -> t), background=t }
+  
+  -- inBounds :: Map -> Point -> Bool
+  inBounds m (x,y) = let (w,h) = dimension m in (x >= 0) && (x < w) && (y >= 0) && (y < h)
+  
+  -- getTileAtPos :: Map -> Point -> Tile
+  getTileAtPos m p = if (inBounds m p)
+    then mapdata m p
+    else background m
+  
+  -- findTileInMap :: Map -> Tile -> [Point]
+  -- REALLY inefficient
+  findTileInMap m t = filter (\p -> t == mapdata m p) rawPoints where
+    (w,h) = dimension m
+    rawPoints = [(x,y) | x <- [0..w-1], y <- [0..h-1]]
+  
+  -- updateMap :: Point -> Tile -> Map -> Map
+  updateMap p t (Map d xs bg) = Map d (redirect p t xs) bg where
+    redirect p t xs = (\p2 -> if p == p2 then t else xs p2)
+  
+  -- legalMoves :: Map -> Point -> [Tile] -> [Direction]
+  legalMoves m p ts = map fst $ filter legal $ map tileDir directions where
+    tileDir d = (d, getTileAtPos m $ stepInDirection p d)
+    legal (_,t) = t `elem` ts
+   
+  -- fillMapRect :: Int -> Int -> Int -> Int -> Tile -> Map -> Map
+  fillMapRect x y w h t (Map d xs bg) = Map d redirectInBounds bg where
+    redirectInBounds = (\p -> if (inBounds p) then t else xs p)
+    inBounds (px,py) = (px >= x) && (px < (x+w)) && (py >= y) && (py < (y+h))
+  
\ No newline at end of file
@@ -28,15 +28,9 @@ module Fallen.Map
   inBounds m (x,y) = let (w,h) = dimension m in (x >= 0) && (x < w) && (y >= 0) && (y < h)
   
   -- getTileAtPos :: Map -> Point -> Tile
-  --getTileAtPos m p = if (inBounds m p)
-  --  then mapdata m p
-  --  else background m
   getTileAtPos m p = fromMaybe (background m) $ lookup p $ mapdata m
   
   -- findTileInMap :: Map -> Tile -> [Point]
---  findTileInMap m t = filter (\p -> t == mapdata m p) rawPoints where
---    (w,h) = dimension m
---    rawPoints = [(x,y) | x <- [0..w-1], y <- [0..h-1]]
   findTileInMap m t = map fst $ filter ((== t) . snd) $ mapdata m
   
   -- updateMap updates the tiles at the given position in the map
@@ -48,8 +42,6 @@ module Fallen.Map
     else case lookup p xs of
       Just _ -> Map d (map (\(p1,t1) -> if p1 == p then (p,t) else (p1,t1)) xs) bg
       Nothing -> Map d ((p,t):xs) bg
---  updateMap p t (Map d xs bg) = Map d (redirect p t xs) bg where
---    redirect p t xs = (\p2 -> if p == p2 then t else xs p2)
   
   -- legalMoves :: Map -> Point -> [Tile] -> [Direction]
   legalMoves m p ts = map fst $ filter legal $ map tileDir directions where
@@ -61,7 +53,3 @@ module Fallen.Map
           then Map d (filter outBounds xs) bg 
           else Map d (filter outBounds xs ++ [((px,py), t) | px <- [x..x+w-1], py <- [y..y+h-1]]) bg where
                   outBounds ((px,py),_) = (px < x) || (px >= (x+w)) || (py < y) || (py >= (y+h))
---  fillMapRect x y w h t (Map d xs bg) = Map d redirectInBounds bg where
---    redirectInBounds = (\p -> if (inBounds p) then t else xs p)
---    inBounds (px,py) = (px >= x) && (px < (x+w)) && (py >= y) && (py < (y+h))
-  
\ No newline at end of file