Start to generalise text input to "terminal signal" input

src/Dodge/Render/InfoBox.hs

@@ -4,14 +4,14 @@ module Dodge.Render.InfoBox
     ) where
 
 import Dodge.Base
-import Dodge.Data.CamPos
+import Dodge.Data.Camera
 import Dodge.Data.Config
 import Dodge.Render.Connectors
 import Dodge.Render.List
 import Geometry
 import Picture
 
-renderInfoListAt :: Float -> Float -> Configuration -> CamPos -> (Point2, [String]) -> Picture
+renderInfoListAt :: Float -> Float -> Configuration -> Camera -> (Point2, [String]) -> Picture
 renderInfoListAt x y cfig cam (p, ss) =
     renderListAt x y cfig (zip ss (repeat white))
         <> color white (lConnect (V2 (x - hw) (hh -25 - y)) (worldPosToScreen cam p))
@@ -20,7 +20,7 @@ renderInfoListAt x y cfig cam (p, ss) =
     hw = halfWidth cfig
     hh = halfHeight cfig
 
-renderInfoListsAt :: Float -> Float -> Configuration -> CamPos -> [(Point2, [String])] -> Picture
+renderInfoListsAt :: Float -> Float -> Configuration -> Camera -> [(Point2, [String])] -> Picture
 renderInfoListsAt x y cfig w =
     fst . foldr f (mempty, 0)
   where

src/Dodge/Render/Lights.hs

@@ -5,13 +5,13 @@ module Dodge.Render.Lights (
 import Data.List (sortOn)
 import Data.Maybe
 import Dodge.Data.LWorld
-import Dodge.Data.CamPos
+import Dodge.Data.Camera
 import Dodge.Data.Config
 import Geometry
 import qualified IntMapHelp as IM
 import Control.Lens
 
-lightsToRender :: Configuration -> CamPos -> LWorld -> [(Point3, Float, Point3)]
+lightsToRender :: Configuration -> Camera -> LWorld -> [(Point3, Float, Point3)]
 {-# INLINE lightsToRender #-}
 lightsToRender cfig campos w =  take (fromEnum $ cfig ^. graphics_num_shadow_casters) $
     sortOn (\(_,x,_) -> negate x) $

src/Dodge/Render/Picture.hs

@@ -76,8 +76,8 @@ mouseCursorType u
     a = fromMaybe 0 $ do
         cpos <- w ^? cWorld . lWorld . creatures . ix 0 . crPos
         return . toClosestMultiple (pi / 32) $
-            argV (mouseWorldPos (w ^. input) (w ^. cWorld . cwCamPos) -.- cpos)
-                - w ^. cWorld . cwCamPos . camRot
+            argV (mouseWorldPos (w ^. input) (w ^. cWorld . cwCam) -.- cpos)
+                - w ^. cWorld . cwCam . camRot
 
 mousePlus :: Picture
 mousePlus = pictures [line [V2 (-5) 0, V2 5 0], line [V2 0 (-5), V2 0 5]]

src/Dodge/Render/ShapePicture.hs

@@ -83,7 +83,7 @@ drawSweep cr w = fromMaybe mempty $ do
     cdir = _crDir cr
     rot = campos ^. camRot
     p = _crPos cr
-    campos = w ^. cWorld . cwCamPos
+    campos = w ^. cWorld . cwCam
     theinput = w ^. input
     mwp = mouseWorldPos theinput campos
 
@@ -134,8 +134,8 @@ shiftDraw' fpos fdir fdraw x =
 
 cullPoint :: Configuration -> World -> Point2 -> Bool
 cullPoint cfig w p
-    | debugOn Close_shape_culling cfig = pointInPolygon p (w ^. cWorld . cwCamPos . camBoundBox)
-    | otherwise = dist (w ^. cWorld . cwCamPos . camCenter) p < (w ^. cWorld . cwCamPos . camViewDistance)
+    | debugOn Close_shape_culling cfig = pointInPolygon p (w ^. cWorld . cwCam . camBoundBox)
+    | otherwise = dist (w ^. cWorld . cwCam . camCenter) p < (w ^. cWorld . cwCam . camViewDistance)
 
 extraPics :: Configuration -> Universe -> Picture
 extraPics cfig u =
@@ -243,7 +243,7 @@ drawWallsNearYou w = fromMaybe mempty $ do
 
 drawWallsNearCursor :: World -> Picture
 drawWallsNearCursor w =
-    setLayer DebugLayer $ foldMap f $ wlsNearPoint (mouseWorldPos (_input w) (_cwCamPos $ _cWorld w)) w
+    setLayer DebugLayer $ foldMap f $ wlsNearPoint (mouseWorldPos (_input w) (_cwCam $ _cWorld w)) w
   where
     f wl = color rose $ thickLine 3 [a, b]
       where
@@ -307,13 +307,13 @@ drawFarWallDetect w =
             )
         $ getViewpoints p (_cWorld w)
   where
-    p = w ^. cWorld . cwCamPos . camViewFrom
+    p = w ^. cWorld . cwCam . camViewFrom
 
 drawZoneNearPointCursor :: World -> Picture
 drawZoneNearPointCursor w =
     foldMap (drawZoneCol orange 50) ps
   where
-    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCamPos)
+    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCam)
     ps = [zoneOfPoint 50 mwp]
 
 drawDDATest :: World -> Picture
@@ -321,8 +321,8 @@ drawDDATest w =
     foldMap (drawZoneCol orange 50) ps
         <> setLayer DebugLayer (color yellow (line [cvf, mwp]))
   where
-    cvf = w ^. cWorld . cwCamPos . camViewFrom
-    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCamPos)
+    cvf = w ^. cWorld . cwCam . camViewFrom
+    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCam)
     ps = zoneOfSeg 50 cvf mwp
 
 drawZoneCol :: Color -> Float -> V2 Int -> Picture
@@ -342,7 +342,7 @@ drawWallSearchRays w = foldMap (f . fst) $ allVisibleWalls w
         setLayer DebugLayer $
             color yellow $
                 uncurryV translate p (circle 5)
-                    <> line [w ^. cWorld . cwCamPos . camViewFrom, p]
+                    <> line [w ^. cWorld . cwCam . camViewFrom, p]
 
 testPic :: Configuration -> World -> Picture
 testPic _ _ = mempty
@@ -350,7 +350,7 @@ testPic _ _ = mempty
 drawBoundingBox :: World -> Picture
 drawBoundingBox w = setLayer DebugLayer $ color green $ line $ (x : xs) ++ [x]
   where
-    (x : xs) = w ^. cWorld . cwCamPos . camBoundBox
+    (x : xs) = w ^. cWorld . cwCam . camBoundBox
 
 ppDraw :: PressPlate -> Picture
 ppDraw c = uncurryV translate (_ppPos c) $ rotate (_ppRot c) (_ppPict c)
@@ -375,7 +375,7 @@ soundPic cfig w s = fixedSizePicClampArrow 50 50 thePic p cfig (w ^. cWorld)
   where
     p = _soundPos s
     thePic =
-        rotate (w ^. cWorld . cwCamPos . camRot)
+        rotate (w ^. cWorld . cwCam . camRot)
             . scale theScale theScale
             . centerText
             . soundToOnomato
@@ -391,7 +391,7 @@ drawMousePosition w =
         . text
         $ shortPoint2 mwp
   where
-    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCamPos)
+    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . cwCam)
 
 drawWlIDs :: World -> Picture
 drawWlIDs w = setLayer FixedCoordLayer $ foldMap f (w ^. cWorld . lWorld . walls)
@@ -404,7 +404,7 @@ drawWlIDs w = setLayer FixedCoordLayer $ foldMap f (w ^. cWorld . lWorld . walls
                 . text
                 $ show $ _wlID wl
       where
-        p = worldPosToScreen (w ^. cWorld . cwCamPos) $ 0.5 *.* uncurry (+.+) (_wlLine wl)
+        p = worldPosToScreen (w ^. cWorld . cwCam) $ 0.5 *.* uncurry (+.+) (_wlLine wl)
 
 edgeToPic :: [Point2] -> PathEdge -> Picture
 edgeToPic poly pe
@@ -417,13 +417,13 @@ edgeToPic poly pe
 drawPathing :: Configuration -> World -> Picture
 drawPathing cfig w =
     setLayer DebugLayer $
-        foldMap (edgeToPic (screenPolygon cfig (w ^. cWorld . cwCamPos)) . (^?! _3)) (FGL.labEdges gr)
+        foldMap (edgeToPic (screenPolygon cfig (w ^. cWorld . cwCam)) . (^?! _3)) (FGL.labEdges gr)
             <> foldMap dispInc (graphToIncidence gr)
   where
     dispInc (p, n) = setDepth 2 . uncurryV translate p . scale 0.1 0.1 $ text $ show n
     gr = w ^. cWorld . pathGraph
 
-crDisplayInfo :: Configuration -> CamPos -> Creature -> Maybe (Point2, [String])
+crDisplayInfo :: Configuration -> Camera -> Creature -> Maybe (Point2, [String])
 crDisplayInfo cfig cam cr
     | _crID cr == 0 = Nothing
     | crOnScreen =
@@ -454,7 +454,7 @@ drawCrInfo cfig w =
         renderInfoListsAt (2 * hw - 400) 0 cfig cam $
             mapMaybe (crDisplayInfo cfig cam) $ IM.elems $ w ^. lWorld . creatures
   where
-    cam = w ^. cwCamPos
+    cam = w ^. cwCam
     hw = halfWidth cfig
 
 viewBoundaries :: CWorld -> Picture
@@ -463,7 +463,7 @@ viewBoundaries w =
         color green (foldMap (polygonWire . _grBound) grs)
             <> color yellow (foldMap (\q -> line [p, q]) $ getViewpoints p w)
   where
-    p = w ^. cwCamPos . camViewFrom
+    p = w ^. cwCam . camViewFrom
     grs = filter (pointInOrOnPolygon p . _grBound) (_cwgGameRooms $ _cwGen w)
 
 viewClipBounds :: Configuration -> World -> Picture