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

Added support for onEnter and onLeave Death Zones for Particles

Browse source
This commit is contained in:
Richard Davey 2017-10-29 21:46:41 +00:00
parent 89bcc6a27a
commit 7ea3fedd93
3 changed files with 84 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
v3/src/gameobjects/particles/Particle.js
View file

@ -75,10 +75,10 @@ var Particle = new Class({
this.frame = emitter.getFrame();
if (emitter.zone)
if (emitter.emitZone)
{
// Updates particle.x and particle.y during this call
emitter.zone.getPoint(this);
emitter.emitZone.getPoint(this);
}
if (x === undefined)
@ -279,6 +279,14 @@ var Particle = new Class({
this.checkBounds(emitter);
}
if (emitter.deathZone && emitter.deathZone.willKill(this))
{
this.lifeCurrent = 0;
// No need to go any further, particle has been killed
return true;
}
this.scaleX = emitter.scaleX.onUpdate(this, 'scaleX', t, this.scaleX);
if (emitter.scaleY)

66
v3/src/gameobjects/particles/ParticleEmitter.js
View file

@ -1,6 +1,7 @@
var BlendModes = require('../../renderer/BlendModes');
var Class = require('../../utils/Class');
var Components = require('../components');
var DeathZone = require('./zones/DeathZone');
var EdgeZone = require('./zones/EdgeZone');
var EmitterOp = require('./EmitterOp');
var GetFastValue = require('../../utils/object/GetFastValue');
@ -162,11 +163,18 @@ var ParticleEmitter = new Class({
this._counter = 0;
this.zone = null;
this.emitZone = null;
if (config.hasOwnProperty('zone'))
if (config.hasOwnProperty('emitZone'))
{
this.setZone(config.zone);
this.setEmitZone(config.emitZone);
}
this.deathZone = null;
if (config.hasOwnProperty('deathZone'))
{
this.setDeathZone(config.deathZone);
}
// bounds rectangle
@ -474,36 +482,36 @@ var ParticleEmitter = new Class({
return this;
},
// The zone must have a function called `getPoint` that takes an object and sets
// The zone must have a function called `getPoint` that takes a particle object and sets
// its x and y properties accordingly then returns that object
setZone: function (zone)
setEmitZone: function (zoneConfig)
{
if (zone === undefined)
if (zoneConfig === undefined)
{
this.zone = null;
this.emitZone = null;
}
else
{
// Where source = Geom like Circle, or a Path or Curve
// zone: { type: 'random', source: X }
// zone: { type: 'edge', source: X, quantity: 32, [stepRate=0], [yoyo=false] }
// emitZone: { type: 'random', source: X }
// emitZone: { type: 'edge', source: X, quantity: 32, [stepRate=0], [yoyo=false] }
var type = GetFastValue(zone, 'type', 'random');
var source = GetFastValue(zone, 'source', null);
var type = GetFastValue(zoneConfig, 'type', 'random');
var source = GetFastValue(zoneConfig, 'source', null);
if (source && typeof source.getPoint === 'function')
{
switch (type)
{
case 'random':
this.zone = new RandomZone(source);
this.emitZone = new RandomZone(source);
break;
case 'edge':
var quantity = GetFastValue(zone, 'quantity', 1);
var stepRate = GetFastValue(zone, 'stepRate', 0);
var yoyo = GetFastValue(zone, 'yoyo', false);
this.zone = new EdgeZone(source, quantity, stepRate, yoyo);
var quantity = GetFastValue(zoneConfig, 'quantity', 1);
var stepRate = GetFastValue(zoneConfig, 'stepRate', 0);
var yoyo = GetFastValue(zoneConfig, 'yoyo', false);
this.emitZone = new EdgeZone(source, quantity, stepRate, yoyo);
break;
}
}
@ -512,6 +520,32 @@ var ParticleEmitter = new Class({
return this;
},
setDeathZone: function (zoneConfig)
{
if (zoneConfig === undefined)
{
this.deathZone = null;
}
else
{
// Where source = Geom like Circle or Rect that suppors a 'contains' function
// deathZone: { type: 'onEnter', source: X }
// deathZone: { type: 'onLeave', source: X }
var type = GetFastValue(zoneConfig, 'type', 'onEnter');
var source = GetFastValue(zoneConfig, 'source', null);
if (source && typeof source.contains === 'function')
{
var killOnEnter = (type === 'onEnter') ? true : false;
this.deathZone = new DeathZone(source, killOnEnter);
}
}
return this;
},
// Particle Management
reserve: function (particleCount)

24
v3/src/gameobjects/particles/zones/DeathZone.js Normal file
View file

@ -0,0 +1,24 @@
var Class = require('../../../utils/Class');
var DeathZone = new Class({
initialize:
function DeathZone (source, killOnEnter)
{
this.source = source;
this.killOnEnter = killOnEnter;
},
// must return true if the particle will be killed, otherwise false
willKill: function (particle)
{
var withinZone = this.source.contains(particle.x, particle.y);
return (withinZone && this.killOnEnter || !withinZone && !this.killOnEnter);
}
});
module.exports = DeathZone;