wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-09-12 12:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Putting everything back together again :)

Browse Source
This commit is contained in:
Richard Davey
2013-05-31 18:21:32 +01:00
parent fe372af453
commit d510b785b1
46 changed files with 15176 additions and 15082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Phaser/gameobjects/Particle.ts
+14 -14
View File
@@ -51,7 +51,7 @@ module Phaser {
return;
}
this.lifespan -= this._game.time.elapsed;
this.lifespan -= this.game.time.elapsed;
if (this.lifespan <= 0)
{
@@ -59,39 +59,39 @@ module Phaser {
}
//simpler bounce/spin behavior for now
if (this.touching)
if (this.body.touching)
{
if (this.angularVelocity != 0)
if (this.body.angularVelocity != 0)
{
this.angularVelocity = -this.angularVelocity;
this.body.angularVelocity = -this.body.angularVelocity;
}
}
if (this.acceleration.y > 0) //special behavior for particles with gravity
if (this.body.acceleration.y > 0) //special behavior for particles with gravity
{
if (this.touching & Collision.FLOOR)
if (this.body.touching & Types.FLOOR)
{
this.drag.x = this.friction;
this.body.drag.x = this.friction;
if (!(this.wasTouching & Collision.FLOOR))
if (!(this.body.wasTouching & Types.FLOOR))
{
if (this.velocity.y < -this.elasticity * 10)
if (this.body.velocity.y < -this.body.bounce.y * 10)
{
if (this.angularVelocity != 0)
if (this.body.angularVelocity != 0)
{
this.angularVelocity *= -this.elasticity;
this.body.angularVelocity *= -this.body.bounce.y;
}
}
else
{
this.velocity.y = 0;
this.angularVelocity = 0;
this.body.velocity.y = 0;
this.body.angularVelocity = 0;
}
}
}
else
{
this.drag.x = 0;
this.body.drag.x = 0;
}
}
}