Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 05:33:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sleeping and strengthening direct control movement.

Browse source
This commit is contained in:
Richard Davey 2019-04-01 17:19:38 +01:00
parent e7334834ff
commit 64d8f928d0
1 changed files with 61 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/physics/arcade/Body.js
View file

@ -189,7 +189,7 @@ var Body = new Class({
* @type {integer}
* @since 3.17.0
*/
this.sleepIterations = 60 * world.positionIterations;
this.sleepIterations = 60;
/**
* Can this Body ever fall asleep? Typically you should leave this as `true`, but some
@ -706,10 +706,8 @@ var Body = new Class({
{
this.setPosition(this._cx, this._cy, 1);
}
else
{
this._cs = false;
}
this._cs = false;
}
this.rotation = parent.rotation;
@ -735,15 +733,30 @@ var Body = new Class({
{
if (lerp === undefined) { lerp = 1; }
if ((x > this.x && this.isBlockedRight()) || (x < this.x && this.isBlockedLeft()))
{
x = this.x;
}
if ((y > this.y && this.isBlockedDown()) || (y < this.y && this.isBlockedUp()))
{
y = this.y;
}
var maxSpeed = this.maxSpeed;
this.calculateVelocity(x, y, lerp, maxSpeed);
if (this.calculateVelocity(x, y, lerp, maxSpeed))
{
this.wake();
this.wake();
this._cs = true;
this._cx = x;
this._cy = y;
this._cs = true;
this._cx = x;
this._cy = y;
}
else
{
this._cs = false;
}
},
calculateVelocity: function (x, y, lerp, maxSpeed)
@ -756,6 +769,13 @@ var Body = new Class({
var px = this.x;
var py = this.y;
if (x === this.x && y === this.y)
{
velocity.set(0);
return false;
}
var angle = Math.atan2(y - py, x - px);
var speed = DistanceBetween(px, py, x, y) / (this.world._frameTime * lerp);
@ -769,6 +789,8 @@ var Body = new Class({
{
velocity.normalize().scale(maxSpeed);
}
return (velocity.x !== 0 || velocity.y !== 0);
},
/**
@ -950,6 +972,9 @@ var Body = new Class({
if (this.directControl)
{
this.velocity.set(0);
this.prev.x = this.x;
this.prev.y = this.y;
}
// Store collision flags
@ -1348,6 +1373,7 @@ var Body = new Class({
{
this._sleep++;
// console.log(this.world._frame, 'sleeping ...', this._sleepY, this.y);
// console.log(this.gameObject.name, 'sleep y', this.y);
@ -1934,6 +1960,12 @@ var Body = new Class({
this.y = body2.bottom;
}
if (this.directControl)
{
this._cy = this.y;
this._cs = true;
}
// We don't reposition this body if it's already blocked on a face
if (this.forcePosition === 5 || this.isWorldBlockedUp() || this.isWorldBlockedDown())
{
@ -1983,6 +2015,12 @@ var Body = new Class({
this.bottom = body2.y;
}
if (this.directControl)
{
this._cy = this.y;
this._cs = true;
}
// We don't reposition this body if it's already blocked on a face
if (this.forcePosition === 5 || this.isWorldBlockedUp() || this.isWorldBlockedDown())
{
@ -2032,6 +2070,12 @@ var Body = new Class({
this.x = body2.right;
}
if (this.directControl)
{
this._cx = this.x;
this._cs = true;
}
// We don't reposition this body if it's already blocked on a face
if (this.forcePosition === 5 || this.isWorldBlockedLeft() || this.isWorldBlockedRight())
{
@ -2081,6 +2125,12 @@ var Body = new Class({
this.right = body2.x;
}
if (this.directControl)
{
this._cx = this.x;
this._cs = true;
}
// We don't reposition this body if it's already blocked on a face
if (this.forcePosition === 5 || this.isWorldBlockedLeft() || this.isWorldBlockedRight())
{