Commit before static wall overhaul

src/Dodge/Base.hs

@@ -15,7 +15,7 @@ import Dodge.Base.Zone
 import Dodge.Base.Window
 import Dodge.Base.Collide
 import Geometry
-import Picture
+--import Picture
 import qualified IntMapHelp as IM
 
 import Control.Lens
@@ -287,6 +287,17 @@ collideCircWalls' p1 p2 rad ws
 -- unfortunately, doesn't allow for collisions when the circle spawns on the
 -- wall
 
+-- | Looks for first collision of a point with a list of lines.
+-- If found, gives point and normal of wall.
+collidePointLines :: Point2 -> Point2 -> [Wall'] -> Maybe (Point2,Point2)
+collidePointLines p1 p2 ws 
+    = listToMaybe 
+    . sortOn f
+    $ mapMaybe (( \(x,y) -> intersectSegSeg' p1 p2 x y <&> ( , vNormal $ x -.- y ) ) 
+        . _wlLine') ws
+  where 
+    f (a,_) = magV (p1 -.- a)
+
 -- | Looks for first collision of a point with walls.
 -- If found, gives point and normal of wall.
 collidePointWallsNorm :: Point2 -> Point2 -> IM.IntMap Wall -> Maybe (Point2,Point2)
@@ -298,32 +309,6 @@ collidePointWallsNorm p1 p2 ws
         . _wlLine) ws
   where 
     f (a,_) = magV (p1 -.- a)
-{- | Looks for first collision of a point with walls.
-If found, gives point and colour of wall.
--}
-collidePointWallsCol :: Point2 -> Point2 -> IM.IntMap Wall -> Maybe (Point2,Color)
-collidePointWallsCol p1 p2 ws 
-    = listToMaybe 
-    . sortOn f 
-    . IM.elems 
-    $ IM.mapMaybe ( (\(m, c) -> m <&> (, c))
-        . (\w -> (uncurry (intersectSegSeg' p1 p2) (_wlLine w), _wlColor w))) ws
-  where 
-    f (a,_) = magV (p1 -.- a)
-{- | Looks for first collision of a point with walls.
-If found, gives point, and normal and colour of wall.
--}
-collidePointWallsNormCol :: Point2 -> Point2 -> IM.IntMap Wall -> Maybe (Point2,Point2,Color)
-collidePointWallsNormCol p1 p2 ws 
-    = listToMaybe 
-    . sortOn f 
-    . IM.elems 
-    $ IM.mapMaybe m ws
-  where 
-    f (a,_,_) = magV $ p1 -.- a
-    m w = 
-        let (x,y) = _wlLine w
-        in intersectSegSeg' p1 p2 x y <&> (, vNormal (x -.- y), _wlColor w)
 -- | Returns the first creature, if any, that a point intersects with.
 collidePointCreatures :: Point2 -> Point2 -> World -> Maybe Int
 collidePointCreatures p1 p2 w