Skip to content

Commit 0d0e37a

Browse files
authored
Merge pull request #7412 from AnalyticalGraphicsInc/particle-size
Fix particle image size
2 parents 1735997 + 526b95e commit 0d0e37a

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Change Log
99
##### Additions :tada:
1010
* Added the ability to specify the width of the intersection volume for `Scene.sampleHeight`, `Scene.clampToHeight`, `Scene.sampleHeightMostDetailed`, and `Scene.clampToHeightMostDetailed`. [#7287](https://github.com/AnalyticalGraphicsInc/cesium/pull/7287)
1111

12+
##### Fixes :wrench:
13+
* Fixed image size issue when using multiple particle systems [#7412](https://github.com/AnalyticalGraphicsInc/cesium/pull/7412)
14+
1215
### 1.53 - 2019-01-02
1316

1417
##### Additions :tada:

Source/Scene/ParticleSystem.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ define([
134134
this._minimumMass = defaultValue(options.mass, defaultValue(options.minimumMass, 1.0));
135135
this._maximumMass = defaultValue(options.mass, defaultValue(options.maximumMass, 1.0));
136136

137-
this._minimumImageSize = defaultValue(options.imageSize, defaultValue(options.minimumImageSize, defaultImageSize));
138-
this._maximumImageSize = defaultValue(options.imageSize, defaultValue(options.maximumImageSize, defaultImageSize));
137+
this._minimumImageSize = Cartesian2.clone(defaultValue(options.imageSize, defaultValue(options.minimumImageSize, defaultImageSize)));
138+
this._maximumImageSize = Cartesian2.clone(defaultValue(options.imageSize, defaultValue(options.maximumImageSize, defaultImageSize)));
139139

140140
this._lifetime = defaultValue(options.lifetime, Number.MAX_VALUE);
141141

Specs/Scene/ParticleSystemSpec.js

+5
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,11 @@ defineSuite([
323323
}).toThrowDeveloperError();
324324
});
325325

326+
it('clones default image size', function() {
327+
var p = new ParticleSystem();
328+
expect(p.maximumImageSize).not.toBe(p.minimumImageSize);
329+
});
330+
326331
it('renders', function() {
327332
scene.primitives.add(new ParticleSystem({
328333
image : greenImage,

0 commit comments

Comments
 (0)