nek0/pituicat
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

collision detection finally works! cleanup is next...

Browse source
This commit is contained in:
nek0 2021-04-17 04:20:34 +02:00
parent 134445ed20
commit 56bf486fbf
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/Classes/Physics/Collidible.hs
View file

@ -167,22 +167,24 @@ class (Show c, Mass c) => Collidible c where
s22 = (g2e - g1s) / (g1e - g1s)
in
any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
res =
case (tx < dt, ty < dt, tx < ty, collx, colly) of
(True, _, True, True, _) ->
Collision tx (V2 (floor $ signum d1x) 0)
(_, True, False, _, True) ->
Collision ty (V2 0 (floor $ signum d1y))
(True, _, False, True, False) ->
Collision tx (V2 (floor $ signum d1x) 0)
(_, True, True, False, True) ->
Collision ty (V2 0 (floor $ signum d1y))
(_, _, _, False, False) ->
NoCollision
in
case (tx < dt, ty < dt, tx < ty, collx, colly) of
(_, _, True, True, _) ->
Collision tx (V2 (floor $ signum d1x) 0)
(_, _, False, _, True) ->
Collision ty (V2 0 (floor $ signum d1y))
(_, _, _, False, False) ->
NoCollision
--(True, _, _, False, _) ->
-- NoCollision
-- (_, True, _, _, False) ->
-- NoCollision
-- (False, _, _, _, _) ->
-- NoCollision
-- (_, False, _, _, _) ->
-- NoCollision
A.log
A.Debug
(fromString $
show (tx < dt, ty < dt, tx < ty, collx, colly))
res
else
NoCollision
@ -261,18 +263,18 @@ elasticCollision damping mo1 mo2 (Collision ddt (V2 dirx diry)) =
then 0
else -((abs m1y2 + abs m2y1) - abs dy)
in
(velocityUpdater mo1
-- ((positionUpdater mo1)
-- (p1 + ((ddt *) <$> v1)
-- -- if ddt == 0
-- -- then
-- -- if abs bx < abs by
-- -- then
-- -- V2 bx 0
-- -- else
-- -- V2 0 by
-- -- else
-- -- V2 0 0
-- )
-- )
(velocityUpdater
((positionUpdater mo1)
(p1 + ((ddt *) <$> v1)
-- if ddt == 0
-- then
-- if abs bx < abs by
-- then
-- V2 bx 0
-- else
-- V2 0 by
-- else
-- V2 0 0
)
)
) nvel