Skip to content

Fix EmitterOp defaultEmit(), current value for custom callbacks #7017

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Fix EmitterOp defaultEmit(), current value for custom callbacks #7017

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1656415
Return defaultValue from defaultEmit()
samme Jan 26, 2025
616ed77
Fix initial current value in custom op callbacks
samme Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/gameobjects/particles/EmitterOp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ var EmitterOp = new Class({
case 3:
this._onEmit = value;
onEmit = this.proxyEmit;
current = this.defaultValue;
break;

// Stepped start/end
Expand Down Expand Up @@ -522,6 +523,7 @@ var EmitterOp = new Class({
this._onUpdate = (this.has(value, 'onUpdate')) ? value.onUpdate : this.defaultUpdate;
onEmit = this.proxyEmit;
onUpdate = this.proxyUpdate;
current = this.defaultValue;
break;

// Interpolation
Expand Down Expand Up @@ -599,15 +601,11 @@ var EmitterOp = new Class({
* @method Phaser.GameObjects.Particles.EmitterOp#defaultEmit
* @since 3.0.0
*
* @param {Phaser.GameObjects.Particles.Particle} particle - The particle.
* @param {string} key - The name of the property.
* @param {number} [value] - The current value of the property.
*
* @return {number} The new value of the property.
*/
defaultEmit: function (particle, key, value)
defaultEmit: function ()
{
return value;
return this.defaultValue;
},

/**
Expand Down