broadphase saves a bit of the day

This commit is contained in:
nek0 2021-03-04 01:56:42 +01:00
parent c7f4f00a2f
commit 7799387cf2
2 changed files with 97 additions and 85 deletions

View File

@ -87,91 +87,103 @@ class (Show c, Mass c) => Collidible c where
b21@(V2 b2minx b2miny) = fst b2 b21@(V2 b2minx b2miny) = fst b2
b22@(V2 b2maxx b2maxy) = snd b2 b22@(V2 b2maxx b2maxy) = snd b2
in2 = in2 =
(b1minx > b2minx && b1minx < b2maxx && b1miny > b2miny && b1miny < b2maxy) || (b1minx > b2minx && b1minx < b2maxx &&
(b1maxx > b2minx && b1maxx < b2maxx && b1miny > b2miny && b1miny < b2maxy) || b1miny > b2miny && b1miny < b2maxy) ||
(b1minx > b2minx && b1minx < b2maxx && b1maxy > b2miny && b1maxy < b2maxy) || (b1maxx > b2minx && b1maxx < b2maxx &&
(b1maxx > b2minx && b1maxx < b2maxx && b1maxy > b2miny && b1maxy < b2maxy) b1miny > b2miny && b1miny < b2maxy) ||
(b1minx > b2minx && b1minx < b2maxx &&
b1maxy > b2miny && b1maxy < b2maxy) ||
(b1maxx > b2minx && b1maxx < b2maxx &&
b1maxy > b2miny && b1maxy < b2maxy)
in1 = in1 =
(b2minx > b1minx && b2minx < b1maxx && b2miny > b1miny && b2miny < b1maxy) || (b2minx > b1minx && b2minx < b1maxx &&
(b2maxx > b1minx && b2maxx < b1maxx && b2miny > b1miny && b2miny < b1maxy) || b2miny > b1miny && b2miny < b1maxy) ||
(b2minx > b1minx && b2minx < b1maxx && b2maxy > b1miny && b2maxy < b1maxy) || (b2maxx > b1minx && b2maxx < b1maxx &&
(b2maxx > b1minx && b2maxx < b1maxx && b2maxy > b1miny && b2maxy < b1maxy) b2miny > b1miny && b2miny < b1maxy) ||
(b2minx > b1minx && b2minx < b1maxx &&
b2maxy > b1miny && b2maxy < b1maxy) ||
(b2maxx > b1minx && b2maxx < b1maxx &&
b2maxy > b1miny && b2maxy < b1maxy)
in in
in2 || in1 in2 || in1
tx = tx =
let p1x = (\(V2 x _) -> x) (if d1x < 0 then m1p1 else m1p3) let p1x = (\(V2 x _) -> x) (if d1x < 0 then m1p1 else m1p4)
p2x = (\(V2 x _) -> x) (if d1x < 0 then m2p3 else m2p1) p2x = (\(V2 x _) -> x) (if d1x < 0 then m2p4 else m2p1)
in in
(p1x - p2x) / (d2x - d1x) if d2x - d1x == 0 then dt else (p1x - p2x) / (d2x - d1x)
ty = ty =
let p1y = (\(V2 _ y) -> y) (if d1y < 0 then m1p1 else m1p3) let p1y = (\(V2 _ y) -> y) (if d1y < 0 then m1p1 else m1p2)
p2y = (\(V2 _ y) -> y) (if d1y < 0 then m2p3 else m2p1) p2y = (\(V2 _ y) -> y) (if d1y < 0 then m2p2 else m2p1)
in in
(p1y - p2y) / (d2y - d1y) if d2y - d1y == 0 then dt else (p1y - p2y) / (d2y - d1y)
in in
if tx < ty if broadphaseOverlap
then
if tx < dt
then then
if d1x < 0 if tx < ty
then then
let g1s = m1p1 + ((tx *) <$> d1) if tx < dt
g1e = m1p2 + ((tx *) <$> d1) then
g2s = m2p3 + ((tx *) <$> d2) if d1x < 0
g2e = m2p4 + ((tx *) <$> d2) then
s11 = (g1s - g2s) / (g2e - g2s) let (V2 _ g1s) = m1p1 + ((tx *) <$> d1)
s12 = (g1e - g2s) / (g2e - g2s) (V2 _ g1e) = m1p2 + ((tx *) <$> d1)
s21 = (g2s - g1s) / (g1e - g1s) (V2 _ g2s) = m2p4 + ((tx *) <$> d2)
s22 = (g2e - g1s) / (g1e - g1s) (V2 _ g2e) = m2p3 + ((tx *) <$> d2)
in s11 = (g1s - g2s) / (g2e - g2s)
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] s12 = (g1e - g2s) / (g2e - g2s)
then Collision tx (V2 (floor $ signum (-d1x)) 0) s21 = (g2s - g1s) / (g1e - g1s)
else NoCollision s22 = (g2e - g1s) / (g1e - g1s)
in
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision tx (V2 (floor $ signum d1x) 0)
else NoCollision
else
let (V2 _ g1s) = m1p4 + ((tx *) <$> d1)
(V2 _ g1e) = m1p3 + ((tx *) <$> d1)
(V2 _ g2s) = m2p1 + ((tx *) <$> d2)
(V2 _ g2e) = m2p2 + ((tx *) <$> d2)
s11 = (g1s - g2s) / (g2e - g2s)
s12 = (g1e - g2s) / (g2e - g2s)
s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s)
in
if any (\x -> x > 0 && x < 1) ((\s ->A.log A.Debug ("s: " <> fromString (show s)) s) [s11, s12, s21 ,s22])
then Collision tx (V2 (floor $ signum d1x) 0)
else NoCollision
else
NoCollision
else else
let g1s = m1p3 + ((tx *) <$> d1) if ty < dt
g1e = m1p4 + ((tx *) <$> d1) then
g2s = m2p1 + ((tx *) <$> d2) if d1y < 0
g2e = m2p2 + ((tx *) <$> d2) then
s11 = (g1s - g2s) / (g2e - g2s) let (V2 g1s _) = m1p2 + ((ty *) <$> d1)
s12 = (g1e - g2s) / (g2e - g2s) (V2 g1e _) = m1p3 + ((ty *) <$> d1)
s21 = (g2s - g1s) / (g1e - g1s) (V2 g2s _) = m2p1 + ((ty *) <$> d2)
s22 = (g2e - g1s) / (g1e - g1s) (V2 g2e _) = m2p4 + ((ty *) <$> d2)
in s11 = (g1s - g2s) / (g2e - g2s)
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] s12 = (g1e - g2s) / (g2e - g2s)
then Collision tx (V2 (floor $ signum (-d1x)) 0) s21 = (g2s - g1s) / (g1e - g1s)
else NoCollision s22 = (g2e - g1s) / (g1e - g1s)
else in
NoCollision if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
else then Collision ty (V2 0 (floor $ signum d1y))
if ty < dt else NoCollision
then else
if d1y < 0 let (V2 g1s _) = m1p1 + ((ty *) <$> d1)
then (V2 g1e _) = m1p4 + ((ty *) <$> d1)
let g1s = m1p2 + ((ty *) <$> d1) (V2 g2s _) = m2p2 + ((ty *) <$> d2)
g1e = m1p3 + ((ty *) <$> d1) (V2 g2e _) = m2p3 + ((ty *) <$> d2)
g2s = m2p4 + ((ty *) <$> d2) s11 = (g1s - g2s) / (g2e - g2s)
g2e = m2p1 + ((ty *) <$> d2) s12 = (g1e - g2s) / (g2e - g2s)
s11 = (g1s - g2s) / (g2e - g2s) s21 = (g2s - g1s) / (g1e - g1s)
s12 = (g1e - g2s) / (g2e - g2s) s22 = (g2e - g1s) / (g1e - g1s)
s21 = (g2s - g1s) / (g1e - g1s) in
s22 = (g2e - g1s) / (g1e - g1s) if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
in then Collision ty (V2 0 (floor $ signum d1y))
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22] else NoCollision
then Collision ty (V2 0 (floor $ signum (-d1y))) else
else NoCollision NoCollision
else
let g1s = m1p4 + ((ty *) <$> d1)
g1e = m1p1 + ((ty *) <$> d1)
g2s = m2p2 + ((ty *) <$> d2)
g2e = m2p3 + ((ty *) <$> d2)
s11 = (g1s - g2s) / (g2e - g2s)
s12 = (g1e - g2s) / (g2e - g2s)
s21 = (g2s - g1s) / (g1e - g1s)
s22 = (g2e - g1s) / (g1e - g1s)
in
if any (\x -> x > 0 && x < 1) [s11, s12, s21 ,s22]
then Collision ty (V2 0 (floor $ signum (-d1y)))
else NoCollision
else else
NoCollision NoCollision
@ -252,16 +264,16 @@ elasticCollision damping mo1 mo2 (Collision ddt (V2 dirx diry)) =
in in
(velocityUpdater (velocityUpdater
((positionUpdater mo1) ((positionUpdater mo1)
(p1 + (p1 + ((ddt *) <$> v1)
if ddt == 0 -- if ddt == 0
then -- then
if abs bx < abs by -- if abs bx < abs by
then -- then
V2 bx 0 -- V2 bx 0
else -- else
V2 0 by -- V2 0 by
else -- else
V2 0 0 -- V2 0 0
) )
) )
) nvel ) nvel

View File

@ -150,7 +150,7 @@ instance Collidible Pituicat where
nvel@(V2 dx dy) = velocity ncat nvel@(V2 dx dy) = velocity ncat
grounded = grounded =
(dy * ddt) >= 0 && (dy * ddt) >= 0 &&
(dy * ddt) < 2 && diry == -1 (dy * ddt) < 5 && diry == -1
in in
A.log A.log
Debug Debug