Move configuration from world to universe

src/Dodge/Event.hs

@@ -51,9 +51,10 @@ handleEvent e = case eventPayload e of
 
 handleMouseMotionEvent :: MouseMotionEventData -> Universe -> Maybe Universe
 handleMouseMotionEvent mmev u = Just $ u & uvWorld . mousePos .~ V2
-    (fromIntegral x - 0.5*getWindowX w)
-    (0.5*getWindowY w - fromIntegral y)
+    (fromIntegral x - 0.5*getWindowX cfig)
+    (0.5*getWindowY cfig - fromIntegral y)
   where 
+    cfig = _config u
     w = _uvWorld u
     P (V2 x y) = mouseMotionEventPos mmev
 
@@ -68,23 +69,23 @@ handleMouseButtonEvent mbev u = case mouseButtonEventMotion mbev of
 {- | Sets window position in config. -}
 handleWindowMoveEvent :: WindowMovedEventData -> Universe -> Maybe Universe
 handleWindowMoveEvent mev u = Just $ u 
-    & uvWorld . config . windowPosX .~ fromIntegral x
-    & uvWorld . config . windowPosY .~ fromIntegral y
+    & config . windowPosX .~ fromIntegral x
+    & config . windowPosY .~ fromIntegral y
   where
     P (V2 x y) = windowMovedEventPosition mev
 
 {- | Resets the world window size, and resizes the fbo that gets the light map drawn into it. -}
 handleResizeEvent :: WindowSizeChangedEventData -> Universe -> Maybe Universe
 handleResizeEvent sev u = Just $ u
-    & uvWorld . config . windowX .~ fromIntegral x
-    & uvWorld . config . windowY .~ fromIntegral y
+    & config . windowX .~ fromIntegral x
+    & config . windowY .~ fromIntegral y
     & uvWorld . sideEffects %~ sideEffectUpdatePreload divRes x y
   where 
     w = _uvWorld u
     x = fromIntegral x'
     y = fromIntegral y'
     V2 x' y' = windowSizeChangedEventSize sev
-    divRes = w ^. config . resolution_factor
+    divRes = u ^. config . resolution_factor
 
 handlePressedMouseButton :: MouseButton -> Universe -> Maybe Universe
 handlePressedMouseButton but w