Further strictifying

src/Dodge/Default/World.hs

@@ -8,7 +8,7 @@ import Dodge.Config.Data
 import Dodge.Config.KeyConfig
 import Dodge.Item.Data
 --import Picture
---import Geometry
+import Geometry.Data
 --import Picture.Texture
 
 import System.Random
@@ -20,10 +20,10 @@ defaultWorld :: World
 defaultWorld = World
     { _keys = S.empty
     , _mouseButtons = S.empty
-    , _cameraCenter = (0,0)
+    , _cameraCenter = (V2 0 0)
     , _cameraRot = 0
     , _cameraZoom = 1
-    , _cameraViewFrom = (0,0)
+    , _cameraViewFrom = (V2 0 0)
     , _creatures = IM.empty
     , _creaturesZone = IM.empty
     , _creatureGroups = IM.empty
@@ -40,7 +40,7 @@ defaultWorld = World
     , _floorItems = IM.empty
     , _floorTiles = []
     , _randGen = mkStdGen 2
-    , _mousePos = (0,0)
+    , _mousePos = (V2 0 0)
     , _testString = []
     , _yourID = 0
     , _worldEvents = id
@@ -54,13 +54,13 @@ defaultWorld = World
     , _menuLayers = [LevelMenu 1]
     , _worldState = M.empty
     , _worldTriggers = S.empty
-    , _clickMousePos = (0,0)
+    , _clickMousePos = (V2 0 0)
     , _pathGraph = Data.Graph.Inductive.Graph.empty
     , _pathGraph' = []
     , _pathPoints = IM.empty
     , _pathInc = M.empty
     , _carteDisplay = False
-    , _carteCenter = (0,0)
+    , _carteCenter = (V2 0 0)
     , _carteZoom = 0.5
     , _carteRot  = 0
     , _lightSources = IM.empty
@@ -68,7 +68,7 @@ defaultWorld = World
     , _closeActiveObjects = []
     , _seenLocations        = IM.fromList 
         [(0, (_crPos . you, "CURRENT POSITION"))
-        ,(1, (const (0,0) , "START POSITION"))
+        ,(1, (const (V2 0 0) , "START POSITION"))
         ]
     , _selLocation = 0
     , _keyConfig = defaultKeyConfigSDL
@@ -89,10 +89,10 @@ defaultDebugFlags = DebugFlags
     }
 youLight :: TempLightSource
 youLight = 
-    TLS { _tlsPos = (0,0,0)
+    TLS { _tlsPos = (V3 0 0 0)
         ,_tlsRad = 300
         ,_tlsIntensity = 0.1
         ,_tlsUpdate = \w _ -> (w, Just (youLight {_tlsPos = f $ _crPos (you w)}))
         }
   where
-    f (x,y) = (x,y,0)
+    f (V2 x y) = (V3 x y 0)