Merge branch 'master' into rendering-cleanup

Author: bitnenfer

package.json

@@ -42,5 +42,8 @@
     "uuid": "^3.1.0",
     "webpack": "^3.10.0",
     "webpack-shell-plugin": "^0.5.0"
+  },
+  "dependencies": {
+    "eventemitter3": "^3.0.0"
   }
 }

src/animations/frame/Animation.js

@@ -25,7 +25,7 @@ var Animation = new Class({
         this.type = 'frame';
 
         //  Extract all the frame data into the frames array
-        this.frames = GetFrames(manager.textureManager, GetValue(config, 'frames', []));
+        this.frames = GetFrames(manager.textureManager, GetValue(config, 'frames', []), GetValue(config, 'defaultTextureKey', null));
 
         //  The frame rate of playback in frames per second (default 24 if duration is null)
         this.frameRate = GetValue(config, 'frameRate', null);
@@ -99,8 +99,8 @@ var Animation = new Class({
         //  Global pause, effects all Game Objects using this Animation instance
         this.paused = false;
 
-        this.manager.events.on('PAUSE_ALL_ANIMATION_EVENT', this.pause.bind(this));
-        this.manager.events.on('RESUME_ALL_ANIMATION_EVENT', this.resume.bind(this));
+        this.manager.on('pauseall', this.pause.bind(this));
+        this.manager.on('resumeall', this.resume.bind(this));
     },
 
     addFrame: require('./inc/AddFrame'),

src/animations/frame/inc/GetFrames.js

@@ -12,7 +12,7 @@ var GetValue = require('../../../utils/object/GetValue');
  *
  * @return {Phaser.Animations.AnimationFrame[]} [description]
  */
-var GetFrames = function (textureManager, frames)
+var GetFrames = function (textureManager, frames, defaultTextureKey)
 {
     //      frames: [
     //          { key: textureKey, frame: textureFrame },
@@ -38,7 +38,8 @@ var GetFrames = function (textureManager, frames)
 
         frames = [];
 
-        frameKeys.forEach(function (idx, value) {
+        frameKeys.forEach(function (idx, value)
+        {
             frames.push({ key: textureKey, frame: value });
         });
     }
@@ -54,7 +55,7 @@ var GetFrames = function (textureManager, frames)
     {
         var item = frames[i];
 
-        var key = GetValue(item, 'key', null);
+        var key = GetValue(item, 'key', defaultTextureKey);
 
         if (!key)
         {

src/animations/manager/AnimationManager.js

@@ -1,5 +1,5 @@
 var Class = require('../../utils/Class');
-var EventDispatcher = require('../../events/EventDispatcher');
+var EventEmitter = require('eventemitter3');
 var CustomMap = require('../../structs/Map');
 
 // Animations are managed by the global AnimationManager. This is a singleton class that is
@@ -9,6 +9,8 @@ var CustomMap = require('../../structs/Map');
 
 var AnimationManager = new Class({
 
+    Extends: EventEmitter,
+
     initialize:
 
     /**
@@ -23,6 +25,8 @@ var AnimationManager = new Class({
      */
     function AnimationManager (game)
     {
+        EventEmitter.call(this);
+
         /**
          * [description]
          *
@@ -39,14 +43,6 @@ var AnimationManager = new Class({
          */
         this.textureManager = null;
 
-        /**
-         * [description]
-         *
-         * @property {Phaser.Events.EventDispatcher} events
-         * @protected
-         */
-        this.events = new EventDispatcher();
-
         /**
          * [description]
          *

src/animations/manager/inc/AddAnimation.js

@@ -1,5 +1,3 @@
-var Event = require('../events/');
-
 /**
  * [description]
  *
@@ -16,15 +14,15 @@ var AddAnimation = function (key, animation)
 {
     if (this.anims.has(key))
     {
-        console.error('Animation with key', key, 'already exists');
+        console.warn('Animation with key', key, 'already exists');
         return;
     }
 
     animation.key = key;
 
     this.anims.set(key, animation);
 
-    this.events.dispatch(new Event.ADD_ANIMATION_EVENT(key, animation));
+    this.emit('add', key, animation);
 
     return this;
 };

src/animations/manager/inc/CreateFrameAnimation.js

@@ -1,4 +1,3 @@
-var Event = require('../events/');
 var Animation = require('../../frame/Animation');
 
 /**
@@ -26,7 +25,7 @@ var CreateFrameAnimation = function (config)
 
     this.anims.set(key, anim);
 
-    this.events.dispatch(new Event.ADD_ANIMATION_EVENT(key, anim));
+    this.emit('add', key, anim);
 
     return anim;
 };

src/animations/manager/inc/PauseAll.js

@@ -1,5 +1,3 @@
-var Event = require('../events/');
-
 /**
  * [description]
  *
@@ -15,7 +13,7 @@ var PauseAll = function ()
     {
         this.paused = true;
 
-        this.events.dispatch(new Event.PAUSE_ALL_ANIMATION_EVENT());
+        this.emit('pauseall');
     }
 
     return this;

src/animations/manager/inc/RemoveAnimation.js

@@ -1,5 +1,3 @@
-var Event = require('../events/');
-
 /**
  * [description]
  *
@@ -17,7 +15,7 @@ var RemoveAnimation = function (key)
 
     if (anim)
     {
-        this.events.dispatch(new Event.REMOVE_ANIMATION_EVENT(key, anim));
+        this.emit('remove', key, anim);
 
         this.anims.delete(key);
     }

src/animations/manager/inc/ResumeAll.js

@@ -1,5 +1,3 @@
-var Event = require('../events/');
-
 /**
  * [description]
  *
@@ -15,7 +13,7 @@ var ResumeAll = function ()
     {
         this.paused = false;
 
-        this.events.dispatch(new Event.RESUME_ALL_ANIMATION_EVENT());
+        this.emit('resumeall');
     }
 
     return this;

src/boot/Game.js

@@ -6,7 +6,7 @@ var NOOP = require('../utils/NOOP');
 
 var AddToDOM = require('../dom/AddToDOM');
 var DOMContentLoaded = require('../dom/DOMContentLoaded');
-var EventDispatcher = require('../events/EventDispatcher');
+var EventEmitter = require('eventemitter3');
 var VisibilityHandler = require('./VisibilityHandler');
 
 var AnimationManager = require('../animations/manager/AnimationManager');
@@ -82,7 +82,7 @@ var Game = new Class({
          *
          * @property {Phaser.Events.EventDispatcher} events
          */
-        this.events = new EventDispatcher();
+        this.events = new EventEmitter();
 
         /**
          * [description]
@@ -195,10 +195,10 @@ var Game = new Class({
 
         VisibilityHandler(this.events);
 
-        this.events.on('HIDDEN', this.onHidden.bind(this));
-        this.events.on('VISIBLE', this.onVisible.bind(this));
-        this.events.on('ON_BLUR', this.onBlur.bind(this));
-        this.events.on('ON_FOCUS', this.onFocus.bind(this));
+        this.events.on('hidden', this.onHidden.bind(this));
+        this.events.on('visible', this.onVisible.bind(this));
+        this.events.on('blur', this.onBlur.bind(this));
+        this.events.on('focus', this.onFocus.bind(this));
     },
 
     /**