Particle Systems #5212
+2,745
−7
Moved logic into ParticleSystem
commit d2959ba6e18da6d583d25c505b60d8ff1067ad9c
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
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 |
|---|---|---|
| @@ -4,6 +4,7 @@ define([ | ||
| '../Core/defined', | ||
| '../Core/Cartesian2', | ||
| '../Core/Cartesian3', | ||
| '../Core/Event', | ||
| '../Core/Matrix4', | ||
| '../Core/Math', | ||
| '../Core/JulianDate', | ||
| @@ -15,6 +16,7 @@ define([ | ||
| defined, | ||
| Cartesian2, | ||
| Cartesian3, | ||
| Event, | ||
| Matrix4, | ||
| CesiumMath, | ||
| JulianDate, | ||
| @@ -39,6 +41,9 @@ define([ | ||
| this.startScale = defaultValue(options.startScale, 1.0); | ||
| this.endScale = defaultValue(options.endScale, 1.0); | ||
|
|
||
| this.rate = defaultValue(options.rate, 5); | ||
| this.bursts = defaultValue(options.bursts, null); | ||
|
There was a problem hiding this comment. Just There was a problem hiding this comment. I made this change along with a few others in acd31e7 that removed the unnecessary use of defaultValue. |
||
|
|
||
| var speed = defaultValue(options.speed, undefined); | ||
| if (speed) { | ||
| this.minSpeed = speed; | ||
| @@ -91,8 +96,14 @@ define([ | ||
| this.maxHeight = defaultValue(options.maxHeight, 1.0); | ||
| } | ||
|
|
||
| this.lifeTime = defaultValue(options.lifeTime, Number.MAX_VALUE); | ||
|
|
||
| this.complete = new Event(); | ||
| this.isComplete = false; | ||
|
|
||
| this.carryOver = 0.0; | ||
| this.currentTime = 0.0; | ||
| this._billboardCollection = undefined; | ||
| this._previousTime = null; | ||
| }; | ||
|
|
||
| @@ -144,6 +155,40 @@ define([ | ||
| this.particles.push(particle); | ||
| }; | ||
|
|
||
| ParticleSystem.prototype.calcNumberToEmit = function(dt) { | ||
|
There was a problem hiding this comment. If this would be part of the public API, spell out There was a problem hiding this comment. I'll rename it, but also mark it as @Private. It's not something that an external user should be calling. There was a problem hiding this comment. I actually ended up making these local file scoped functions like mentioned here |
||
| // This emitter is finished if it exceeds it's lifetime. | ||
| if (this.isComplete) { | ||
| return 0; | ||
| } | ||
|
|
||
| // Compute the number of particles to emit based on the rate. | ||
| var v = dt * this.rate; | ||
| var numToEmit = Math.floor(v); | ||
| this.carryOver += (v-numToEmit); | ||
| if (this.carryOver>1.0) | ||
| { | ||
| numToEmit++; | ||
| this.carryOver -= 1.0; | ||
| } | ||
|
|
||
|
|
||
| var i = 0; | ||
|
|
||
| // Apply any bursts | ||
| if (this.bursts) { | ||
| for (i = 0; i < this.bursts.length; i++) { | ||
|
There was a problem hiding this comment. Generally, we would assign this outside of the loop var length = this.bursts.length; |
||
| var burst = this.bursts[i]; | ||
| if ((!defined(burst, "complete") || !burst.complete) && this.currentTime > burst.time) { | ||
|
There was a problem hiding this comment. Remove |
||
| var count = burst.min + random(0.0, 1.0) * burst.max; | ||
| numToEmit += count; | ||
| burst.complete = true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return numToEmit; | ||
| }; | ||
|
|
||
| ParticleSystem.prototype.update = function(frameState) { | ||
| if (!defined(this._billboardCollection)) { | ||
| this._billboardCollection = new BillboardCollection(); | ||
| @@ -178,14 +223,24 @@ define([ | ||
| } | ||
| particles.length = length; | ||
|
|
||
|
|
||
| var numToEmit = this.calcNumberToEmit(dt); | ||
|
|
||
| if (numToEmit > 0 && emitter) { | ||
| emitter.modelMatrix = this.modelMatrix; | ||
| emitter.emit(this, numToEmit); | ||
| } | ||
|
|
||
| this._billboardCollection.update(frameState); | ||
|
|
||
| this._previousTime = JulianDate.clone(frameState.time, this._previousTime); | ||
|
|
||
| this.currentTime += dt; | ||
|
|
||
| if (this.lifeTime !== Number.MAX_VALUE && this.currentTime > this.lifeTime) { | ||
| this.isComplete = true; | ||
| this.complete.raiseEvent(this); | ||
| } | ||
| }; | ||
|
|
||
| return ParticleSystem; | ||
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
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.
What are the bounds on all these? Do any of these need explicit
setfunctions to throwDeveloperErrors?