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

Fixed order of returns

Browse source
This commit is contained in:
Richard Davey 2017-11-26 14:05:29 +00:00
parent ffeff9d2f7
commit 0156f4f927
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
v3/src/geom/intersects/CircleToRectangle.js
View file

@ -15,28 +15,28 @@ var CircleToRectangle = function (circle, rect)
var halfHeight = rect.height / 2;
var cx = Math.abs(circle.x - rect.x - halfWidth);
var xDist = halfWidth + circle.radius;
if (cx <= halfWidth || cx > xDist)
{
return false;
}
var cy = Math.abs(circle.y - rect.y - halfHeight);
var xDist = halfWidth + circle.radius;
var yDist = halfHeight + circle.radius;
if (cy <= halfHeight || cy > yDist)
if (cx > xDist || cy > yDist)
{
return false;
}
else if (cx <= halfWidth || cy <= halfHeight)
{
return true;
}
else
{
var xCornerDist = cx - halfWidth;
var yCornerDist = cy - halfHeight;
var xCornerDistSq = xCornerDist * xCornerDist;
var yCornerDistSq = yCornerDist * yCornerDist;
var maxCornerDistSq = circle.radius * circle.radius;
var xCornerDist = cx - halfWidth;
var yCornerDist = cy - halfHeight;
var xCornerDistSq = xCornerDist * xCornerDist;
var yCornerDistSq = yCornerDist * yCornerDist;
var maxCornerDistSq = circle.radius * circle.radius;
return (xCornerDistSq + yCornerDistSq <= maxCornerDistSq);
return (xCornerDistSq + yCornerDistSq <= maxCornerDistSq);
}
};
module.exports = CircleToRectangle;