further attempt at physics

This commit is contained in:
nek0 2021-04-16 21:47:02 +02:00
parent 9da16fc6a7
commit 134445ed20

View file

@ -119,11 +119,8 @@ class (Show c, Mass c) => Collidible c where
in in
if broadphaseOverlap if broadphaseOverlap
then then
if tx <= ty let collx =
then if d1x < 0
if tx < dt
then
if d1x <= 0
then then
let (V2 _ g1s) = m1p1 + ((tx *) <$> d1) let (V2 _ g1s) = m1p1 + ((tx *) <$> d1)
(V2 _ g1e) = m1p2 + ((tx *) <$> d1) (V2 _ g1e) = m1p2 + ((tx *) <$> d1)
@ -134,9 +131,7 @@ class (Show c, Mass c) => Collidible c where
s21 = (g2s - g1s) / (g1e - g1s) s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s) s22 = (g2e - g1s) / (g1e - g1s)
in in
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision tx (V2 (floor $ signum d1x) 0)
else NoCollision
else else
let (V2 _ g1s) = m1p4 + ((tx *) <$> d1) let (V2 _ g1s) = m1p4 + ((tx *) <$> d1)
(V2 _ g1e) = m1p3 + ((tx *) <$> d1) (V2 _ g1e) = m1p3 + ((tx *) <$> d1)
@ -147,15 +142,9 @@ class (Show c, Mass c) => Collidible c where
s21 = (g2s - g1s) / (g1e - g1s) s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s) s22 = (g2e - g1s) / (g1e - g1s)
in in
if any (\x -> x > 0 && x < 1) ((\s ->A.log A.Debug ("s: " <> fromString (show s)) s) [s11, s12, s21 ,s22]) any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision tx (V2 (floor $ signum d1x) 0) colly =
else NoCollision if d1y < 0
else
NoCollision
else
if ty < dt
then
if d1y <= 0
then then
let (V2 g1s _) = m1p1 + ((ty *) <$> d1) let (V2 g1s _) = m1p1 + ((ty *) <$> d1)
(V2 g1e _) = m1p4 + ((ty *) <$> d1) (V2 g1e _) = m1p4 + ((ty *) <$> d1)
@ -166,9 +155,7 @@ class (Show c, Mass c) => Collidible c where
s21 = (g2s - g1s) / (g1e - g1s) s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s) s22 = (g2e - g1s) / (g1e - g1s)
in in
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision ty (V2 0 (floor $ signum d1y))
else NoCollision
else else
let (V2 g1s _) = m1p2 + ((ty *) <$> d1) let (V2 g1s _) = m1p2 + ((ty *) <$> d1)
(V2 g1e _) = m1p3 + ((ty *) <$> d1) (V2 g1e _) = m1p3 + ((ty *) <$> d1)
@ -179,11 +166,23 @@ class (Show c, Mass c) => Collidible c where
s21 = (g2s - g1s) / (g1e - g1s) s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s) s22 = (g2e - g1s) / (g1e - g1s)
in in
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision ty (V2 0 (floor $ signum d1y)) in
else NoCollision case (tx < dt, ty < dt, tx < ty, collx, colly) of
else (_, _, True, True, _) ->
Collision tx (V2 (floor $ signum d1x) 0)
(_, _, False, _, True) ->
Collision ty (V2 0 (floor $ signum d1y))
(_, _, _, False, False) ->
NoCollision NoCollision
--(True, _, _, False, _) ->
-- NoCollision
-- (_, True, _, _, False) ->
-- NoCollision
-- (False, _, _, _, _) ->
-- NoCollision
-- (_, False, _, _, _) ->
-- NoCollision
else else
NoCollision NoCollision