Assorted changes, cleanup menu selection text

2022-04-25 23:27:39 +01:00
parent 67e6c4a5bd
commit fa8d8b5899
22 changed files with 217 additions and 108 deletions
@@ -14,11 +14,10 @@ worldPosToScreenNorm cfig w = doWindowScale cfig . doRotate . doZoom . doTransla
 - These have to be scaled according to the size of the window to get actual screen positions.
 - This allows for line thicknesses etc to correspond to pixel sizes.-}
 worldPosToScreen :: World -> Point2 -> Point2
-worldPosToScreen w = doRotate . doZoom . doTranslate
-  where
-    doTranslate p       = p -.- _cameraCenter w
-    doZoom p            = _cameraZoom w *.* p
-    doRotate p          = rotateV (negate $ _cameraRot w) p
+worldPosToScreen w 
+    = rotateV (negate $ _cameraRot w) 
+    . (_cameraZoom w *.*)
+    . (-.- _cameraCenter w)
 {- | Transform coordinates from the map position to screen
 coordinates.  -}
 cartePosToScreen :: Configuration -> World -> Point2 -> Point2