clean
This commit is contained in:
parent
d7373e0c28
commit
26e6825d0e
2 changed files with 2 additions and 9 deletions
|
@ -184,10 +184,7 @@ class (Show c, Mass c) => Collidible c where
|
||||||
"Unhandled combination of collision check results: "
|
"Unhandled combination of collision check results: "
|
||||||
<> (fromString $ show x)
|
<> (fromString $ show x)
|
||||||
in
|
in
|
||||||
-- res
|
res
|
||||||
if tx < 0 || ty < 0
|
|
||||||
then A.log A.Debug ("PING!") res
|
|
||||||
else res
|
|
||||||
-- case res of
|
-- case res of
|
||||||
-- Collision _ _ ->
|
-- Collision _ _ ->
|
||||||
-- A.log A.Debug "colliding!" res
|
-- A.log A.Debug "colliding!" res
|
||||||
|
|
|
@ -31,8 +31,6 @@ update
|
||||||
update level dt = liftIO $ do
|
update level dt = liftIO $ do
|
||||||
logIO Debug ("FPS: " <> fromString (show $ 1 / dt))
|
logIO Debug ("FPS: " <> fromString (show $ 1 / dt))
|
||||||
|
|
||||||
-- Let all Actors update themselves and check for collisions
|
|
||||||
-- (Typeclasses rock!)
|
|
||||||
atomically $ do
|
atomically $ do
|
||||||
lmap <- readTMVar (testMap level)
|
lmap <- readTMVar (testMap level)
|
||||||
cast <-
|
cast <-
|
||||||
|
@ -94,10 +92,8 @@ update level dt = liftIO $ do
|
||||||
in
|
in
|
||||||
(aindex, res)
|
(aindex, res)
|
||||||
in
|
in
|
||||||
tangibles `V.update` (A.log A.Debug
|
tangibles `V.update`
|
||||||
("Partner: " <> (fromString $ show collisionPartners))
|
|
||||||
(V.map updater collisionPartners)
|
(V.map updater collisionPartners)
|
||||||
)
|
|
||||||
(newCast, newPowerups, mnewCat@(Just _)) = V.foldl
|
(newCast, newPowerups, mnewCat@(Just _)) = V.foldl
|
||||||
(\acc@(castAcc, puAcc, mcat) input ->
|
(\acc@(castAcc, puAcc, mcat) input ->
|
||||||
case input of
|
case input of
|
||||||
|
|
Loading…
Reference in a new issue