Safety nets on property accessors.

Author: photonstorm

v3/src/gameobjects/particles/EmitterOp.js

@@ -207,11 +207,9 @@ var EmitterOp = new Class({
     {
         var value = FloatBetween(this.start, this.end);
 
-        var data = particle.data[key];
-
-        if (data)
+        if (particle && particle.data[key])
         {
-            data.min = value;
+            particle.data[key].min = value;
         }
 
         return value;
@@ -228,10 +226,13 @@ var EmitterOp = new Class({
 
     easedValueEmit: function (particle, key)
     {
-        var data = particle.data[key];
+        if (particle)
+        {
+            var data = particle.data[key];
 
-        data.min = this.start;
-        data.max = this.end;
+            data.min = this.start;
+            data.max = this.end;
+        }
 
         return this.start;
     },

v3/src/gameobjects/particles/Particle.js

@@ -44,7 +44,7 @@ var Particle = new Class({
         this.data = {
             tint: { min: 0xffffff, max: 0xffffff, current: 0xffffff },
             alpha: { min: 1, max: 1 },
-            angle: { min: 0, max: 0 },
+            rotate: { min: 0, max: 0 },
             scaleX: { min: 1, max: 1 },
             scaleY: { min: 1, max: 1 }
         };
@@ -100,7 +100,7 @@ var Particle = new Class({
 
         if (emitter.radial)
         {
-            var rad = DegToRad(emitter.emitterAngle.onEmit(this, 'angle'));
+            var rad = DegToRad(emitter.angle.onEmit(this, 'angle'));
 
             this.velocityX = Math.cos(rad) * Math.abs(sx);
             this.velocityY = Math.sin(rad) * Math.abs(sy);
@@ -117,7 +117,7 @@ var Particle = new Class({
         this.scaleX = emitter.scaleX.onEmit(this, 'scaleX');
         this.scaleY = (emitter.scaleY) ? emitter.scaleY.onEmit(this, 'scaleY') : this.scaleX;
 
-        this.angle = emitter.particleAngle.onEmit(this, 'angle');
+        this.angle = emitter.rotate.onEmit(this, 'rotate');
         this.rotation = DegToRad(this.angle);
 
         this.alpha = emitter.alpha.onEmit(this, 'alpha');
@@ -152,7 +152,7 @@ var Particle = new Class({
             this.scaleY = this.scaleX;
         }
 
-        this.angle = emitter.particleAngle.onUpdate(this, 'angle', t, this.angle);
+        this.angle = emitter.rotate.onUpdate(this, 'rotate', t, this.angle);
         this.rotation = DegToRad(this.angle);
 
         this.alpha = emitter.alpha.onUpdate(this, 'alpha', t, this.alpha);

v3/src/gameobjects/particles/ParticleEmitter.js

@@ -38,7 +38,7 @@ var ParticleEmitter = new Class({
         this.x = new EmitterOp(config, 'x', 0);
         this.y = new EmitterOp(config, 'y', 0);
 
-        //  A radial emitter will emit particles in all directions between emitterAngle min and max, using speed as the value
+        //  A radial emitter will emit particles in all directions between angle min and max, using speed as the value
         //  A point emitter will emit particles only in the direction derived from the speedX and speedY values
         this.radial = GetFastValue(config, 'radial', true);
 
@@ -77,9 +77,9 @@ var ParticleEmitter = new Class({
 
         this.lifespan = new EmitterOp(config, 'lifespan', 1000);
 
-        this.emitterAngle = new EmitterOp(config, 'angle', { min: 0, max: 360 });
+        this.angle = new EmitterOp(config, 'angle', { min: 0, max: 360 });
 
-        this.particleAngle = new EmitterOp(config, 'particleAngle', 0);
+        this.rotate = new EmitterOp(config, 'rotate', 0);
 
         //  Callbacks
 
@@ -97,11 +97,11 @@ var ParticleEmitter = new Class({
             this.deathCallbackScope = callbackScope;
         }
 
-        //  Set to hard limit the amount of particle objects this emitter is allowed to create
+        //  Set to hard limit the amount of particle objects this emitter is allowed to create. 0 means unlimited.
         this.maxParticles = GetFastValue(config, 'maxParticles', 0);
 
         //  How many particles are emitted each time the emitter updates
-        this.quantity = GetFastValue(config, 'quantity', 1);
+        this.quantity = new EmitterOp(config, 'quantity', 1);
 
         //  How often a particle is emitted in ms (if emitter is a constant / flow emitter)
         //  If emitter is an explosion emitter this value will be -1.
@@ -297,7 +297,7 @@ var ParticleEmitter = new Class({
 
     setEmitterAngle: function (value)
     {
-        this.emitterAngle.onChange(value);
+        this.angle.onChange(value);
 
         return this;
     },
@@ -318,7 +318,7 @@ var ParticleEmitter = new Class({
 
     setQuantity: function (quantity)
     {
-        this.quantity = quantity;
+        this.quantity.onChange(quantity);
 
         return this;
     },
@@ -331,7 +331,7 @@ var ParticleEmitter = new Class({
 
         if (quantity)
         {
-            this.quantity = quantity;
+            this.quantity.onChange(quantity);
         }
 
         return this;
@@ -506,7 +506,7 @@ var ParticleEmitter = new Class({
 
         this.frequency = frequency;
 
-        this.quantity = count;
+        this.quantity.onChange(count);
 
         return this.start();
     },
@@ -525,13 +525,16 @@ var ParticleEmitter = new Class({
 
     emit: function (count, x, y)
     {
-        if (count === undefined) { count = this.quantity; }
-
         if (this.atLimit())
         {
             return;
         }
 
+        if (count === undefined)
+        {
+            count = this.quantity.onEmit();
+        }
+
         var dead = this.dead;
 
         for (var i = 0; i < count; i++)