Mid strictifying

src/Dodge/LevelGen/Switch.hs

@@ -5,6 +5,7 @@ import Dodge.SoundLogic
 import Dodge.Picture.Layer
 import Picture
 import Geometry
+import Geometry.Data
 
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
@@ -14,7 +15,7 @@ makeButton
     -> Button
 makeButton c eff = Button
     { _btPict = setLayer 0 . onLayer WlLayer $ color c $ polygon $ rectNSEW 5 (-5) 10 (-10)
-    , _btPos = (0,0)
+    , _btPos = (V2 0 0)
     , _btRot = 0
     , _btEvent = \b w -> eff . over buttons (IM.adjust turnOn (_btID b))
 --                                . set (buttons . ix (_btID b) . btPict) 
@@ -38,7 +39,7 @@ makeSwitch
     -> Button
 makeSwitch c effOn effOff = Button
     { _btPict = offPict
-    , _btPos = (0,0)
+    , _btPos = (V2 0 0)
     , _btRot = 0
     , _btEvent = flipSwitch
     , _btID = 0
@@ -53,11 +54,11 @@ makeSwitch c effOn effOff = Button
         _ -> error "Trying to switch a button with no label"
     offPict = setLayer 0 . onLayer WlLayer $ color c $ pictures [--translate (-8) 4 $ circleSolid 5
                               polygon $ rectNSEW (-2) (-5) (-10) 10
-                              ,polygon [(-2,-5),(-10,4),(-6,4),(2,-5)]
+                              ,polygon $ map toV2 [(-2,-5),(-10,4),(-6,4),(2,-5)]
                              ]
     onPict  = setLayer 0 . onLayer WlLayer $ color c $ pictures [--translate (8) 4 $ circleSolid 5
                               polygon $ rectNSEW (-2) (-5) (-10) 10
-                              ,polygon [(-2,-5), (6,4),( 10,4),(2,-5)]
+                              ,polygon $ map toV2 [(-2,-5), (6,4),( 10,4),(2,-5)]
                              ]
     turnOn :: Button -> Button
     turnOn bt = bt