Cleanup warnings

src/Dodge/Render/Picture.hs

@@ -64,7 +64,7 @@ clDraw c = uncurry translate (_clPos c) (_clPict c c)
 wallFloorsToDraw :: World -> [Wall]
 wallFloorsToDraw w = filter isVisible $ IM.elems $ wallsOnScreen w
   where 
-    onScreen wall = lineOnScreen w ((\(a,b) -> [a,b]) $ _wlLine wall)
+    onScreen wall = uncurry (lineOnScreen w) $ _wlLine wall
     isVisible wl 
         | wl ^? blVisible == Just False = False
         | otherwise = onScreen wl
@@ -98,12 +98,12 @@ outsideScreenPolygon w = [tr,tl,bl,br]
   where 
     scRot  = rotateV (_cameraRot w)
     scZoom p | _cameraZoom w /= 0 = (1/_cameraZoom w) *.* p
+             | otherwise = error "Trying to set screen zoom to zero"
     scTran p = p +.+ _cameraCenter w
     tr = scTran $ scRot $ scZoom (  3*halfWidth w  , 3* halfHeight w) 
     tl = scTran $ scRot $ scZoom (- (3*halfWidth w), 3* halfHeight w) 
     br = scTran $ scRot $ scZoom (   3*halfWidth w ,- (3* halfHeight w))
     bl = scTran $ scRot $ scZoom (- (3*halfWidth w),- (3* halfHeight w))
-    x = halfWidth w + halfHeight w
 
 wallShadowsToDraw :: World -> [Wall]
 wallShadowsToDraw w = filter (fromMaybe True . (^? blVisible)) 
@@ -112,8 +112,8 @@ wallShadowsToDraw w = filter (fromMaybe True . (^? blVisible))
 
 -- cannot only test if walls are on screen, but also if they are on the cone
 -- towards the center of sight
-lineOnScreenCone :: World -> [Point2] -> Bool
-lineOnScreenCone w (p1:p2:_) = errorPointInPolygon 8 p1 sp || errorPointInPolygon 9 p2 sp 
+lineOnScreenCone :: World -> Point2 -> Point2 -> Bool
+lineOnScreenCone w p1 p2 = errorPointInPolygon 8 p1 sp || errorPointInPolygon 9 p2 sp 
                                                 || any (isJust . uncurry (intersectSegSeg' p1 p2)) sps
   where 
     sp' = screenPolygon w
@@ -123,8 +123,8 @@ lineOnScreenCone w (p1:p2:_) = errorPointInPolygon 8 p1 sp || errorPointInPolygo
     sps = zip sp (tail sp ++ [head sp])
 
 
-lineOnScreen :: World -> [Point2] -> Bool
-lineOnScreen w (p1:p2:_) = errorPointInPolygon 8 p1 sp || errorPointInPolygon 9 p2 sp 
+lineOnScreen :: World -> Point2 -> Point2 -> Bool
+lineOnScreen w p1 p2 = errorPointInPolygon 8 p1 sp || errorPointInPolygon 9 p2 sp 
                                                 || any (isJust . uncurry (intersectSegSeg' p1 p2)) sps
   where 
     sp = screenPolygon w
@@ -156,17 +156,19 @@ extendConeToScreenEdge w c (x,y) = orderPolygon $ wallScreenIntersect ++ [x,y] +
     wallScreenIntersect = mapMaybe (uncurry $ intersectSegSeg' y ((2*.*y) -.- x)) 
                               . makeLoopPairs $ screenPolygon w
 
+rectangleSolid :: Float -> Float -> Picture
 rectangleSolid x y = polygon [(x,y),(x,-y),(-x,-y),(-x,y)]
 
 drawItem :: FloorItem -> Picture
-drawItem flIt = uncurry translate (_flItPos flIt) 
-                    $ rotate (_flItRot flIt)  (_itFloorPict (_flIt flIt))
+drawItem flit = uncurry translate (_flItPos flit) 
+                    $ rotate (_flItRot flit)  (_itFloorPict (_flIt flit))
 
 
 ffToDraw :: World -> [ForceField]
-ffToDraw w = filter (lineOnScreen w . _ffLine) $
-                IM.elems $ over ffLine (map ( -.- _cameraCenter w)) <$> 
-                _forceFields w
+ffToDraw _ = []
+--    filter (lineOnScreen w . _ffLine) $
+--                IM.elems $ over ffLine (map ( -.- _cameraCenter w)) <$> 
+--                _forceFields w
 
 drawFF :: ForceField -> Picture
 drawFF FF{_ffLine = l, _ffColor = col} = pictures 
@@ -179,14 +181,12 @@ drawFFShadow w ff
     | youOnFF   = []
     | otherwise = map (rotate ( _cameraRot w) . pane) [0,0.05..0.25]
   where 
-    p = rotateV (-_cameraRot w) ypShift
     x = rotateV (-_cameraRot w) x'
     y = rotateV (-_cameraRot w) y'
     yp = _crPos $ you w
     (x1:y1:_) = _ffLine ff
     (x':y':_) | isRHS x1 y1 yp = [y1,x1]
               | otherwise      = [x1,y1]
-    fCol = color (_ffColor ff)
     col = _ffColor ff
     ypShift = yp -.- _cameraCenter w
     youOnFF = circOnSeg x' y' ypShift (_crRad $ you w)