2019-03-11 22:47:48 +00:00
|
|
|
/**
|
2018-02-12 16:01:20 +00:00
|
|
|
* @author Richard Davey <rich@photonstorm.com>
|
2019-01-15 16:20:22 +00:00
|
|
|
* @copyright 2019 Photon Storm Ltd.
|
2018-02-12 16:01:20 +00:00
|
|
|
* @license {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
|
|
|
|
*/
|
|
|
|
|
2019-03-08 20:12:49 +00:00
|
|
|
var CONST = require('./const');
|
2017-11-09 13:02:55 +00:00
|
|
|
var GetOverlapY = require('./GetOverlapY');
|
2019-03-15 19:22:51 +00:00
|
|
|
var IntersectsRect = require('./IntersectsRect');
|
2017-11-09 13:02:55 +00:00
|
|
|
|
2018-02-09 03:44:23 +00:00
|
|
|
/**
|
2018-10-19 11:32:43 +00:00
|
|
|
* Separates two overlapping bodies on the Y-axis (vertically).
|
|
|
|
*
|
2019-03-08 20:12:49 +00:00
|
|
|
* Separation involves moving two overlapping bodies so they don't overlap anymore
|
|
|
|
* and adjusting their velocities based on their mass. This is a core part of collision detection.
|
2018-10-19 11:32:43 +00:00
|
|
|
*
|
2019-03-08 20:12:49 +00:00
|
|
|
* The bodies won't be separated if there is no vertical overlap between them, if they are static,
|
|
|
|
* or if either one uses custom logic for its separation.
|
2018-02-09 03:44:23 +00:00
|
|
|
*
|
|
|
|
* @function Phaser.Physics.Arcade.SeparateY
|
|
|
|
* @since 3.0.0
|
|
|
|
*
|
2019-03-08 20:12:49 +00:00
|
|
|
* @param {Phaser.Physics.Arcade.Body} body1 - The first Body to separate. This is our priority body.
|
2018-10-19 11:32:43 +00:00
|
|
|
* @param {Phaser.Physics.Arcade.Body} body2 - The second Body to separate.
|
|
|
|
* @param {boolean} overlapOnly - If `true`, the bodies will only have their overlap data set and no separation will take place.
|
|
|
|
* @param {number} bias - A value to add to the delta value during overlap checking. Used to prevent sprite tunneling.
|
2018-02-09 03:44:23 +00:00
|
|
|
*
|
2018-10-19 16:45:05 +00:00
|
|
|
* @return {boolean} `true` if the two bodies overlap vertically, otherwise `false`.
|
2018-02-09 03:44:23 +00:00
|
|
|
*/
|
2017-11-09 13:02:55 +00:00
|
|
|
var SeparateY = function (body1, body2, overlapOnly, bias)
|
|
|
|
{
|
2019-03-11 09:19:41 +00:00
|
|
|
var result = GetOverlapY(body1, body2, overlapOnly, bias);
|
2019-03-08 20:12:49 +00:00
|
|
|
|
2019-03-11 09:19:41 +00:00
|
|
|
var overlap = result[0];
|
2019-03-15 19:22:51 +00:00
|
|
|
var topFace = result[1];
|
|
|
|
var bottomFace = !topFace;
|
2019-03-14 14:16:15 +00:00
|
|
|
var intersects = result[2];
|
2017-11-09 13:02:55 +00:00
|
|
|
|
2019-03-08 20:12:49 +00:00
|
|
|
var velocity1 = body1.velocity;
|
|
|
|
var velocity2 = body2.velocity;
|
|
|
|
|
2019-03-11 09:19:41 +00:00
|
|
|
var blocked1 = body1.blocked;
|
|
|
|
var blocked2 = body2.blocked;
|
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
var worldBlocked1 = body1.worldBlocked;
|
|
|
|
var worldBlocked2 = body2.worldBlocked;
|
2019-03-14 14:16:15 +00:00
|
|
|
|
2019-03-08 20:12:49 +00:00
|
|
|
var body1Immovable = (body1.physicsType === CONST.STATIC_BODY || body1.immovable);
|
|
|
|
var body2Immovable = (body2.physicsType === CONST.STATIC_BODY || body2.immovable);
|
|
|
|
|
2017-11-09 13:02:55 +00:00
|
|
|
// Can't separate two immovable bodies, or a body with its own custom separation logic
|
2019-03-14 14:16:15 +00:00
|
|
|
if (!intersects || overlapOnly || (body1Immovable && body2Immovable) || body1.customSeparateY || body2.customSeparateY)
|
2017-11-09 13:02:55 +00:00
|
|
|
{
|
2019-03-08 20:12:49 +00:00
|
|
|
// return true if there was some overlap, otherwise false.
|
2019-03-15 19:22:51 +00:00
|
|
|
return ((intersects && overlap !== 0) || (body1.embedded && body2.embedded));
|
2019-03-14 14:16:15 +00:00
|
|
|
}
|
|
|
|
|
2019-03-08 20:12:49 +00:00
|
|
|
// Adjust their positions and velocities accordingly based on the amount of overlap
|
|
|
|
var v1 = velocity1.y;
|
|
|
|
var v2 = velocity2.y;
|
2017-11-09 13:02:55 +00:00
|
|
|
|
2019-03-11 17:27:29 +00:00
|
|
|
var ny1 = v1;
|
|
|
|
var ny2 = v2;
|
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
// console.log(body1.gameObject.name, 'overlaps', body2.gameObject.name, 'on the', ((topFace) ? 'top' : 'bottom'));
|
|
|
|
|
|
|
|
// At this point, the velocity from gravity, world rebounds, etc has been factored in.
|
|
|
|
// The body is moving the direction it wants to, but may be blocked and rebound.
|
|
|
|
|
|
|
|
if (!body1Immovable && !body2Immovable)
|
2019-03-11 09:19:41 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// Neither body is immovable, so they get a new velocity based on mass
|
2019-03-13 02:27:51 +00:00
|
|
|
var mass1 = body1.mass;
|
|
|
|
var mass2 = body2.mass;
|
|
|
|
|
|
|
|
var nv1 = Math.sqrt((v2 * v2 * mass2) / mass1) * ((v2 > 0) ? 1 : -1);
|
|
|
|
var nv2 = Math.sqrt((v1 * v1 * mass1) / mass2) * ((v1 > 0) ? 1 : -1);
|
|
|
|
|
2019-03-11 17:27:29 +00:00
|
|
|
var avg = (nv1 + nv2) * 0.5;
|
2019-03-11 09:19:41 +00:00
|
|
|
|
2019-03-11 17:27:29 +00:00
|
|
|
nv1 -= avg;
|
|
|
|
nv2 -= avg;
|
|
|
|
|
|
|
|
ny1 = avg + nv1 * body1.bounce.y;
|
|
|
|
ny2 = avg + nv2 * body2.bounce.y;
|
2019-03-15 19:22:51 +00:00
|
|
|
|
|
|
|
// console.log('*1', ny1, ny2, 'vs', v1, v2, 'avg', avg, 'nv', nv1, nv2, body1.bounce.y, body2.bounce.y);
|
2019-03-11 17:27:29 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (body1Immovable)
|
2019-03-13 17:27:11 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// Body1 is immovable, so adjust body2 speed
|
2019-03-13 17:27:11 +00:00
|
|
|
ny2 = v1 - v2 * body2.bounce.y;
|
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (body2Immovable)
|
2019-03-11 17:27:29 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// Body2 is immovable, so adjust body1 speed
|
2019-03-13 17:27:11 +00:00
|
|
|
ny1 = v2 - v1 * body1.bounce.y;
|
2019-03-11 17:27:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Velocities calculated, time to work out what moves where
|
2019-03-13 17:27:11 +00:00
|
|
|
if (overlap !== 0)
|
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
var share = overlap * 0.2;
|
|
|
|
var totalA = 0;
|
|
|
|
var totalB = 0;
|
2019-03-13 17:27:11 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
for (var i = 0; i < 12; i++)
|
2019-03-13 17:27:11 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
var amount1 = (topFace) ? body1.getMoveY(share) : body1.getMoveY(-share);
|
|
|
|
var amount2 = (topFace) ? body2.getMoveY(-share) : body2.getMoveY(share);
|
|
|
|
|
|
|
|
totalA += amount1;
|
|
|
|
totalB += amount2;
|
|
|
|
|
|
|
|
if (Math.abs(totalA) + Math.abs(totalB) >= overlap)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
2019-03-13 17:27:11 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
|
|
|
|
// console.log('split at', totalA, totalB, 'of', overlap);
|
|
|
|
|
|
|
|
body1.y += totalA;
|
|
|
|
body2.y += totalB;
|
|
|
|
|
|
|
|
// var share = overlap * 0.5;
|
|
|
|
// var amount1 = (topFace) ? body1.getMoveY(share) : body1.getMoveY(-share);
|
|
|
|
// var amount2 = (topFace) ? body2.getMoveY(-share) : body2.getMoveY(share);
|
|
|
|
|
|
|
|
// if (topFace && amount1 !== share && !worldBlocked2.up)
|
|
|
|
// {
|
|
|
|
// amount2 -= (share - amount1);
|
|
|
|
// }
|
|
|
|
// else if (bottomFace && amount1 !== -share && !worldBlocked2.down)
|
|
|
|
// {
|
|
|
|
// amount2 += (share + amount1);
|
|
|
|
// }
|
|
|
|
|
|
|
|
// body1.y += amount1;
|
|
|
|
// body2.y += amount2;
|
|
|
|
|
|
|
|
// if (amount1)
|
|
|
|
// {
|
|
|
|
// body1.wake();
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (amount2)
|
|
|
|
// {
|
|
|
|
// body2.wake();
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (body2.gameObject.name === 'block2')
|
|
|
|
// {
|
|
|
|
// var stillIntersects = IntersectsRect(body1, body2);
|
|
|
|
|
|
|
|
// console.log(ny1, ny2);
|
|
|
|
// console.log('split rates', share, amount1, amount2);
|
|
|
|
// console.log(body1.y, body1.bottom);
|
|
|
|
// console.log(body2.y, body2.bottom);
|
|
|
|
// console.log('still?', stillIntersects);
|
|
|
|
// debugger;
|
|
|
|
// }
|
|
|
|
|
|
|
|
// Still intersecting?
|
|
|
|
|
|
|
|
/*
|
|
|
|
if (IntersectsRect(body1, body2))
|
2019-03-13 17:27:11 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
console.log('intersect adjustment');
|
|
|
|
|
|
|
|
if (body1Immovable)
|
|
|
|
{
|
|
|
|
if (topFace)
|
|
|
|
{
|
|
|
|
console.log('ad1');
|
|
|
|
body2.bottom = body1.y;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
console.log('ad2');
|
|
|
|
body2.y = body1.bottom;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!body1Immovable)
|
|
|
|
{
|
|
|
|
if (topFace)
|
|
|
|
{
|
|
|
|
console.log('ad3');
|
|
|
|
body1.y = body2.bottom;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
console.log('ad4');
|
|
|
|
body1.bottom = body2.y;
|
|
|
|
}
|
|
|
|
}
|
2019-03-13 17:27:11 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
*/
|
|
|
|
}
|
2019-03-13 17:27:11 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
/*
|
|
|
|
if (body1.deltaY() < 0)
|
|
|
|
{
|
|
|
|
// Body1 is moving UP
|
|
|
|
}
|
|
|
|
else if (body1.deltaY() > 0)
|
|
|
|
{
|
|
|
|
// Body1 is moving DOWN
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Body1 is stationary
|
|
|
|
}
|
|
|
|
*/
|
2019-03-15 13:31:40 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
/*
|
|
|
|
if (topFace)
|
|
|
|
{
|
|
|
|
// The top of Body1 overlaps with the bottom of Body2
|
|
|
|
|
|
|
|
if (worldBlocked2.up && !body1Immovable)
|
2019-03-15 13:31:40 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedUp(body2.bottom);
|
2019-03-15 13:31:40 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (worldBlocked2.down && !body1Immovable)
|
|
|
|
{
|
|
|
|
body1.setWorldBlockedDown(body2.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (bottomFace)
|
|
|
|
{
|
|
|
|
// The bottom of Body1 overlaps with the top of Body2
|
2019-03-15 13:31:40 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
if (worldBlocked2.down && !body1Immovable)
|
2019-03-15 13:31:40 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedDown(body2.y);
|
|
|
|
}
|
|
|
|
else if (worldBlocked2.up && !body1Immovable)
|
|
|
|
{
|
|
|
|
body1.setWorldBlockedUp(body2.bottom);
|
2019-03-15 13:31:40 +00:00
|
|
|
}
|
2019-03-13 17:27:11 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
*/
|
2019-03-13 17:27:11 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
/*
|
|
|
|
if (body1.deltaY() < 0)
|
2019-03-11 17:27:29 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// Body1 is moving UP
|
|
|
|
console.log('up1');
|
|
|
|
|
|
|
|
if (topFace)
|
2019-03-14 14:16:15 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// The top of Body1 hit the bottom of Body2
|
|
|
|
|
|
|
|
if (worldBlocked2.up)
|
2019-03-15 12:54:25 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedUp(body2.bottom);
|
2019-03-15 12:54:25 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (worldBlocked2.down)
|
2019-03-15 12:54:25 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedDown(body2.bottom);
|
2019-03-15 12:54:25 +00:00
|
|
|
}
|
2019-03-14 14:16:15 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (bottomFace)
|
2019-03-14 14:16:15 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// The bottom of Body1 hit the top of Body2
|
|
|
|
|
|
|
|
if (worldBlocked2.up)
|
2019-03-15 12:54:25 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedUp(body2.y);
|
2019-03-15 12:54:25 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else if (worldBlocked2.down)
|
2019-03-15 12:54:25 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
body1.setWorldBlockedDown(body2.y);
|
2019-03-15 12:54:25 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
}
|
2019-03-15 12:54:25 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
if (ny1 < 0)
|
|
|
|
{
|
|
|
|
// Velocity hasn't been reversed, so cancel it
|
|
|
|
ny1 = 0;
|
2019-03-14 14:16:15 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
}
|
|
|
|
else if (body1.deltaY() > 0)
|
|
|
|
{
|
|
|
|
// Body1 is moving DOWN
|
|
|
|
console.log('down1');
|
|
|
|
|
|
|
|
if (topFace)
|
2019-03-11 11:05:51 +00:00
|
|
|
{
|
2019-03-15 12:54:25 +00:00
|
|
|
|
2019-03-11 11:05:51 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
|
|
|
|
if (ny1 > 0)
|
2019-03-14 14:16:15 +00:00
|
|
|
{
|
2019-03-15 19:22:51 +00:00
|
|
|
// Velocity hasn't been reversed, so cancel it
|
|
|
|
ny1 = 0;
|
|
|
|
}
|
|
|
|
}
|
2019-03-15 12:54:25 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
if (body2.deltaY() < 0)
|
|
|
|
{
|
|
|
|
// Body2 is moving UP
|
|
|
|
console.log('up2');
|
2019-03-15 12:54:25 +00:00
|
|
|
|
2019-03-15 19:22:51 +00:00
|
|
|
if (topFace && worldBlocked1.up)
|
|
|
|
{
|
|
|
|
// The bottom of Body2 hit the top of Body1 and is blocked from moving up
|
|
|
|
body1.setWorldBlockedUp(body2.bottom);
|
|
|
|
}
|
|
|
|
else if (topFace)
|
|
|
|
{
|
|
|
|
// The top of Body1 hit the bottom of Body2, but isn't blocked. However, we still don't want penetration.
|
|
|
|
body1.y = body2.bottom;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ny1 < 0)
|
|
|
|
{
|
|
|
|
// Velocity hasn't been reversed, so cancel it
|
|
|
|
ny1 = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (body1.deltaY() > 0)
|
|
|
|
{
|
|
|
|
// Body1 is moving DOWN
|
|
|
|
console.log('down1');
|
|
|
|
|
|
|
|
if (bottomFace && worldBlocked2.down)
|
|
|
|
{
|
|
|
|
// The bottom of Body1 hit the top of Body2 and is blocked from moving down
|
|
|
|
body1.setWorldBlockedDown(body2.y);
|
|
|
|
}
|
|
|
|
else if (bottomFace)
|
|
|
|
{
|
|
|
|
// The bottom of Body1 hit the top of Body2, but isn't blocked. However, we still don't want penetration.
|
|
|
|
body1.bottom = body2.y;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ny1 > 0)
|
|
|
|
{
|
|
|
|
// Velocity hasn't been reversed, so cancel it
|
|
|
|
ny1 = 0;
|
2019-03-11 11:05:51 +00:00
|
|
|
}
|
2019-03-11 17:27:29 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
*/
|
2019-03-11 17:27:29 +00:00
|
|
|
|
2019-03-15 12:54:25 +00:00
|
|
|
// If body was asleep, we only wake it up for significant changes in velocity
|
2019-03-15 19:22:51 +00:00
|
|
|
// if (body1.sleeping && Math.abs(ny1) > 10)
|
|
|
|
// {
|
|
|
|
// body1.wake();
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (body2.sleeping && Math.abs(ny2) > 10)
|
|
|
|
// {
|
|
|
|
// body2.wake();
|
|
|
|
// }
|
|
|
|
|
2019-03-15 12:54:25 +00:00
|
|
|
if (body1.sleeping && Math.abs(ny1) < 10)
|
2019-03-11 17:27:29 +00:00
|
|
|
{
|
2019-03-15 12:54:25 +00:00
|
|
|
ny1 = 0;
|
2019-03-11 09:19:41 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
body1.wake();
|
|
|
|
}
|
2019-03-13 02:27:51 +00:00
|
|
|
|
2019-03-15 12:54:25 +00:00
|
|
|
if (body2.sleeping && Math.abs(ny2) < 10)
|
|
|
|
{
|
|
|
|
ny2 = 0;
|
2019-03-11 17:27:29 +00:00
|
|
|
}
|
2019-03-15 19:22:51 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
body2.wake();
|
|
|
|
}
|
2019-03-11 17:27:29 +00:00
|
|
|
|
|
|
|
velocity1.y = ny1;
|
|
|
|
velocity2.y = ny2;
|
2019-03-08 20:12:49 +00:00
|
|
|
|
2019-03-13 02:27:51 +00:00
|
|
|
// TODO: This is special case code that handles things like horizontal moving platforms you can ride
|
|
|
|
// if (body2.moves)
|
|
|
|
// {
|
|
|
|
// body1.x += body1.getMoveX((body2.deltaX()) * body2.friction.x, true);
|
|
|
|
// }
|
2019-03-08 20:12:49 +00:00
|
|
|
|
2017-11-09 13:02:55 +00:00
|
|
|
// If we got this far then there WAS overlap, and separation is complete, so return true
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
module.exports = SeparateY;
|