Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-10 15:14:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update World.js

Browse source 
Added pushable property collision checking when both bodies are set to circles
This commit is contained in:
Zeke Chan 2024-06-11 15:36:09 +08:00
parent 43ce515fcb
commit 1b965326d4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/physics/arcade/World.js
View file

@ -1609,19 +1609,19 @@ var World = new Class({
var ny = ((body2Center.y - body1Center.y) / d) || 0; var ny = ((body2Center.y - body1Center.y) / d) || 0;
var p = 2 * (body1Velocity.x * nx + body1Velocity.y * ny - body2Velocity.x * nx - body2Velocity.y * ny) / (body1.mass + body2.mass); var p = 2 * (body1Velocity.x * nx + body1Velocity.y * ny - body2Velocity.x * nx - body2Velocity.y * ny) / (body1.mass + body2.mass);
if (body1Immovable || body2Immovable) if (body1Immovable || body2Immovable || !body1.pushable || !body2.pushable)
{ {
p *= 2; p *= 2;
} }
if (!body1Immovable) if (!body1Immovable && body1.pushable)
{ {
body1Velocity.x = (body1Velocity.x - p / body1.mass * nx); body1Velocity.x = (body1Velocity.x - p / body1.mass * nx);
body1Velocity.y = (body1Velocity.y - p / body1.mass * ny); body1Velocity.y = (body1Velocity.y - p / body1.mass * ny);
body1Velocity.multiply(body1.bounce); body1Velocity.multiply(body1.bounce);
} }
if (!body2Immovable) if (!body2Immovable && body2.pushable)
{ {
body2Velocity.x = (body2Velocity.x + p / body2.mass * nx); body2Velocity.x = (body2Velocity.x + p / body2.mass * nx);
body2Velocity.y = (body2Velocity.y + p / body2.mass * ny); body2Velocity.y = (body2Velocity.y + p / body2.mass * ny);
@ -1634,15 +1634,14 @@ var World = new Class({
overlapY *= 0.5; overlapY *= 0.5;
} }
if (!body1Immovable) if (!body1Immovable || body1.pushable || deadlock)
{ {
body1.x -= overlapX; body1.x -= overlapX;
body1.y -= overlapY; body1.y -= overlapY;
body1.updateCenter(); body1.updateCenter();
} }
else if (!body2Immovable || body2.pushable || deadlock)
if (!body2Immovable)
{ {
body2.x += overlapX; body2.x += overlapX;
body2.y += overlapY; body2.y += overlapY;