Camera position refactor
This commit is contained in:
@@ -12,7 +12,7 @@ import Geometry
|
||||
findBoundDists :: Configuration -> World -> (Float, Float, Float, Float)
|
||||
findBoundDists cfig w
|
||||
| debugOn Bound_box_screen cfig = (hh, - hh, hw, - hw)
|
||||
| otherwise = fromMaybe (0, 0, 0, 0) $ farWallDistDirection (w ^. cWorld . lWorld . cwCam . cwcCenter) w
|
||||
| otherwise = fromMaybe (0, 0, 0, 0) $ farWallDistDirection (w ^. cWorld . lWorld . camPos . camCenter) w
|
||||
where
|
||||
hw = halfWidth cfig
|
||||
hh = halfHeight cfig
|
||||
@@ -20,9 +20,9 @@ findBoundDists cfig w
|
||||
updateBounds :: Universe -> Universe
|
||||
updateBounds uv =
|
||||
uv
|
||||
& uvWorld . cWorld . lWorld . cwCam . cwcBoundDist .~ bdists
|
||||
& uvWorld . cWorld . lWorld . cwCam . cwcBoundBox
|
||||
.~ map ((+.+ w ^. cWorld . lWorld . cwCam . cwcCenter) . rotateV (w ^. cWorld . lWorld . cwCam . cwcRot)) (rectNSWE n s w' e)
|
||||
& uvWorld . cWorld . lWorld . camPos . camBoundDist .~ bdists
|
||||
& uvWorld . cWorld . lWorld . camPos . camBoundBox
|
||||
.~ map ((+.+ w ^. cWorld . lWorld . camPos . camCenter) . rotateV (w ^. cWorld . lWorld . camPos . camRot)) (rectNSWE n s w' e)
|
||||
where
|
||||
w = _uvWorld uv
|
||||
cfig = _uvConfig uv
|
||||
|
||||
Reference in New Issue
Block a user