Cleanup warnings

src/Dodge/WallCreatureCollisions.hs

@@ -20,9 +20,9 @@ colCrWall :: World -> Creature -> Creature
 colCrWall w c 
     | p1 == p2  = pushOrCrush ls c
     | otherwise = c & crPos %~
-        collideCorners rad p1 wallPoints
+        collideCorners rad wallPoints
         . collideWalls rad p1 ls 
-        . checkPushThroughs rad p1 ls 
+        . checkPushThroughs p1 ls 
   where 
     rad = _crRad c + wallBuffer
     p1  = _crOldPos c
@@ -39,27 +39,28 @@ colCrWall w c
 -- -- probably best to push check pushing through walls before creature springs
 
 -- the amount to push creatures out from walls, extra to their radius
+wallBuffer :: Float
 wallBuffer = 0
 
 -- the following tests whether or not a point is on a wall, and if so pushes it
 -- out from the wall
 -- this is then repeated if the point ends up on a new wall
 collideWalls :: Float -> Point2 -> [(Point2,Point2)] -> Point2 -> Point2
-collideWalls rad cp1 walls cp2 = case (listToMaybe.mapMaybe (pushOutFromWall rad cp2)) walls of
+collideWalls rad cp1 wls cp2 = case (listToMaybe.mapMaybe (pushOutFromWall rad cp2)) wls of
     Nothing -> cp2
-    Just cp3 -> case (listToMaybe.reverse.mapMaybe (pushOutFromWall rad cp3)) walls of
+    Just cp3 -> case (listToMaybe.reverse.mapMaybe (pushOutFromWall rad cp3)) wls of
         Nothing -> cp3
         Just cp4 -> 0.5 *.* (cp4 +.+ cp1)
 
 -- pushes a point out from a list of walls
 -- if multiple new points occur, chooses the one closest to the orignal point
 pushOutFromWalls :: Float -> [(Point2,Point2)] -> Point2 -> Point2
-pushOutFromWalls rad walls p = 
+pushOutFromWalls rad wls p = 
     fromMaybe p
     . listToMaybe
     . sortBy (compare `on` dist p)
     $ mapMaybe (pushOutFromWall rad p) 
-    walls
+    wls
 
 pushOrCrush :: [(Point2,Point2)] -> Creature -> Creature
 pushOrCrush wls cr = case mapMaybe (pushOutFromWall (_crRad cr) cpos) wls of
@@ -81,8 +82,6 @@ pushOutFromWall rad cp2 (wp1,wp2)
     wp2' = (rad *.* norm) +.+ wp2
     newP = errorClosestPointOnLine 5 wp1' wp2' cp2
     isOnWall = circOnSegNoEndpoints wp1 wp2 cp2 rad
-    isJust Nothing = False
-    isJust _       = True
 
 pushOutFromCorners :: World -> Creature -> Creature
 pushOutFromCorners w cr = cr & crPos .~ newPos
@@ -90,8 +89,8 @@ pushOutFromCorners w cr = cr & crPos .~ newPos
     newPos = foldr (intersectCirclePoint (_crRad cr)) (_crPos cr) ls
     ls  = nub . concatMap (\(x,y) -> [x,y]) . IM.elems $ _wlLine <$> wallsNearPoint (_crPos cr) w
 
-collideCorners :: Float -> Point2 -> [Point2] -> Point2 -> Point2
-collideCorners rad p1 ps p2 = foldr (intersectCirclePoint rad) p2 ps
+collideCorners :: Float -> [Point2] -> Point2 -> Point2
+collideCorners rad ps p2 = foldr (intersectCirclePoint rad) p2 ps
 
 -- collide circles with points (outer corners)
 intersectCirclePoint :: Float -> Point2 -> Point2 -> Point2
@@ -99,19 +98,17 @@ intersectCirclePoint rad p cCen
     | dist cCen p > rad = cCen
     | otherwise         = p +.+ (rad *.* errorNormalizeV 65 (cCen -.- p))
 
-checkPushThroughs :: Float -> Point2 -> [(Point2,Point2)] -> Point2 -> Point2
-checkPushThroughs rad cp1 walls cp2
-    = fromMaybe cp2 $ (listToMaybe.mapMaybe (checkPushThrough rad cp1 cp2)) walls
+checkPushThroughs :: Point2 -> [(Point2,Point2)] -> Point2 -> Point2
+checkPushThroughs cp1 wls cp2
+    = fromMaybe cp2 $ (listToMaybe.mapMaybe (checkPushThrough cp1 cp2)) wls
 
-checkPushThrough :: Float -> Point2 -> Point2 -> (Point2,Point2) -> Maybe Point2
-checkPushThrough  rad cp1 cp2 (wp1,wp2) 
+checkPushThrough :: Point2 -> Point2 -> (Point2,Point2) -> Maybe Point2
+checkPushThrough cp1 cp2 (wp1,wp2) 
     | isPushedThrough = intersectSegSeg' cp1 cp2 wp1 wp2
     | otherwise = Nothing
   where
-    norm = errorNormalizeV 61 $ vNormal (wp1 -.- wp2)
-    wp1' = (rad *.* norm) +.+ wp1
-    wp2' = (rad *.* norm) +.+ wp2
-    newP = errorClosestPointOnLine 5 wp1' wp2' cp2
+    --norm = errorNormalizeV 61 $ vNormal (wp1 -.- wp2)
+    --wp1' = (rad *.* norm) +.+ wp1
+    --wp2' = (rad *.* norm) +.+ wp2
+    --newP = errorClosestPointOnLine 5 wp1' wp2' cp2
     isPushedThrough = isRHS wp1 wp2 cp2 && isJust (intersectSegSeg' cp1 cp2 wp1 wp2)
-    isJust Nothing = False
-    isJust _       = True