-
Notifications
You must be signed in to change notification settings - Fork 130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow an emitter to automatically update via the PIXI shared ticker #38
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,8 @@ | |
|
||
var ParticleUtils = PIXI.particles.ParticleUtils, | ||
Particle = PIXI.particles.Particle, | ||
ParticleContainer = PIXI.particles.ParticleContainer || PIXI.ParticleContainer; | ||
ParticleContainer = PIXI.particles.ParticleContainer || PIXI.ParticleContainer, | ||
ticker = PIXI.ticker.shared; | ||
|
||
/** | ||
* A particle emitter. | ||
|
@@ -22,6 +23,8 @@ | |
* @param {Object} [config] A configuration object containing settings for the emitter. | ||
* @param {Boolean} [config.emit=true] If config.emit is explicitly passed as false, the Emitter | ||
* will start disabled. | ||
* @param {Boolean} [config.autoUpdate=false] If config.emit is explicitly passed as true, the Emitter | ||
* will automatically call update via the PIXI shared ticker. | ||
*/ | ||
var Emitter = function(particleParent, particleImages, config) | ||
{ | ||
|
@@ -363,6 +366,13 @@ | |
* @private | ||
*/ | ||
this._origArt = null; | ||
/** | ||
* If the update function is called automatically from the shared ticker. | ||
* Setting this to false requires calling the update function manually. | ||
* @property {Boolean} _autoUpdate | ||
* @private | ||
*/ | ||
this._autoUpdate = false; | ||
|
||
//set the initial parent | ||
this.parent = particleParent; | ||
|
@@ -638,6 +648,7 @@ | |
//start emitting | ||
this._spawnTimer = 0; | ||
this.emit = config.emit === undefined ? true : !!config.emit; | ||
this.autoUpdate = config.autoUpdate === undefined ? false : !!config.autoUpdate; | ||
}; | ||
|
||
/** | ||
|
@@ -744,13 +755,40 @@ | |
} | ||
}); | ||
|
||
/** | ||
* If the update function is called automatically from the shared ticker. | ||
* Setting this to false requires calling the update function manually. | ||
* @property {Boolean} emit | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please also change "emit" to "autoUpdate" here. |
||
*/ | ||
Object.defineProperty(p, "autoUpdate", | ||
{ | ||
get: function() { return this._autoUpdate; }, | ||
set: function(value) | ||
{ | ||
if (this._autoUpdate && !value) | ||
{ | ||
ticker.remove(this.update, this); | ||
} | ||
else if (!this._autoUpdate && value) | ||
{ | ||
ticker.add(this.update, this); | ||
} | ||
this._autoUpdate = !!value; | ||
} | ||
}); | ||
|
||
/** | ||
* Updates all particles spawned by this emitter and emits new ones. | ||
* @method update | ||
* @param {Number} delta Time elapsed since the previous frame, in __seconds__. | ||
*/ | ||
p.update = function(delta) | ||
{ | ||
if (this._autoUpdate) | ||
{ | ||
delta = delta / ticker.speed / PIXI.settings.TARGET_FPMS / 1000; | ||
} | ||
|
||
//if we don't have a parent to add particles to, then don't do anything. | ||
//this also works as a isDestroyed check | ||
if (!this._parent) return; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to be the docs for
emit
.