More strictifiiiying

src/Dodge/Creature/Inanimate.hs

@@ -17,7 +17,7 @@ import Dodge.WorldEvent.Sound
 import Dodge.Creature.Update hiding (CRUpdate)
 import Picture
 import qualified IntMapHelp as IM
---import Geometry
+import Geometry.Data
 import Geometry.Vector3D
 import Polyhedra
 
@@ -36,7 +36,7 @@ lamp h = defaultInanimate
     }
 lampPic :: Float -> Picture
 lampPic h = pictures
-    [ setLayer 0 $ pictures . map (helpPoly3D . map ((, blue) . (-.-.- (2.5,2.5,0)))) $ boxXYZ 5 5 (h-1)
+    [ setLayer 0 $ pictures . map (helpPoly3D . map ((, blue) . (-.-.- (V3 2.5 2.5 0)))) $ boxXYZ 5 5 (h-1)
     , setLayer 1 $ setDepth h $ color white $ circleSolid 3
     ]
 
@@ -44,8 +44,8 @@ initialiseLamp :: Float -> CRUpdate
 initialiseLamp h w (f,g) cr = ( (addLS . f , g), Just $ cr & crUpdate .~ updateLamp h i)
   where
     i = IM.newKey $ _lightSources $ f w -- to give different lights different keys
-    addLS = over lightSources (IM.insert i (lightAt (x,y,h) i))
-    (x,y) = _crPos cr
+    addLS = over lightSources (IM.insert i (lightAt (V3 x y h) i))
+    (V2 x y) = _crPos cr
 
 updateLamp :: Float -> Int -> CRUpdate
 updateLamp h i = unrandUpdate handleLS internalUpdate
@@ -56,7 +56,7 @@ updateLamp h i = unrandUpdate handleLS internalUpdate
         | otherwise    = w & lightSources . ix i . lsPos .~ f cPos
       where
         cPos = _crPos cr
-        f (x,y) = (x,y,h)
+        f (V2 x y) = (V3 x y h)
     internalUpdate cr 
         | _crHP cr < 0 = Nothing
         | otherwise    = Just $ doDamage cr