min to minimum and max to maximum in particle systems

Apps/Sandcastle/gallery/ParticleSystem.html

@@ -64,32 +64,32 @@
         <tr>
             <td>Min Life</td>
             <td>
-                <input type="range" min="0.1" max="30.0" step="1" data-bind="value: minLife, valueUpdate: 'input'">
-                <input type="text" size="5" data-bind="value: minLife">
+                <input type="range" min="0.1" max="30.0" step="1" data-bind="value: minimumLife, valueUpdate: 'input'">
+                <input type="text" size="5" data-bind="value: minimumLife">
             </td>
         </tr>
 
         <tr>
             <td>Max Life</td>
             <td>
-                <input type="range" min="0.1" max="30.0" step="1" data-bind="value: maxLife, valueUpdate: 'input'">
-                <input type="text" size="5" data-bind="value: maxLife">
+                <input type="range" min="0.1" max="30.0" step="1" data-bind="value: maximumLife, valueUpdate: 'input'">
+                <input type="text" size="5" data-bind="value: maximumLife">
             </td>
         </tr>
 
         <tr>
             <td>Min Speed</td>
             <td>
-                <input type="range" min="0.0" max="30.0" step="1" data-bind="value: minSpeed, valueUpdate: 'input'">
-                <input type="text" size="5" data-bind="value: minSpeed">
+                <input type="range" min="0.0" max="30.0" step="1" data-bind="value: minimumSpeed, valueUpdate: 'input'">
+                <input type="text" size="5" data-bind="value: minimumSpeed">
             </td>
         </tr>
 
         <tr>
             <td>Max Speed</td>
             <td>
-                <input type="range" min="0.0" max="30.0" step="1" data-bind="value: maxSpeed, valueUpdate: 'input'">
-                <input type="text" size="5" data-bind="value: maxSpeed">
+                <input type="range" min="0.0" max="30.0" step="1" data-bind="value: maximumSpeed, valueUpdate: 'input'">
+                <input type="text" size="5" data-bind="value: maximumSpeed">
             </td>
         </tr>
 
@@ -165,10 +165,10 @@
 var viewModel = {
     rate : 5.0,
     gravity : 0.0,
-    minLife : 1.0,
-    maxLife : 1.0,
-    minSpeed : 5,
-    maxSpeed : 5,
+    minimumLife : 1.0,
+    maximumLife : 1.0,
+    minimumSpeed : 5,
+    maximumSpeed : 5,
     startScale : 1.0,
     endScale : 4.0,
     particleSize : 40.0,
@@ -228,17 +228,17 @@
         startScale : viewModel.startScale,
         endScale : viewModel.endScale,
 
-        minLife : viewModel.minLife,
-        maxLife : viewModel.maxLife,
+        minimumLife : viewModel.minimumLife,
+        maximumLife : viewModel.maximumLife,
 
-        minSpeed : viewModel.minSpeed,
-        maxSpeed : viewModel.maxSpeed,
+        minimumSpeed : viewModel.minimumSpeed,
+        maximumSpeed : viewModel.maximumSpeed,
 
-        minWidth : viewModel.particleSize,
-        minHeight : viewModel.particleSize,
+        minimumWidth : viewModel.particleSize,
+        minimumHeight : viewModel.particleSize,
 
-        maxWidth : viewModel.particleSize,
-        maxHeight : viewModel.particleSize,
+        maximumWidth : viewModel.particleSize,
+        maximumHeight : viewModel.particleSize,
 
         // Particles per second.
         rate : viewModel.rate,
@@ -312,34 +312,34 @@
 Cesium.knockout.getObservable(viewModel, 'particleSize').subscribe(
     function(newValue) {
         var particleSize = parseFloat(newValue);
-        entity.particleSystem.minWidth = particleSize;
-        entity.particleSystem.maxWidth = particleSize;
-        entity.particleSystem.minHeight = particleSize;
-        entity.particleSystem.maxHeight = particleSize;
+        entity.particleSystem.minimumWidth = particleSize;
+        entity.particleSystem.maximumWidth = particleSize;
+        entity.particleSystem.minimumHeight = particleSize;
+        entity.particleSystem.maximumHeight = particleSize;
     }
 );
 
-Cesium.knockout.getObservable(viewModel, 'minLife').subscribe(
+Cesium.knockout.getObservable(viewModel, 'minimumLife').subscribe(
     function(newValue) {
-        entity.particleSystem.minLife = parseFloat(newValue);
+        entity.particleSystem.minimumLife = parseFloat(newValue);
     }
 );
 
-Cesium.knockout.getObservable(viewModel, 'maxLife').subscribe(
+Cesium.knockout.getObservable(viewModel, 'maximumLife').subscribe(
     function(newValue) {
-        entity.particleSystem.maxLife = parseFloat(newValue);
+        entity.particleSystem.maximumLife = parseFloat(newValue);
     }
 );
 
-Cesium.knockout.getObservable(viewModel, 'minSpeed').subscribe(
+Cesium.knockout.getObservable(viewModel, 'minimumSpeed').subscribe(
     function(newValue) {
-        entity.particleSystem.minSpeed = parseFloat(newValue);
+        entity.particleSystem.minimumSpeed = parseFloat(newValue);
     }
 );
 
-Cesium.knockout.getObservable(viewModel, 'maxSpeed').subscribe(
+Cesium.knockout.getObservable(viewModel, 'maximumSpeed').subscribe(
     function(newValue) {
-        entity.particleSystem.maxSpeed = parseFloat(newValue);
+        entity.particleSystem.maximumSpeed = parseFloat(newValue);
     }
 );
 

Source/DataSources/ParticleSystemGraphics.js

@@ -38,22 +38,22 @@ define([
         this._endColorSubscription = undefined;
         this._rate = undefined;
         this._rateSubscription = undefined;
-        this._minWidth = undefined;
-        this._minWidthSubscription = undefined;
-        this._maxWidth = undefined;
-        this._maxWidthSubscription = undefined;
-        this._minHeight = undefined;
-        this._minHeightSubscription = undefined;
-        this._maxHeight = undefined;
-        this._maxHeightSubscription = undefined;
-        this._minSpeed = undefined;
-        this._minSpeedSubscription = undefined;
-        this._maxSpeed = undefined;
-        this._maxSpeedSubscription = undefined;
-        this._minLife = undefined;
-        this._minLifeSubscription = undefined;
-        this._maxLife = undefined;
-        this._maxLifeSubscription = undefined;
+        this._minimumWidth = undefined;
+        this._minimumWidthSubscription = undefined;
+        this._maximumWidth = undefined;
+        this._maximumWidthSubscription = undefined;
+        this._minimumHeight = undefined;
+        this._minimumHeightSubscription = undefined;
+        this._maximumHeight = undefined;
+        this._maximumHeightSubscription = undefined;
+        this._minimumSpeed = undefined;
+        this._minimumSpeedSubscription = undefined;
+        this._maximumSpeed = undefined;
+        this._maximumSpeedSubscription = undefined;
+        this._minimumLife = undefined;
+        this._minimumLifeSubscription = undefined;
+        this._maximumLife = undefined;
+        this._maximumLifeSubscription = undefined;
         this._loop = undefined;
         this._loopSubscription = undefined;
         this._lifeTime = undefined;
@@ -153,47 +153,47 @@ define([
          * @type {Property}
          * @default 16.0
          */
-        minWidth: createPropertyDescriptor('minWidth'),
+        minimumWidth: createPropertyDescriptor('minimumWidth'),
 
         /**
          * The maximum width of a particle billboard.
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 16.0
          */
-        maxWidth: createPropertyDescriptor('maxWidth'),
+        maximumWidth: createPropertyDescriptor('maximumWidth'),
 
         /**
          * The minimum height of a particle billboard.
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 16.0
          */
-        minHeight: createPropertyDescriptor('minHeight'),
+        minimumHeight: createPropertyDescriptor('minimumHeight'),
 
         /**
          * The maximum height of a particle billboard.
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 16.0
          */
-        maxHeight: createPropertyDescriptor('maxHeight'),
+        maximumHeight: createPropertyDescriptor('maximumHeight'),
 
         /**
          * The minimum speed of a particle.
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 5.0
          */
-        minSpeed: createPropertyDescriptor('minSpeed'),
+        minimumSpeed: createPropertyDescriptor('minimumSpeed'),
 
         /**
          * The maximum speed of a particle.
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 5.0
          */
-        maxSpeed: createPropertyDescriptor('maxSpeed'),
+        maximumSpeed: createPropertyDescriptor('maximumSpeed'),
 
         /**
          * Whether the particle system should loop when it's complete.
@@ -237,15 +237,15 @@ define([
          * @type {Property}
          * @default 5.0
          */
-        minLife: createPropertyDescriptor("minLife"),
+        minimumLife: createPropertyDescriptor("minimumLife"),
 
         /**
          * The maximum life in seconds of a particle
          * @memberof ParticleSystemGraphics.prototype
          * @type {Property}
          * @default 5.0
          */
-        maxLife: createPropertyDescriptor("maxLife"),
+        maximumLife: createPropertyDescriptor("maximumLife"),
 
         /**
          * An array of callbacks that apply a force to a given particle over time.
@@ -274,14 +274,14 @@ define([
         result.startColor = this.startColor;
         result.endColor = this.endColor;
         result.rate = this.rate;
-        result.minWidth = this.minWidth;
-        result.maxWidth = this.maxWidth;
-        result.minHeight = this.minHeight;
-        result.maxHeight = this.maxHeight;
-        result.minSpeed = this.minSpeed;
-        result.maxSpeed = this.maxSpeed;
-        result.minLife = this.minLife;
-        result.maxLife = this.maxLife;
+        result.minimumWidth = this.minimumWidth;
+        result.maximumWidth = this.maximumWidth;
+        result.minimumHeight = this.minimumHeight;
+        result.maximumHeight = this.maximumHeight;
+        result.minimumSpeed = this.minimumSpeed;
+        result.maximumSpeed = this.maximumSpeed;
+        result.minimumLife = this.minimumLife;
+        result.maximumLife = this.maximumLife;
         result.loop = this.loop;
         result.lifeTime = this.lifeTime;
         result.emitterModelMatrix = this.emitterModelMatrix;
@@ -312,14 +312,14 @@ define([
         this.startColor = defaultValue(this.startColor, source.startColor);
         this.endColor = defaultValue(this.endColor, source.endColor);
         this.rate = defaultValue(this.rate, source.rate);
-        this.minWidth = defaultValue(this.minWidth, source.minWidth);
-        this.maxWidth = defaultValue(this.maxWidth, source.maxWidth);
-        this.minHeight = defaultValue(this.minHeight, source.minHeight);
-        this.maxHeight = defaultValue(this.maxHeight, source.maxHeight);
-        this.minSpeed = defaultValue(this.minSpeed, source.minSpeed);
-        this.maxSpeed = defaultValue(this.maxSpeed, source.maxSpeed);
-        this.minLife = defaultValue(this.minLife, source.minLife);
-        this.maxLife = defaultValue(this.maxLife, source.maxLife);
+        this.minimumWidth = defaultValue(this.minimumWidth, source.minimumWidth);
+        this.maximumWidth = defaultValue(this.maximumWidth, source.maximumWidth);
+        this.minimumHeight = defaultValue(this.minimumHeight, source.minimumHeight);
+        this.maximumHeight = defaultValue(this.maximumHeight, source.maximumHeight);
+        this.minimumSpeed = defaultValue(this.minimumSpeed, source.minimumSpeed);
+        this.maximumSpeed = defaultValue(this.maximumSpeed, source.maximumSpeed);
+        this.minimumLife = defaultValue(this.minimumLife, source.minimumLife);
+        this.maximumLife = defaultValue(this.maximumLife, source.maximumLife);
         this.loop = defaultValue(this.loop, source.loop);
         this.lifeTime = defaultValue(this.lifeTime, source.lifeTime);
         this.emitterModelMatrix = defaultValue(this.emitterModelMatrix, source.emitterModelMatrix);

Source/DataSources/ParticleSystemVisualizer.js

@@ -32,18 +32,18 @@ define([
     var defaultStartColor = Color.WHITE;
     var defaultEndColor = Color.WHITE;
     var defaultRate = 5.0;
-    var defaultMinWidth = 16.0;
-    var defaultMinHeight = 16.0;
-    var defaultMaxWidth = 16.0;
-    var defaultMaxHeight = 16.0;
+    var defaultMinimumWidth = 16.0;
+    var defaultMinimumHeight = 16.0;
+    var defaultMaximumWidth = 16.0;
+    var defaultMaximumHeight = 16.0;
     var defaultLifeTime = Number.MAX_VALUE;
     var defaultLoop = true;
     var defaultEmitterModelMatrix = Matrix4.IDENTITY;
     var defaultEmitter = new CircleEmitter({radius: 0.5});
-    var defaultMinSpeed = 5.0;
-    var defaultMaxSpeed = 5.0;
-    var defaultMinLife = 5.0;
-    var defaultMaxLife = 5.0;
+    var defaultMinimumSpeed = 5.0;
+    var defaultMaximumSpeed = 5.0;
+    var defaultMinimumLife = 5.0;
+    var defaultMaximumLife = 5.0;
 
     var modelMatrixScratch = new Matrix4();
 
@@ -121,14 +121,14 @@ define([
             particleSystem.startColor = Property.getValueOrDefault(particleSystemGraphics._startColor, time, defaultStartColor);
             particleSystem.endColor = Property.getValueOrDefault(particleSystemGraphics._endColor, time, defaultEndColor);
             particleSystem.rate = Property.getValueOrDefault(particleSystemGraphics._rate, time, defaultRate);
-            particleSystem.minWidth = Property.getValueOrDefault(particleSystemGraphics._minWidth, time, defaultMinWidth);
-            particleSystem.maxWidth = Property.getValueOrDefault(particleSystemGraphics._maxWidth, time, defaultMaxWidth);
-            particleSystem.minHeight = Property.getValueOrDefault(particleSystemGraphics._minHeight, time, defaultMinHeight);
-            particleSystem.maxHeight = Property.getValueOrDefault(particleSystemGraphics._maxHeight, time, defaultMaxHeight);
-            particleSystem.minSpeed = Property.getValueOrDefault(particleSystemGraphics._minSpeed, time, defaultMinSpeed);
-            particleSystem.maxSpeed = Property.getValueOrDefault(particleSystemGraphics._maxSpeed, time, defaultMaxSpeed);
-            particleSystem.minLife = Property.getValueOrDefault(particleSystemGraphics._minLife, time, defaultMinLife);
-            particleSystem.maxLife = Property.getValueOrDefault(particleSystemGraphics._maxLife, time, defaultMaxLife);
+            particleSystem.minimumWidth = Property.getValueOrDefault(particleSystemGraphics._minimumWidth, time, defaultMinimumWidth);
+            particleSystem.maximumWidth = Property.getValueOrDefault(particleSystemGraphics._maximumWidth, time, defaultMaximumWidth);
+            particleSystem.minimumHeight = Property.getValueOrDefault(particleSystemGraphics._minimumHeight, time, defaultMinimumHeight);
+            particleSystem.maximumHeight = Property.getValueOrDefault(particleSystemGraphics._maximumHeight, time, defaultMaximumHeight);
+            particleSystem.minimumSpeed = Property.getValueOrDefault(particleSystemGraphics._minimumSpeed, time, defaultMinimumSpeed);
+            particleSystem.maximumSpeed = Property.getValueOrDefault(particleSystemGraphics._maximumSpeed, time, defaultMaximumSpeed);
+            particleSystem.minimumLife = Property.getValueOrDefault(particleSystemGraphics._minimumLife, time, defaultMinimumLife);
+            particleSystem.maximumLife = Property.getValueOrDefault(particleSystemGraphics._maximumLife, time, defaultMaximumLife);
             particleSystem.lifeTime = Property.getValueOrDefault(particleSystemGraphics._lifeTime, time, defaultLifeTime);
             particleSystem.loop = Property.getValueOrDefault(particleSystemGraphics._loop, time, defaultLoop);
             particleSystem.emitterModelMatrix = Property.getValueOrDefault(particleSystemGraphics._emitterModelMatrix, time, defaultEmitterModelMatrix);

Source/Scene/ParticleSystem.js

@@ -51,54 +51,54 @@ define([
 
         var speed = defaultValue(options.speed, undefined);
         if (speed) {
-            this.minSpeed = speed;
-            this.maxSpeed = speed;
+            this.minimumSpeed = speed;
+            this.maximumSpeed = speed;
         }
         else {
-            this.minSpeed = defaultValue(options.minSpeed, 1.0);
-            this.maxSpeed = defaultValue(options.maxSpeed, 1.0);
+            this.minimumSpeed = defaultValue(options.minimumSpeed, 1.0);
+            this.maximumSpeed = defaultValue(options.maximumSpeed, 1.0);
         }
 
         var life = defaultValue(options.life, undefined);
         if (life) {
-            this.minLife = life;
-            this.maxLife = life;
+            this.minimumLife = life;
+            this.maximumLife = life;
         }
         else {
-            this.minLife = defaultValue(options.minLife, 5.0);
-            this.maxLife = defaultValue(options.maxLife, 5.0);
+            this.minimumLife = defaultValue(options.minimumLife, 5.0);
+            this.maximumLife = defaultValue(options.maximumLife, 5.0);
         }
 
         var mass = defaultValue(options.mass, undefined);
         if (mass) {
-            this.minMass = mass;
-            this.maxMass = mass;
+            this.minimumMass = mass;
+            this.maximumMass = mass;
         }
         else {
-            this.minMass = defaultValue(options.minMass, 1.0);
-            this.maxMass = defaultValue(options.maxMass, 1.0);
+            this.minimumMass = defaultValue(options.minimumMass, 1.0);
+            this.maximumMass = defaultValue(options.maximumMass, 1.0);
         }
 
         this.image = defaultValue(options.image, null);
 
         var width = defaultValue(options.width, undefined);
         if (width) {
-            this.minWidth = width;
-            this.maxWidth = width;
+            this.minimumWidth = width;
+            this.maximumWidth = width;
         }
         else {
-            this.minWidth = defaultValue(options.minWidth, 1.0);
-            this.maxWidth = defaultValue(options.maxWidth, 1.0);
+            this.minimumWidth = defaultValue(options.minimumWidth, 1.0);
+            this.maximumWidth = defaultValue(options.maximumWidth, 1.0);
         }
 
         var height = defaultValue(options.height, undefined);
         if (height) {
-            this.minHeight = height;
-            this.maxHeight = height;
+            this.minimumHeight = height;
+            this.maximumHeight = height;
         }
         else {
-            this.minHeight = defaultValue(options.minHeight, 1.0);
-            this.maxHeight = defaultValue(options.maxHeight, 1.0);
+            this.minimumHeight = defaultValue(options.minimumHeight, 1.0);
+            this.maximumHeight = defaultValue(options.maximumHeight, 1.0);
         }
 
         this.lifeTime = defaultValue(options.lifeTime, Number.MAX_VALUE);
@@ -151,12 +151,12 @@ define([
         particle.startScale = this.startScale;
         particle.endScale = this.endScale;
         particle.image = this.image;
-        particle.life = random(this.minLife, this.maxLife);
-        particle.mass = random(this.minMass, this.maxMass);
+        particle.life = random(this.minimumLife, this.maximumLife);
+        particle.mass = random(this.minimumMass, this.maximumMass);
 
-        particle.size = new Cartesian2(random(this.minWidth, this.maxWidth), random(this.minHeight, this.maxHeight));
+        particle.size = new Cartesian2(random(this.minimumWidth, this.maximumWidth), random(this.minimumHeight, this.maximumHeight));
 
-        var speed = random(this.minSpeed, this.maxSpeed);
+        var speed = random(this.minimumSpeed, this.maximumSpeed);
         Cartesian3.multiplyByScalar(particle.velocity, speed, particle.velocity);
 
         this.particles.push(particle);
@@ -292,4 +292,4 @@ define([
     };
 
     return ParticleSystem;
-});
+});