Put config/targeting pictures in sensible places, tweak main loop

src/Dodge/Render/ShapePicture.hs

@@ -1,6 +1,7 @@
 module Dodge.Render.ShapePicture
     ( worldSPic
     ) where
+import Dodge.Creature.Picture.Awareness
 import Dodge.ShortShow
 import Dodge.Config.Data
 import Dodge.Render.InfoBox
@@ -25,6 +26,7 @@ import Sound.Data
 import Geometry.ConvexPoly
 --import Dodge.Base.Collide
 
+--import Data.Foldable
 import qualified Data.IntMap.Strict as IM -- Lazy?
 import qualified Data.Map.Strict as M
 import Control.Lens
@@ -33,22 +35,26 @@ import qualified Streaming.Prelude as S
 
 -- TODO only filter out shapes outside the range of the furthest shown light source
 worldSPic :: Configuration -> World -> SPic
-worldSPic cfig w = 
-    (mempty, extraPics cfig w)
-    --(mempty, extraPics cfig w)
+worldSPic cfig w = (mempty, extraPics cfig w)
     <> foldMap (dbArg _prDraw) (filtOn _prPos _props)
     <> foldMap (shiftDraw _blPos _blDir _blDraw) (filtOn _blPos _blocks)
     <> foldMap (shiftDraw _fsPos _fsDir (const _fsSPic)) (filtOn _fsPos _shapes)
---    <> foldMap (\fs -> uncurryV translateSPf (_fsPos fs) . rotateSP (_fsDir fs) $ _fsSPic fs) (_shapes w)
     <> foldMap (dbArg _cpPict) (filtOn _cpPos _corpses)
-    <> foldMap ((($ w) . ($ cfig)) . dbArg _crPict) (filtOn _crPos _creatures)
+    <> foldMap (dbArg _crPict) (filtOn _crPos _creatures)
     <> foldMap floorItemSPic (filtOn _flItPos _floorItems)
     <> foldMap btSPic (filtOn _btPos _buttons)
     <> foldMap mcSPic (filtOn _mcPos _machines)
+    <> anyTargeting cfig w
   where
     filtOn f g = IM.filter (pointIsClose . f) (g w)
     pointIsClose = cullPoint cfig w
 
+anyTargeting :: Configuration -> World -> SPic
+anyTargeting cfig w = (mempty,pictures $ IM.elems $ IM.mapMaybe f $ _crInv cr)
+  where
+    cr = you w
+    f it = fmap (\g -> g it cr cfig w) (it ^? itTargeting . tgDraw)
+
 shiftDraw :: (a -> Point2) -> (a -> Float) -> (a -> a -> SPic) -> a -> SPic
 shiftDraw fpos fdir fdraw x = uncurryV translateSPf (fpos x)
     . rotateSP (fdir x)
@@ -80,14 +86,18 @@ extraPics cfig w = pictures (_decorations w)
     <> cfigdraw Show_bound_box (const drawBoundingBox)
     <> cfigdraw Show_wall_search_rays (const drawWallSearchRays)
     <> cfigdraw Show_dda_test (const drawDDATest)
-    <> cfigdraw Show_far_wall_detect (const drawFarWallDetect)
-    <> cfigdraw Show_select          (const drawWorldSelect)
-    <> cfigdraw Inspect_wall         (const drawInspectWalls)
+    <> cfigdraw Show_far_wall_detect    (const drawFarWallDetect)
+    <> cfigdraw Show_select             (const drawWorldSelect)
+    <> cfigdraw Inspect_wall            (const drawInspectWalls)
+    <> cfigdraw Cr_awareness            (const drawCreatureDisplayTexts)
   where
     cfigdraw boption draw
         | debugOn boption cfig = draw cfig w
         | otherwise = mempty
 
+drawCreatureDisplayTexts :: World -> Picture
+drawCreatureDisplayTexts w = foldMap (creatureDisplayText w) (_creatures w)
+
 drawInspectWalls :: World -> Picture
 drawInspectWalls w = foldMap (drawInspectWall w) 
     $ filter (isJust . uncurry (intersectSegSeg a b) . _wlLine)
@@ -113,9 +123,12 @@ drawWorldSelect w = setLayer DebugLayer . color cyan
     (a,b) = _wSelect w
 
 drawFarWallDetect :: World -> Picture
-drawFarWallDetect w = setLayer DebugLayer . color yellow 
-    . concatMap (\q -> line [p,q]) 
-    . map (\q -> fst $ collidePoint p q $ S.filter wlIsOpaque $ wallsAlongLine p q w)
+drawFarWallDetect w = setLayer DebugLayer 
+    . color yellow 
+    . concatMap (\q -> line 
+        [ p
+        , fst $ collidePoint p q $ S.filter wlIsOpaque $ wallsAlongLine p q w
+        ]   )
     $ runIdentity $ S.toList_ $ streamViewpoints p w
   where
     p = _cameraViewFrom w