Refactor event/input

2021-03-26 14:52:25 +01:00
parent 420cf7fc4b
commit 07d84cc1c6
14 changed files with 91 additions and 63 deletions
@@ -38,7 +38,7 @@ import qualified Data.DList as DL
 data World = World 
    { _keys                 :: !(S.Set Scancode)
    , _mouseButtons         :: !(S.Set MouseButton)
-    , _cameraPos            :: !Point2
+    , _cameraCenter            :: !Point2
    , _cameraAimTime        :: Int
    , _cameraRot            :: !Float
    , _cameraZoom           :: !Float
@@ -65,7 +65,7 @@ data World = World
    , _sounds               :: M.Map SoundOrigin Sound
    , _decorations          :: IM.IntMap Picture
    , _corpses              :: IM.IntMap (IM.IntMap [Corpse])
-    , _lbClickMousePos      :: (Float,Float)
+    , _clickMousePos      :: (Float,Float)
    , _lbRotation           :: Float
    , _pathGraph            :: ~(Gr Point2 Float)
    , _pathGraph'           :: ~[(Point2,Point2)]