Skip to content

Commit 8db2543

Browse files
authored
Merge pull request phaserjs#5242 from samme/fix/collide-with-friction
Fix collisions for objects moved by friction
2 parents 08e3469 + 1c2e15a commit 8db2543

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

src/physics/arcade/SeparateX.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ var SeparateX = function (body1, body2, overlapOnly, bias)
6464
if (body2.moves)
6565
{
6666
body1.y += (body2.y - body2.prev.y) * body2.friction.y;
67+
body1._dy = body1.y - body1.prev.y;
6768
}
6869
}
6970
else
@@ -75,6 +76,7 @@ var SeparateX = function (body1, body2, overlapOnly, bias)
7576
if (body1.moves)
7677
{
7778
body2.y += (body1.y - body1.prev.y) * body1.friction.y;
79+
body2._dy = body2.y - body2.prev.y;
7880
}
7981
}
8082

src/physics/arcade/SeparateY.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ var SeparateY = function (body1, body2, overlapOnly, bias)
6464
if (body2.moves)
6565
{
6666
body1.x += (body2.x - body2.prev.x) * body2.friction.x;
67+
body1._dx = body1.x - body1.prev.x;
6768
}
6869
}
6970
else
@@ -75,6 +76,7 @@ var SeparateY = function (body1, body2, overlapOnly, bias)
7576
if (body1.moves)
7677
{
7778
body2.x += (body1.x - body1.prev.x) * body1.friction.x;
79+
body2._dx = body2.x - body2.prev.x;
7880
}
7981
}
8082

0 commit comments

Comments
 (0)