Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-17 22:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

GetOverlapX/Y now use the calculated delta values, not the deltaX/Y methods

Browse source
This commit is contained in:
Richard Davey 2018-06-01 15:41:40 +01:00
parent 4ad7993b78
commit 329c9266b4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/physics/arcade/GetOverlapX.js
View file

@ -22,13 +22,13 @@ var GetOverlapX = function (body1, body2, overlapOnly, bias)
var overlap = 0;
var maxOverlap = body1.deltaAbsX() + body2.deltaAbsX() + bias;
if (body1.deltaX() === 0 && body2.deltaX() === 0)
if (body1._dx === 0 && body2._dx === 0)
{
// They overlap but neither of them are moving
body1.embedded = true;
body2.embedded = true;
}
else if (body1.deltaX() > body2.deltaX())
else if (body1._dx > body2._dx)
{
// Body1 is moving right and / or Body2 is moving left
overlap = body1.right - body2.x;
@ -45,7 +45,7 @@ var GetOverlapX = function (body1, body2, overlapOnly, bias)
body2.touching.left = true;
}
}
else if (body1.deltaX() < body2.deltaX())
else if (body1._dx < body2._dx)
{
// Body1 is moving left and/or Body2 is moving right
overlap = body1.x - body2.width - body2.x;

6
src/physics/arcade/GetOverlapY.js
View file

@ -22,13 +22,13 @@ var GetOverlapY = function (body1, body2, overlapOnly, bias)
var overlap = 0;
var maxOverlap = body1.deltaAbsY() + body2.deltaAbsY() + bias;
if (body1.deltaY() === 0 && body2.deltaY() === 0)
if (body1._dy === 0 && body2._dy === 0)
{
// They overlap but neither of them are moving
body1.embedded = true;
body2.embedded = true;
}
else if (body1.deltaY() > body2.deltaY())
else if (body1._dy > body2._dy)
{
// Body1 is moving down and/or Body2 is moving up
overlap = body1.bottom - body2.y;
@ -45,7 +45,7 @@ var GetOverlapY = function (body1, body2, overlapOnly, bias)
body2.touching.up = true;
}
}
else if (body1.deltaY() < body2.deltaY())
else if (body1._dy < body2._dy)
{
// Body1 is moving up and/or Body2 is moving down
overlap = body1.y - body2.bottom;