Working through updating the emitter and particle classes to use the new MinMax format

Author: photonstorm

v3/src/gameobjects/particles/Particle.js

@@ -1,4 +1,5 @@
 var Class = require('../../utils/Class');
+var DegToRad = require('../../math/DegToRad');
 
 var Particle = new Class({
 
@@ -14,6 +15,8 @@ var Particle = new Class({
         this.x = x;
         this.y = y;
 
+        //  Add Acceleration (and Bounce?)
+
         this.velocityX = 0;
         this.velocityY = 0;
 
@@ -35,14 +38,14 @@ var Particle = new Class({
         this.start = {
             tint: 0xFFFFFF,
             alpha: 1,
-            scale: 1,
+            scale: { x: 1, y: 1 },
             angle: 0
         };
 
         this.end = {
             tint: 0xFFFFFF,
             alpha: 1,
-            scale: 1,
+            scale: { x: 1, y: 1 },
             angle: 0
         };
     },
@@ -74,14 +77,16 @@ var Particle = new Class({
 
         start.tint = 0xFFFFFF;
         start.alpha = 1;
-        start.scale = 1;
+        start.scale.x = 1;
+        start.scale.y = 1;
         start.angle = 0;
 
         var end = this.end;
 
         end.tint = 0xFFFFFF;
         end.alpha = 1;
-        end.scale = 1;
+        end.scale.x = 1;
+        end.scale.y = 1;
         end.angle = 0;
 
         return this;
@@ -92,19 +97,82 @@ var Particle = new Class({
         return (this.lifeStep > 0);
     },
 
-    /*
-    setPosition: function (x, y)
+    // var rad = DegToRad(Between(this.minEmitAngle, this.maxEmitAngle));
+    // var speed = Between(this.minSpeed, this.maxSpeed);
+    // var vx = Math.cos(rad) * speed;
+    // var vy = Math.sin(rad) * speed;
+
+    // particle.velocityX = vx;
+    // particle.velocityY = vy;
+    // particle.life = Math.max(this.life, Number.MIN_VALUE);
+    // particle.lifeStep = particle.life;
+    // particle.start.scale = this.startScale;
+    // particle.end.scale = this.endScale;
+    // particle.scaleX = this.startScale;
+    // particle.scaleY = this.startScale;
+    // particle.start.alpha = this.startAlpha;
+    // particle.end.alpha = this.endAlpha;
+    // particle.start.rotation = DegToRad(this.startAngle);
+    // particle.end.rotation = DegToRad(this.endAngle);
+    // particle.color = (particle.color & 0x00FFFFFF) | (((this.startAlpha * 0xFF)|0) << 24);
+    // particle.index = this.alive.length;
+
+    emit: function (emitter)
     {
-        this.x = x;
-        this.y = y;
+        var rad = DegToRad(emitter.angle.getRandom());
+
+        this.velocityX = Math.cos(rad) * emitter.velocity.getRandomX();
+        this.velocityY = Math.sin(rad) * emitter.velocity.getRandomY();
+
+        this.life = Math.max(this.life, Number.MIN_VALUE);
+        this.lifeStep = this.life;
+
+        emitter.scale.copyX(this.start.scale);
+        emitter.scale.copyY(this.end.scale);
+
+        this.start.alpha = emitter.alpha.min;
+        this.end.alpha = emitter.alpha.max;
+
+        this.start.rotation = emitter.particleAngle.min;
+        this.end.rotation = emitter.particleAngle.max;
+
+        this.color = (this.color & 0x00ffffff) | (((this.start.alpha * 0xff) | 0) << 24);
+
+        this.index = emitter.alive.length;
     },
 
-    setScale: function (x, y)
+    // particle.velocityX += gravityX;
+    // particle.velocityY += gravityY;
+    // particle.x += particle.velocityX * emitterStep;
+    // particle.y += particle.velocityY * emitterStep;
+    // particle.normLifeStep = particle.lifeStep / particle.life;
+
+    // var norm = 1 - particle.normLifeStep;
+    // var alphaEase = this.easingFunctionAlpha(norm);
+    // var scaleEase = this.easingFunctionScale(norm);
+    // var rotationEase = this.easingFunctionRotation(norm);
+    // var alphaf = (particle.end.alpha - particle.start.alpha) * alphaEase + particle.start.alpha;
+    // var scale = (particle.end.scale - particle.start.scale) * scaleEase + particle.start.scale;
+    // var rotation = (particle.end.rotation - particle.start.rotation) * rotationEase + particle.start.rotation;
+
+    // particle.scaleX = particle.scaleY = scale;
+    // particle.color = (particle.color & 0x00FFFFFF) | (((alphaf * 0xFF)|0) << 24);
+    // particle.rotation = rotation;
+
+    update: function (emitter, step)
     {
-        this.scaleX = x;
-        this.scaleY = y;
+        this.normLifeStep = 1 - this.lifeStep / this.life;
+
+        this.velocityX += (emitter.gravity.x * step);
+        this.velocityY += (emitter.gravity.y * step);
+
+        this.x += this.velocityX * step;
+        this.y += this.velocityY * step;
+
+        this.lifeStep -= step;
+
+        return (this.lifeStep <= 0);
     }
-    */
 
 });