Skip to content

Commit 711d2a6

Browse files
committed
Minor additions and corrections to docs
1 parent 8b939d7 commit 711d2a6

2 files changed

Lines changed: 54 additions & 14 deletions

File tree

src/gameobjects/particles/ParticleEmitter.js

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ var ParticleEmitter = new Class({
302302
* @type {Phaser.GameObjects.Particles.EmitterOp}
303303
* @default 0
304304
* @since 3.0.0
305+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setPosition
305306
*/
306307
this.x = new EmitterOp(config, 'x', 0);
307308

@@ -312,6 +313,7 @@ var ParticleEmitter = new Class({
312313
* @type {Phaser.GameObjects.Particles.EmitterOp}
313314
* @default 0
314315
* @since 3.0.0
316+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setPosition
315317
*/
316318
this.y = new EmitterOp(config, 'y', 0);
317319

@@ -324,6 +326,7 @@ var ParticleEmitter = new Class({
324326
* @type {boolean}
325327
* @default true
326328
* @since 3.0.0
329+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setRadial
327330
*/
328331
this.radial = true;
329332

@@ -334,6 +337,7 @@ var ParticleEmitter = new Class({
334337
* @type {float}
335338
* @default 0
336339
* @since 3.0.0
340+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setGravity
337341
*/
338342
this.gravityX = 0;
339343

@@ -344,6 +348,7 @@ var ParticleEmitter = new Class({
344348
* @type {float}
345349
* @default 0
346350
* @since 3.0.0
351+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setGravity
347352
*/
348353
this.gravityY = 0;
349354

@@ -404,6 +409,7 @@ var ParticleEmitter = new Class({
404409
* @type {Phaser.GameObjects.Particles.EmitterOp}
405410
* @default 0
406411
* @since 3.0.0
412+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setSpeedX
407413
*/
408414
this.speedX = new EmitterOp(config, 'speedX', 0, true);
409415

@@ -414,6 +420,7 @@ var ParticleEmitter = new Class({
414420
* @type {Phaser.GameObjects.Particles.EmitterOp}
415421
* @default 0
416422
* @since 3.0.0
423+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setSpeedY
417424
*/
418425
this.speedY = new EmitterOp(config, 'speedY', 0, true);
419426

@@ -464,6 +471,8 @@ var ParticleEmitter = new Class({
464471
* @type {Phaser.GameObjects.Particles.EmitterOp}
465472
* @default 1
466473
* @since 3.0.0
474+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setScale
475+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setScaleX
467476
*/
468477
this.scaleX = new EmitterOp(config, 'scaleX', 1);
469478

@@ -474,6 +483,8 @@ var ParticleEmitter = new Class({
474483
* @type {Phaser.GameObjects.Particles.EmitterOp}
475484
* @default 1
476485
* @since 3.0.0
486+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setScale
487+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setScaleY
477488
*/
478489
this.scaleY = new EmitterOp(config, 'scaleY', 1);
479490

@@ -494,6 +505,7 @@ var ParticleEmitter = new Class({
494505
* @type {Phaser.GameObjects.Particles.EmitterOp}
495506
* @default 1
496507
* @since 3.0.0
508+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setAlpha
497509
*/
498510
this.alpha = new EmitterOp(config, 'alpha', 1);
499511

@@ -504,6 +516,7 @@ var ParticleEmitter = new Class({
504516
* @type {Phaser.GameObjects.Particles.EmitterOp}
505517
* @default 1000
506518
* @since 3.0.0
519+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setLifespan
507520
*/
508521
this.lifespan = new EmitterOp(config, 'lifespan', 1000);
509522

@@ -514,6 +527,7 @@ var ParticleEmitter = new Class({
514527
* @type {Phaser.GameObjects.Particles.EmitterOp}
515528
* @default { min: 0, max: 360 }
516529
* @since 3.0.0
530+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setAngle
517531
*/
518532
this.angle = new EmitterOp(config, 'angle', { min: 0, max: 360 });
519533

@@ -585,6 +599,8 @@ var ParticleEmitter = new Class({
585599
* @type {Phaser.GameObjects.Particles.EmitterOp}
586600
* @default 1
587601
* @since 3.0.0
602+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setFrequency
603+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setQuantity
588604
*/
589605
this.quantity = new EmitterOp(config, 'quantity', 1, true);
590606

@@ -602,18 +618,19 @@ var ParticleEmitter = new Class({
602618
* For a flow emitter, the time interval (>= 0) between particle flow cycles in ms.
603619
* A value of 0 means there is one particle flow cycle for each logic update (the maximum flow frequency). This is the default setting.
604620
* For an exploding emitter, this value will be -1.
605-
* Calling {@link Phaser.GameObjects.Particles.ParticleEmitter#flow} puts the emitter in flow mode (frequency >= 0).
606-
* Calling {@link Phaser.GameObjects.Particles.ParticleEmitter#explode} puts the emitter in explode mode (frequency -1).
621+
* Calling {@link Phaser.GameObjects.Particles.ParticleEmitter#flow} also puts the emitter in flow mode (frequency >= 0).
622+
* Calling {@link Phaser.GameObjects.Particles.ParticleEmitter#explode} also puts the emitter in explode mode (frequency = -1).
607623
*
608624
* @name Phaser.GameObjects.Particles.ParticleEmitter#frequency
609625
* @type {float}
610626
* @default 0
611627
* @since 3.0.0
628+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setFrequency
612629
*/
613630
this.frequency = 0;
614631

615632
/**
616-
* Controls if the emitter is currently emitting a particle flow (when frequency > -1).
633+
* Controls if the emitter is currently emitting a particle flow (when frequency >= 0).
617634
* Already alive particles will continue to update until they expire.
618635
* Controlled by {@link Phaser.GameObjects.Particles.ParticleEmitter#start}.
619636
*
@@ -652,16 +669,18 @@ var ParticleEmitter = new Class({
652669
* @type {?Phaser.GameObjects.Particles.Zones.EdgeZone|Phaser.GameObjects.Particles.Zones.RandomZone}
653670
* @default null
654671
* @since 3.0.0
672+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setEmitZone
655673
*/
656674
this.emitZone = null;
657675

658676
/**
659677
* An object describing a shape that deactivates particles when they interact with it.
660678
*
661679
* @name Phaser.GameObjects.Particles.ParticleEmitter#deathZone
662-
* @type {?Phaser.GameObjects.Particles.Zones.EdgeZone|Phaser.GameObjects.Particles.Zones.RandomZone}
680+
* @type {?Phaser.GameObjects.Particles.Zones.DeathZone}
663681
* @default null
664682
* @since 3.0.0
683+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setDeathZone
665684
*/
666685
this.deathZone = null;
667686

@@ -672,6 +691,7 @@ var ParticleEmitter = new Class({
672691
* @type {?Phaser.Geom.Rectangle}
673692
* @default null
674693
* @since 3.0.0
694+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setBounds
675695
*/
676696
this.bounds = null;
677697

@@ -735,6 +755,7 @@ var ParticleEmitter = new Class({
735755
* @type {boolean}
736756
* @default true
737757
* @since 3.0.0
758+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setVisible
738759
*/
739760
this.visible = true;
740761

@@ -744,6 +765,7 @@ var ParticleEmitter = new Class({
744765
* @name Phaser.GameObjects.Particles.ParticleEmitter#blendMode
745766
* @type {integer}
746767
* @since 3.0.0
768+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setBlendMode
747769
*/
748770
this.blendMode = BlendModes.NORMAL;
749771

@@ -754,6 +776,8 @@ var ParticleEmitter = new Class({
754776
* @type {?Phaser.GameObjects.GameObject}
755777
* @default null
756778
* @since 3.0.0
779+
* @see Phaser.GameObjects.Particles.ParticleEmitter#startFollow
780+
* @see Phaser.GameObjects.Particles.ParticleEmitter#stopFollow
757781
*/
758782
this.follow = null;
759783

@@ -763,6 +787,7 @@ var ParticleEmitter = new Class({
763787
* @name Phaser.GameObjects.Particles.ParticleEmitter#followOffset
764788
* @type {Phaser.Math.Vector2}
765789
* @since 3.0.0
790+
* @see Phaser.GameObjects.Particles.ParticleEmitter#startFollow
766791
*/
767792
this.followOffset = new Vector2();
768793

@@ -774,16 +799,18 @@ var ParticleEmitter = new Class({
774799
* @type {boolean}
775800
* @default false
776801
* @since 3.0.0
802+
* @see Phaser.GameObjects.Particles.ParticleEmitter#startFollow
777803
*/
778804
this.trackVisible = false;
779805

780806
/**
781-
* The current texture frame applied to emitted particles.
807+
* The current texture frame, as an index of {@link Phaser.GameObjects.Particles.ParticleEmitter#frames}.
782808
*
783809
* @name Phaser.GameObjects.Particles.ParticleEmitter#currentFrame
784810
* @type {integer}
785811
* @default 0
786812
* @since 3.0.0
813+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setFrame
787814
*/
788815
this.currentFrame = 0;
789816

@@ -794,6 +821,7 @@ var ParticleEmitter = new Class({
794821
* @type {boolean}
795822
* @default true
796823
* @since 3.0.0
824+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setFrame
797825
*/
798826
this.randomFrame = true;
799827

@@ -804,6 +832,7 @@ var ParticleEmitter = new Class({
804832
* @type {integer}
805833
* @default 1
806834
* @since 3.0.0
835+
* @see Phaser.GameObjects.Particles.ParticleEmitter#setFrame
807836
*/
808837
this.frameQuantity = 1;
809838

@@ -828,7 +857,7 @@ var ParticleEmitter = new Class({
828857
this.alive = [];
829858

830859
/**
831-
* The time until the next flow emission is due.
860+
* The time until the next flow cycle.
832861
*
833862
* @name Phaser.GameObjects.Particles.ParticleEmitter#_counter
834863
* @type {float}
@@ -839,7 +868,7 @@ var ParticleEmitter = new Class({
839868
this._counter = 0;
840869

841870
/**
842-
* Tracks texture frame allocations.
871+
* Counts up to {@link Phaser.GameObjects.Particles.ParticleEmitter#frameQuantity}.
843872
*
844873
* @name Phaser.GameObjects.Particles.ParticleEmitter#_frameCounter
845874
* @type {integer}
@@ -1053,7 +1082,7 @@ var ParticleEmitter = new Class({
10531082
},
10541083

10551084
/**
1056-
* Choose a texture frame from {@link Phaser.GameObjects.Particles.ParticleEmitter#frames}.
1085+
* Chooses a texture frame from {@link Phaser.GameObjects.Particles.ParticleEmitter#frames}.
10571086
*
10581087
* @method Phaser.GameObjects.Particles.ParticleEmitter#getFrame
10591088
* @since 3.0.0
@@ -1150,7 +1179,7 @@ var ParticleEmitter = new Class({
11501179
},
11511180

11521181
/**
1153-
* Turns the {@link Phaser.GameObjects.Particles.ParticleEmitter#radial} emission mode on or off.
1182+
* Turns {@link Phaser.GameObjects.Particles.ParticleEmitter#radial} particle movement on or off.
11541183
*
11551184
* @method Phaser.GameObjects.Particles.ParticleEmitter#setRadial
11561185
* @since 3.0.0
@@ -1229,6 +1258,7 @@ var ParticleEmitter = new Class({
12291258

12301259
/**
12311260
* Sets the initial horizontal speed of emitted particles.
1261+
* Changes the emitter to point mode.
12321262
*
12331263
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeedX
12341264
* @since 3.0.0
@@ -1249,6 +1279,7 @@ var ParticleEmitter = new Class({
12491279

12501280
/**
12511281
* Sets the initial vertical speed of emitted particles.
1282+
* Changes the emitter to point mode.
12521283
*
12531284
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeedY
12541285
* @since 3.0.0
@@ -1272,6 +1303,7 @@ var ParticleEmitter = new Class({
12721303

12731304
/**
12741305
* Sets the initial radial speed of emitted particles.
1306+
* Changes the emitter to radial mode.
12751307
*
12761308
* @method Phaser.GameObjects.Particles.ParticleEmitter#setSpeed
12771309
* @since 3.0.0
@@ -1510,9 +1542,9 @@ var ParticleEmitter = new Class({
15101542
/**
15111543
* Sets or removes the {@link Phaser.GameObjects.Particles.ParticleEmitter#emitZone}.
15121544
*
1513-
* When `source.type` is 'edge', `source` must have a function `getPoints(quantity, stepRate)` that returns an array of points.
1545+
* An {@link ParticleEmitterEdgeZoneConfig EdgeZone} places particles on its edges. Its {@link EdgeZoneSource source} can be a Curve, Path, Circle, Ellipse, Line, Polygon, Rectangle, or Triangle; or any object with a suitable {@link EdgeZoneSourceCallback getPoints} method.
15141546
*
1515-
* When `source.type` is 'random' (or omitted), `source` must have a function `getRandomPoint(point)` that modifies its argument.
1547+
* A {@link ParticleEmitterRandomZoneConfig RandomZone} places randomly within its interior. Its {@link RandomZoneSource source} can be a Circle, Ellipse, Line, Polygon, Rectangle, or Triangle; or any object with a suitable {@link RandomZoneSourceCallback getRandomPoint} method.
15161548
*
15171549
* @method Phaser.GameObjects.Particles.ParticleEmitter#setEmitZone
15181550
* @since 3.0.0
@@ -1574,7 +1606,7 @@ var ParticleEmitter = new Class({
15741606
* @method Phaser.GameObjects.Particles.ParticleEmitter#setDeathZone
15751607
* @since 3.0.0
15761608
*
1577-
* @param {object} [ParticleEmitterDeathZoneConfig] - An object describing the zone, or `undefined` to remove any current death zone.
1609+
* @param {ParticleEmitterDeathZoneConfig} [zoneConfig] - An object describing the zone, or `undefined` to remove any current death zone.
15781610
*
15791611
* @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
15801612
*/
@@ -1881,7 +1913,9 @@ var ParticleEmitter = new Class({
18811913
},
18821914

18831915
/**
1884-
* Starts (or restarts) a particle flow.
1916+
* Puts the emitter in flow mode (frequency >= 0) and starts (or restarts) a particle flow.
1917+
*
1918+
* To resume a flow at the current frequency and quantity, use {@link Phaser.GameObjects.Particles.ParticleEmitter#start} instead.
18851919
*
18861920
* @method Phaser.GameObjects.Particles.ParticleEmitter#flow
18871921
* @since 3.0.0
@@ -1903,7 +1937,7 @@ var ParticleEmitter = new Class({
19031937
},
19041938

19051939
/**
1906-
* Stops any current particle flow and emits several particles all at once.
1940+
* Puts the emitter in explode mode (frequency = -1), stopping any current particle flow, and emits several particles all at once.
19071941
*
19081942
* @method Phaser.GameObjects.Particles.ParticleEmitter#explode
19091943
* @since 3.0.0

src/gameobjects/particles/zones/DeathZone.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ var Class = require('../../../utils/Class');
1919
* @typedef {object} DeathZoneSource
2020
*
2121
* @property {DeathZoneSourceCallback} contains
22+
*
23+
* @see Phaser.Geom.Circle
24+
* @see Phaser.Geom.Ellipse
25+
* @see Phaser.Geom.Polygon
26+
* @see Phaser.Geom.Rectangle
27+
* @see Phaser.Geom.Triangle
2228
*/
2329

2430
/**

0 commit comments

Comments
 (0)