Skip to content

Commit dc13cc2

Browse files
authored
Merge pull request phaserjs#4569 from samme/types/emitter-ops
Add EmitterOpOnEmitType and EmitterOpOnUpdateType
2 parents 018c234 + d3407c5 commit dc13cc2

4 files changed

Lines changed: 45 additions & 37 deletions

File tree

src/gameobjects/particles/ParticleEmitter.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,8 +1082,8 @@ var ParticleEmitter = new Class({
10821082
* @method Phaser.GameObjects.Particles.ParticleEmitter#setPosition
10831083
* @since 3.0.0
10841084
*
1085-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} x - The x-coordinate of the particle origin.
1086-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} y - The y-coordinate of the particle origin.
1085+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} x - The x-coordinate of the particle origin.
1086+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} y - The y-coordinate of the particle origin.
10871087
*
10881088
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
10891089
*/
@@ -1141,7 +1141,7 @@ var ParticleEmitter = new Class({
11411141
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeedX
11421142
* @since 3.0.0
11431143
*
1144-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The speed, in pixels per second.
1144+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} value - The speed, in pixels per second.
11451145
*
11461146
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
11471147
*/
@@ -1162,7 +1162,7 @@ var ParticleEmitter = new Class({
11621162
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeedY
11631163
* @since 3.0.0
11641164
*
1165-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The speed, in pixels per second.
1165+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} value - The speed, in pixels per second.
11661166
*
11671167
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
11681168
*/
@@ -1186,7 +1186,7 @@ var ParticleEmitter = new Class({
11861186
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeed
11871187
* @since 3.0.0
11881188
*
1189-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The speed, in pixels per second.
1189+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} value - The speed, in pixels per second.
11901190
*
11911191
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
11921192
*/
@@ -1207,7 +1207,7 @@ var ParticleEmitter = new Class({
12071207
* @method Phaser.GameObjects.Particles.ParticleEmitter#setScaleX
12081208
* @since 3.0.0
12091209
*
1210-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateCallback|object} value - The scale, relative to 1.
1210+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - The scale, relative to 1.
12111211
*
12121212
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
12131213
*/
@@ -1224,7 +1224,7 @@ var ParticleEmitter = new Class({
12241224
* @method Phaser.GameObjects.Particles.ParticleEmitter#setScaleY
12251225
* @since 3.0.0
12261226
*
1227-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateCallback|object} value - The scale, relative to 1.
1227+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - The scale, relative to 1.
12281228
*
12291229
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
12301230
*/
@@ -1241,7 +1241,7 @@ var ParticleEmitter = new Class({
12411241
* @method Phaser.GameObjects.Particles.ParticleEmitter#setScale
12421242
* @since 3.0.0
12431243
*
1244-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateCallback|object} value - The scale, relative to 1.
1244+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - The scale, relative to 1.
12451245
*
12461246
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
12471247
*/
@@ -1312,7 +1312,7 @@ var ParticleEmitter = new Class({
13121312
* @method Phaser.GameObjects.Particles.ParticleEmitter#setAlpha
13131313
* @since 3.0.0
13141314
*
1315-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateCallback|object} value - A value between 0 (transparent) and 1 (opaque).
1315+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - A value between 0 (transparent) and 1 (opaque).
13161316
*
13171317
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
13181318
*/
@@ -1329,7 +1329,7 @@ var ParticleEmitter = new Class({
13291329
* @method Phaser.GameObjects.Particles.ParticleEmitter#setEmitterAngle
13301330
* @since 3.0.0
13311331
*
1332-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The angle of the initial velocity of emitted particles.
1332+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} value - The angle of the initial velocity of emitted particles.
13331333
*
13341334
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
13351335
*/
@@ -1346,7 +1346,7 @@ var ParticleEmitter = new Class({
13461346
* @method Phaser.GameObjects.Particles.ParticleEmitter#setAngle
13471347
* @since 3.0.0
13481348
*
1349-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The angle of the initial velocity of emitted particles.
1349+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - The angle of the initial velocity of emitted particles.
13501350
*
13511351
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
13521352
*/
@@ -1363,7 +1363,7 @@ var ParticleEmitter = new Class({
13631363
* @method Phaser.GameObjects.Particles.ParticleEmitter#setLifespan
13641364
* @since 3.0.0
13651365
*
1366-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} value - The particle lifespan, in ms.
1366+
* @param {(Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType|Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType)} value - The particle lifespan, in ms.
13671367
*
13681368
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
13691369
*/
@@ -1380,7 +1380,7 @@ var ParticleEmitter = new Class({
13801380
* @method Phaser.GameObjects.Particles.ParticleEmitter#setQuantity
13811381
* @since 3.0.0
13821382
*
1383-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} quantity - The number of particles to release at each flow cycle or explosion.
1383+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} quantity - The number of particles to release at each flow cycle or explosion.
13841384
*
13851385
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
13861386
*/
@@ -1399,7 +1399,7 @@ var ParticleEmitter = new Class({
13991399
* @since 3.0.0
14001400
*
14011401
* @param {number} frequency - The time interval (>= 0) of each flow cycle, in ms; or -1 to put the emitter in explosion mode.
1402-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} [quantity] - The number of particles to release at each flow cycle or explosion.
1402+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} [quantity] - The number of particles to release at each flow cycle or explosion.
14031403
*
14041404
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
14051405
*/
@@ -1806,7 +1806,7 @@ var ParticleEmitter = new Class({
18061806
* @since 3.0.0
18071807
*
18081808
* @param {number} frequency - The time interval (>= 0) of each flow cycle, in ms.
1809-
* @param {number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|object} [count=1] - The number of particles to emit at each flow cycle.
1809+
* @param {Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType} [count=1] - The number of particles to emit at each flow cycle.
18101810
*
18111811
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
18121812
*/
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* @typedef {(number|number[]|Phaser.Types.GameObjects.Particles.EmitterOpOnEmitCallback|Phaser.Types.GameObjects.Particles.EmitterOpRandomConfig|Phaser.Types.GameObjects.Particles.EmitterOpRandomMinMaxConfig|Phaser.Types.GameObjects.Particles.EmitterOpRandomStartEndConfig|Phaser.Types.GameObjects.Particles.EmitterOpSteppedConfig|Phaser.Types.GameObjects.Particles.EmitterOpCustomEmitConfig)} Phaser.Types.GameObjects.Particles.EmitterOpOnEmitType
3+
* @since 3.18.0
4+
*/
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* @typedef {(Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateCallback|Phaser.Types.GameObjects.Particles.EmitterOpEaseConfig|Phaser.Types.GameObjects.Particles.EmitterOpCustomUpdateConfig)} Phaser.Types.GameObjects.Particles.EmitterOpOnUpdateType
3+
* @since 3.18.0
4+
*/

src/gameobjects/particles/typedefs/ParticleEmitterConfig.js

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)