From 26e6825d0e089de11f5f4c98d00d50e80319aa2b Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 8 Jul 2021 19:16:56 +0200 Subject: [PATCH] clean --- src/Physics/Classes/Collidible.hs | 5 +---- src/Scenes/Test/Update.hs | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Physics/Classes/Collidible.hs b/src/Physics/Classes/Collidible.hs index e6c8130..e3829e9 100644 --- a/src/Physics/Classes/Collidible.hs +++ b/src/Physics/Classes/Collidible.hs @@ -184,10 +184,7 @@ class (Show c, Mass c) => Collidible c where "Unhandled combination of collision check results: " <> (fromString $ show x) in - -- res - if tx < 0 || ty < 0 - then A.log A.Debug ("PING!") res - else res + res -- case res of -- Collision _ _ -> -- A.log A.Debug "colliding!" res diff --git a/src/Scenes/Test/Update.hs b/src/Scenes/Test/Update.hs index d33b709..db7d0e9 100644 --- a/src/Scenes/Test/Update.hs +++ b/src/Scenes/Test/Update.hs @@ -31,8 +31,6 @@ update update level dt = liftIO $ do logIO Debug ("FPS: " <> fromString (show $ 1 / dt)) - -- Let all Actors update themselves and check for collisions - -- (Typeclasses rock!) atomically $ do lmap <- readTMVar (testMap level) cast <- @@ -94,10 +92,8 @@ update level dt = liftIO $ do in (aindex, res) in - tangibles `V.update` (A.log A.Debug - ("Partner: " <> (fromString $ show collisionPartners)) + tangibles `V.update` (V.map updater collisionPartners) - ) (newCast, newPowerups, mnewCat@(Just _)) = V.foldl (\acc@(castAcc, puAcc, mcat) input -> case input of