Added bounds and bounce support and fixed velocity math

Author: photonstorm

v3/src/gameobjects/particles/Particle.js

@@ -137,6 +137,8 @@ var Particle = new Class({
         this.angle = emitter.rotate.onEmit(this, 'rotate');
         this.rotation = DegToRad(this.angle);
 
+        this.bounce = emitter.bounce.onEmit(this, 'bounce');
+
         this.alpha = emitter.alpha.onEmit(this, 'alpha');
 
         this.color = (this.color & 0x00FFFFFF) | (((this.alpha * 0xFF) | 0) << 24);
@@ -186,8 +188,36 @@ var Particle = new Class({
             vy = -my;
         }
 
-        this.velocityX = vx * step;
-        this.velocityY = vy * step;
+        this.velocityX = vx;
+        this.velocityY = vy;
+    },
+
+    checkBounds: function (emitter)
+    {
+        var bounds = emitter.bounds;
+        var bounce = -this.bounce;
+
+        if (this.x < bounds.x && emitter.collideLeft)
+        {
+            this.x = bounds.x;
+            this.velocityX *= bounce;
+        }
+        else if (this.x > bounds.right && emitter.collideRight)
+        {
+            this.x = bounds.right;
+            this.velocityX *= bounce;
+        }
+
+        if (this.y < bounds.y && emitter.collideTop)
+        {
+            this.y = bounds.y;
+            this.velocityY *= bounce;
+        }
+        else if (this.y > bounds.bottom && emitter.collideBottom)
+        {
+            this.y = bounds.bottom;
+            this.velocityY *= bounce;
+        }
     },
 
     //  delta = ms, step = delta / 1000
@@ -200,14 +230,13 @@ var Particle = new Class({
 
         this.computeVelocity(emitter, step);
 
-        // this.velocityX += (emitter.gravityX * step);
-        // this.velocityY += (emitter.gravityY * step);
-
-        // this.x += this.velocityX * step;
-        // this.y += this.velocityY * step;
+        this.x += this.velocityX * step;
+        this.y += this.velocityY * step;
 
-        this.x += this.velocityX;
-        this.y += this.velocityY;
+        if (emitter.bounds)
+        {
+            this.checkBounds(emitter);
+        }
 
         this.scaleX = emitter.scaleX.onUpdate(this, 'scaleX', t, this.scaleX);
 

v3/src/gameobjects/particles/ParticleEmitter.js

@@ -1,13 +1,14 @@
 var BlendModes = require('../../renderer/BlendModes');
 var Class = require('../../utils/Class');
 var Components = require('../components');
+var EmitterOp = require('./EmitterOp');
+var GetFastValue = require('../../utils/object/GetFastValue');
 var GetRandomElement = require('../../utils/array/GetRandomElement');
 var GetValue = require('../../utils/object/GetValue');
-var GetFastValue = require('../../utils/object/GetFastValue');
 var Particle = require('./Particle');
+var Rectangle = require('../../geom/rectangle/Rectangle');
 var StableSort = require('../../utils/array/StableSort');
 var Vector2 = require('../../math/Vector2');
-var EmitterOp = require('./EmitterOp');
 
 var ParticleEmitter = new Class({
 
@@ -136,7 +137,18 @@ var ParticleEmitter = new Class({
 
         this.zone = GetFastValue(config, 'zone', null);
 
-        //  bounds
+        //  bounds rectangle
+        this.bounds = null;
+
+        if (config.hasOwnProperty('bounds'))
+        {
+            this.setBounds(config.bounds);
+        }
+
+        this.collideLeft = GetFastValue(config, 'collideLeft', true);
+        this.collideRight = GetFastValue(config, 'collideRight', true);
+        this.collideTop = GetFastValue(config, 'collideTop', true);
+        this.collideBottom = GetFastValue(config, 'collideBottom', true);
 
         //  Optional Particle emission zone - must be an object that supports a `getRandomPoint` function, such as a Rectangle, Circle, Path, etc.
         this.zone = GetFastValue(config, 'zone', null);
@@ -227,6 +239,30 @@ var ParticleEmitter = new Class({
         return this;
     },
 
+    setBounds: function (x, y, width, height)
+    {
+        if (typeof x === 'object')
+        {
+            var obj = x;
+
+            var x = obj.x;
+            var y = obj.y;
+            var width = (obj.hasOwnProperty('w')) ? obj.w : obj.width;
+            var height = (obj.hasOwnProperty('h')) ? obj.h : obj.height;
+        }
+
+        if (this.bounds)
+        {
+            this.bounds.setTo(x, y, width, height);
+        }
+        else
+        {
+            this.bounds = new Rectangle(x, y, width, height);
+        }
+
+        return this;
+    },
+
     //  Particle Emission
 
     setSpeedX: function (value)