Skip to content
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

updated sandcastle particle system example for better visual #6132

Merged
merged 5 commits into from
Jan 23, 2018

Conversation

hanbollar
Copy link
Contributor

fixes #5583

@cesium-concierge
Copy link

Signed CLA is on file.

@hanbollar, thanks for the pull request! Maintainers, we have a signed CLA from @hanbollar, so you can review this at any time.


I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome.

🌍 🌎 🌏

@ggetz ggetz self-requested a review January 18, 2018 22:14
Copy link
Contributor

@ggetz ggetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @hanbollar ! Can you clean up the indentation so the diff is readable for a full review?

@@ -137,298 +137,301 @@
</div>

<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
function startup(Cesium) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shift-tab this block, or else it will show up with an extra tab in Sandcastle.

CHANGES.md Outdated
@@ -31,6 +31,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
* Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113)
* Fixed sandcastle Particle System example for better visual
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link the the issue your fixing, (or the PR)

@hanbollar
Copy link
Contributor Author

Thanks @ggetz ! Updated with your changes.

Copy link
Contributor

@ggetz ggetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again @hanbollar, I have some minor comments.

@@ -244,7 +244,7 @@

//Load the Cesium plane model to represent the entity
model : {
uri : '../../SampleData/models/CesiumAir/Cesium_Air.gltf',
uri : '../../../../Apps/SampleData/models/CesiumAir/Cesium_Air.gltf',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these need to be changed, this path should work with both the built and non-built versions of sandcastle.

@@ -254,7 +254,7 @@

var scene = viewer.scene;
var particleSystem = scene.primitives.add(new Cesium.ParticleSystem({
image : '../../SampleData/fire.png',
image : '../../../../Apps/SampleData/fire.png',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

new Cesium.ParticleBurst({time : 10.0, minimum : 50, maximum : 100}),
new Cesium.ParticleBurst({time : 15.0, minimum : 200, maximum : 300})
],

lifeTime : 16.0,

//emitter : new Cesium.SphereEmitter(5.0),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove comment

new Cesium.ParticleBurst({time : 10.0, minimum : 50, maximum : 100}),
new Cesium.ParticleBurst({time : 15.0, minimum : 200, maximum : 300})
],

lifeTime : 16.0,

//emitter : new Cesium.SphereEmitter(5.0),
emitter : new Cesium.CircleEmitter(0.5),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're starting with the Sphere emitter selected, shouldn't this be a Sphere and not Circle?

onselect : function() {
particleSystem.emitter = new Cesium.SphereEmitter(2.5);
}
}, {
text : 'Circle',
onselect : function() {
particleSystem.emitter = new Cesium.CircleEmitter(0.5);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do any of these other emitters need tweaks to their size to look good with the changes>

CHANGES.md Outdated
@@ -31,6 +31,7 @@ Change Log
* Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
* Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874)
* Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113)
* Fixed sandcastle Particle System example for better visual [#6132](https://github.com/AnalyticalGraphicsInc/cesium/pull/6132)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sandcastle -> Sandcastle

…s first emitter used. updated changes.md. modified circle emitter's parameters for vis
@hanbollar
Copy link
Contributor Author

@ggetz posted with updates and in regards to updating other emitters - updated others already with tweaks; however, latest commit also includes minor change to circle emitter's parameter.

@ggetz
Copy link
Contributor

ggetz commented Jan 19, 2018

Thanks @hanbollar, just make sure you address #6132 (comment)

@hanbollar
Copy link
Contributor Author

@ggetz woops thought I got that. Thanks for the catch. Should be fixed now.

@ggetz
Copy link
Contributor

ggetz commented Jan 23, 2018

Looks good! Thanks @hanbollar!

@ggetz ggetz merged commit f9c53a3 into CesiumGS:master Jan 23, 2018
@hanbollar hanbollar deleted the particle-system-demo-fix branch February 2, 2018 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Particle System demo burst looks weird
3 participants