diff --git a/Apps/Sandcastle/gallery/Particle System Weather.html b/Apps/Sandcastle/gallery/Particle System Weather.html index 7035b4d507e1..e1854b1afa51 100644 --- a/Apps/Sandcastle/gallery/Particle System Weather.html +++ b/Apps/Sandcastle/gallery/Particle System Weather.html @@ -75,7 +75,7 @@ emitter : new Cesium.SphereEmitter(snowRadius), startScale : 0.5, endScale : 1.0, - image : "../../SampleData/snowflake_particle.png", + image : '../../SampleData/snowflake_particle.png', emissionRate : 7000.0, startColor : Cesium.Color.WHITE.withAlpha(0.0), endColor : Cesium.Color.WHITE.withAlpha(1.0), @@ -114,7 +114,7 @@ emitter : new Cesium.SphereEmitter(rainRadius), startScale : 1.0, endScale : 0.0, - image : "../../SampleData/circular_particle.png", + image : '../../SampleData/circular_particle.png', emissionRate : 9000.0, startColor :new Cesium.Color(0.27, 0.5, 0.70, 0.0), endColor : new Cesium.Color(0.27, 0.5, 0.70, 0.98), diff --git a/Apps/Sandcastle/gallery/Particle System.html b/Apps/Sandcastle/gallery/Particle System.html index ea86ed3e60f7..0fdc7852ef08 100644 --- a/Apps/Sandcastle/gallery/Particle System.html +++ b/Apps/Sandcastle/gallery/Particle System.html @@ -325,8 +325,12 @@ Cesium.knockout.getObservable(viewModel, 'particleSize').subscribe( function(newValue) { var particleSize = parseFloat(newValue); - particleSystem.imageSize.x = particleSize; - particleSystem.imageSize.y = particleSize; + if (particleSystem.imageSize) { + particleSystem.imageSize.x = particleSize; + particleSystem.imageSize.y = particleSize; + } else { + particleSystem.imageSize = new Cesium.Cartesian2(particleSize, particleSize); + } } ); diff --git a/CHANGES.md b/CHANGES.md index f49e19e5cd16..ad402267a05b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,11 +36,6 @@ Change Log * Fixed crash bug in PolylineCollection when a polyline was updated and removed at the same time. [#6455](https://github.com/AnalyticalGraphicsInc/cesium/pull/6455) * Fixed Imagery Layers Texture Filters Sandcastle example. [#6472](https://github.com/AnalyticalGraphicsInc/cesium/pull/6472). -##### Deprecated :hourglass_flowing_sand: -* `Particle.size`, `ParticleSystem.rate`, `ParticleSystem.lifeTime`, `ParticleSystem.life`, `ParticleSystem.minimumLife`, and `ParticleSystem.maximumLife` have been renamed to `Particle.imageSize`, `ParticleSystem.emissionRate`, `ParticleSystem.lifetime`, `ParticleSystem.particleLife`, `ParticleSystem.minimumParticleLife`, and `ParticleSystem.maximumParticleLife`. Use of the `size`, `rate`, `lifeTime`, `life`, `minimumLife`, and `maximumLife` parameters is deprecated and will be removed in Cesium 1.46. -* `ParticleSystem.forces` array has been switched out for singular function `ParticleSystems.updateCallback`. Use of the `forces` parameter is deprecated and will be removed in Cesium 1.46. -* Any width and height variables in `ParticleSystem` will no longer be individual components. `ParticleSystem.minimumWidth` and `ParticleSystem.minimumHeight` will now be `ParticleSystem.minimumImageSize`, `ParticleSystem.maximumWidth` and `ParticleSystem.maximumHeight` will now be `ParticleSystem.maximumImageSize`, and `ParticleSystem.width` and `ParticleSystem.height` will now be `ParticleSystem.imageSize`. Use of the `minimumWidth`, `minimumHeight`, `maximumWidth`, `maximumHeight`, `width`, and `height` parameters is deprecated and will be removed in Cesium 1.46. - ### 1.44 - 2018-04-02 ##### Highlights :sparkler: