Refactor event handling. Allow mouse movement in menus

src/Dodge/Update.hs

@@ -1,5 +1,10 @@
-module Dodge.Update where
--- imports {{{
+{- |
+Module      : Dodge.Update
+Description : Simulation update
+-}
+module Dodge.Update 
+    ( update
+    ) where
 import Dodge.Data
 import Dodge.Base
 import Dodge.WallCreatureCollisions
@@ -8,7 +13,6 @@ import Dodge.Update.Camera
 import Dodge.Update.UsingInput
 import Dodge.SoundLogic
 import Dodge.Inventory
-
 import Geometry
 
 import Data.List
@@ -17,12 +21,11 @@ import Data.Function
 import qualified Data.Set as S
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Map as M
-
 import Control.Lens
-
-
--- }}}
-
+{- | The update step.
+If the '_menuState' is not 'InGame', this is the identity.
+This means that the only way to change the world is using event handling.
+ -}
 update :: World -> World
 update w 
     | _menuState w /= InGame = w
@@ -35,7 +38,6 @@ update w
                                       . updateBlocks -- . zoning 
                                       . updateSeenWalls 
                                       . updateSoundQueue
---                                      . updateUsingInput
                                       $ updateCloseObjects w
             in  checkEndGame . ppEvents 
                              . updateCamera
@@ -45,22 +47,15 @@ update w
                              . wallEvents
                              . set worldEvents id 
                              $ _worldEvents w1 w1
-  where -- zoning w = set wallsZone (IM.foldr wallInZone IM.empty (_walls w))
-          --               w
-          -- wallInZone wl | dist (_wlLine wl !! 0) (_wlLine wl !! 1) <= 2*zoneSize 
-          --                   = insertIMInZone x y wlid wl
-          --               | otherwise = flip (foldr (\(a,b) -> insertIMInZone a b wlid wl)) ips
-          --   where (x,y) = zoneOfPoint $ (pHalf (_wlLine wl !! 0) (_wlLine wl !! 1))
-          --         wlid  = _wlID wl
-          --         ips = map zoneOfPoint $ divideLine (2*zoneSize) (_wlLine wl !! 0) (_wlLine wl !! 1)
-          zoneCreatures = set creaturesZone (IM.foldr creatureInZone IM.empty (_creatures w))
-          creatureInZone cr = insertIMInZone x y cid cr
-            where (x,y) = zoneOfPoint $ _crPos cr
-                  cid = _crID cr
-          zoneClouds = set cloudsZone (IM.foldr cloudInZone IM.empty (_clouds w))
-          cloudInZone cr = insertIMInZone x y cid cr
-            where (x,y) = zoneOfPoint $ _clPos cr
-                  cid = _clID cr
+  where 
+    zoneCreatures = set creaturesZone (IM.foldr creatureInZone IM.empty (_creatures w))
+    creatureInZone cr = insertIMInZone x y cid cr
+      where (x,y) = zoneOfPoint $ _crPos cr
+            cid = _crID cr
+    zoneClouds = set cloudsZone (IM.foldr cloudInZone IM.empty (_clouds w))
+    cloudInZone cr = insertIMInZone x y cid cr
+      where (x,y) = zoneOfPoint $ _clPos cr
+            cid = _clID cr
 
 updateSoundQueue = set soundQueue []
                     . set sounds M.empty
@@ -72,7 +67,6 @@ updateProjectiles w = IM.foldr' _pjUpdate w $ _projectiles w
 
 updateParticles' :: World -> World
 updateParticles' w = 
-    --set particles' [] w
     set particles' (catMaybes ps) w'
   where 
     (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _particles' w