magic_rb/haskell-games
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/haskell-games synced 2024-11-25 09:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace forM in physics with cmap

Browse source 
Signed-off-by: magic_rb <richard@brezak.sk>
This commit is contained in:
magic_rb 2024-01-03 22:47:58 +01:00
parent 5d53c2aa90
commit e5f10c6e34
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpg/src/System/Physics.hs
View file

@ -172,13 +172,13 @@ applyVelocity'' = do
fractions' = filter (not . isNaN . (^. _2)) clampedFractions fractions' = filter (not . isNaN . (^. _2)) clampedFractions
(info, minTime) = minimumBy order ((Nothing, remainingTime) : fractions') (info, minTime) = minimumBy order ((Nothing, remainingTime) : fractions')
forM_ allEntities \entity1 -> do AE.cmap @w @(PositionComponent, AABBComponent, Maybe BodyComponent, Maybe VelocityComponent) @PositionComponent \(position1, _, body1, velocity1) ->
(position1, velocity1, body1) <- AE.get @w @(PositionComponent, Maybe VelocityComponent, Maybe BodyComponent) entity1
let let
velocity1' = fromMaybe (Velocity $ pure 0) velocity1 velocity1' = fromMaybe (Velocity $ pure 0) velocity1
in
unless (unVelocity velocity1' == pure 0 || maybe False (^. immovable) body1) $ if unVelocity velocity1' == pure 0 || maybe False (^. immovable) body1
AE.set @w entity1 (Position $ position1.position + unVelocity velocity1' * pure (clampDown minTime)) then position1
else Position $ position1.position + unVelocity velocity1' * pure (clampDown minTime)
case info of case info of
Just ((entityA, positionA, velocityA, aabbA, bodyA), (entityB, positionB, velocityB, aabbB, bodyB)) -> do Just ((entityA, positionA, velocityA, aabbA, bodyA), (entityB, positionB, velocityB, aabbB, bodyB)) -> do
do do