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

Merge pull request #307 from jcd-as/dev

Browse source 
Emitters drag fix.
This commit is contained in:
Richard Davey 2014-01-14 01:49:52 -08:00
commit 8479e456dd
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/particles/arcade/Emitter.js
View file

@ -123,10 +123,10 @@ Phaser.Particles.Arcade.Emitter = function (game, x, y, maxParticles) {
this.particleClass = null;
/**
* The X and Y drag component of particles launched from the emitter.
* @property {Phaser.Point} particleDrag
* The friction component of particles launched from the emitter.
* @property {number} particleFriction
*/
this.particleDrag = new Phaser.Point();
this.particleFriction = 0;
/**
* The angular drag component of particles launched from the emitter if they are rotating.
@ -477,8 +477,7 @@ Phaser.Particles.Arcade.Emitter.prototype.emitParticle = function () {
particle.scale.setTo(scale, scale);
}
particle.body.drag.x = this.particleDrag.x;
particle.body.drag.y = this.particleDrag.y;
particle.body.friction = this.particleFriction;
particle.body.angularDrag = this.angularDrag;
}

2
src/tilemap/Tilemap.js
View file

@ -661,7 +661,7 @@ Phaser.Tilemap.prototype = {
}
else
{
this.layers[layer].data[y][x].index = index;
this.layers[layer].data[y][x].index = tile;
}
this.layers[layer].dirty = true;