Move towards serializing saves/loads faster
This commit is contained in:
@@ -5,6 +5,7 @@ import Dodge.Clock
|
||||
import Dodge.Data.World
|
||||
import Geometry
|
||||
import Picture
|
||||
import Control.Lens
|
||||
|
||||
creatureDisplayText :: World -> Creature -> Picture
|
||||
creatureDisplayText w cr =
|
||||
@@ -26,8 +27,8 @@ creatureDisplayText w cr =
|
||||
w
|
||||
cr
|
||||
where
|
||||
campos = _cameraViewFrom (_cWorld w)
|
||||
theScale = 0.15 / _cameraZoom (_cWorld w)
|
||||
campos = w ^. cWorld . cwCam . cwcViewFrom
|
||||
theScale = 0.15 / (w ^. cWorld . cwCam . cwcZoom)
|
||||
cpos = _crPos cr
|
||||
v = cpos -.- campos
|
||||
(V2 x y) = campos +.+ v +.+ _crRad cr *.* normalizeV v
|
||||
|
||||
@@ -56,12 +56,12 @@ wasdWithAiming w speed cr
|
||||
| otherwise = crMvAbsolute (speed *.* movAbs) . set crMvDir dir
|
||||
theTurn cr' = creatureTurnTowardDir (_crMvDir cr') 0.2 cr'
|
||||
movDir = wasdDir w
|
||||
dir = _cameraRot (_cWorld w) + argV movDir
|
||||
movAbs = rotateV (_cameraRot (_cWorld w)) $ normalizeV movDir
|
||||
dir = (w ^. cWorld . cwCam . cwcRot) + argV movDir
|
||||
movAbs = rotateV (w ^. cWorld . cwCam . cwcRot) $ normalizeV movDir
|
||||
isAiming = _posture (_crStance cr) == Aiming
|
||||
mouseDir = case cr ^? crInv . ix (crSel cr) . itScope . scopePos of
|
||||
Just _ -> argV $ mouseWorldPos w -.- _crPos cr
|
||||
_ -> argV (_mousePos w) + _cameraRot (_cWorld w)
|
||||
_ -> argV (_mousePos w) + (w ^. cWorld . cwCam . cwcRot)
|
||||
|
||||
wasdM :: SDL.Scancode -> Point2
|
||||
wasdM scancode = case scancode of
|
||||
|
||||
Reference in New Issue
Block a user