Game Cache added and tests written and working.

Loader updated.
Cache now emits events on add and remove.

Author: photonstorm

v3/src/boot/Game.js

@@ -17,6 +17,7 @@ var CreateRenderer = require('./CreateRenderer');
 var StateManager = require('../state/StateManager');
 var TextureManager = require('../textures/TextureManager');
 var Data = require('../components/Data');
+var Cache = require('../cache/Cache');
 
 var Game = function (config)
 {
@@ -43,7 +44,7 @@ var Game = function (config)
     /**
     * @property {Phaser.Cache} cache - Reference to the assets cache.
     */
-    // this.cache = new Cache();
+    this.cache = new Cache();
 
     /**
     * @property {Phaser.Data} registry - Game wide data store.

v3/src/cache/BaseCache.js

@@ -1,8 +1,12 @@
 var CacheEntry = require('./CacheEntry');
+var Events = require('./events');
+var EventDispatcher = require('../events/EventDispatcher');
 
 var BaseCache = function ()
 {
     this.entries = new Map();
+
+    this.events = new EventDispatcher();
 };
 
 BaseCache.prototype.constructor = BaseCache;
@@ -12,6 +16,8 @@ BaseCache.prototype = {
     add: function (key, data)
     {
         this.entries.set(key, data);
+
+        this.events.dispatch(new Events.CACHE_ADD_EVENT(this, key, data));
     },
 
     has: function (key)
@@ -26,7 +32,14 @@ BaseCache.prototype = {
 
     remove: function (key)
     {
-        this.entries.delete(key);
+        var entry = this.get(key);
+
+        if (entry)
+        {
+            this.entries.delete(key);
+
+            this.events.dispatch(new Events.CACHE_REMOVE_EVENT(this, key, entry.data));
+        }
     },
 
     destroy: function ()

v3/src/cache/Cache.js

@@ -0,0 +1,36 @@
+var BaseCache = require('./BaseCache');
+
+var Cache = function ()
+{
+    this.sound = new BaseCache();
+    this.video = new BaseCache();
+    this.text = new BaseCache();
+    this.json = new BaseCache();
+    this.xml = new BaseCache();
+    this.physics = new BaseCache();
+    this.tilemap = new BaseCache();
+    this.binary = new BaseCache();
+    this.bitmapFont = new BaseCache();
+    this.shader = new BaseCache();
+
+    this.custom = {};
+};
+
+Cache.prototype.constructor = Cache;
+
+Cache.prototype = {
+
+    //  Add your own custom Cache entry, available under Cache.custom.key
+    addCustom: function (key)
+    {
+        if (!this.custom.hasOwnProperty(key))
+        {
+            this.custom[key] = new BaseCache();
+
+            return this.custom[key];
+        }
+    }
+
+};
+
+module.exports = Cache;

v3/src/cache/events/CacheAddEvent.js

@@ -0,0 +1,15 @@
+var Event = require('../../events/Event');
+
+var CacheAddEvent = function (cache, key, data)
+{
+    Event.call(this, 'CACHE_ADD_EVENT');
+
+    this.cache = cache;
+    this.key = key;
+    this.data = data;
+};
+
+CacheAddEvent.prototype = Object.create(Event.prototype);
+CacheAddEvent.prototype.constructor = CacheAddEvent;
+
+module.exports = CacheAddEvent;

v3/src/cache/events/CacheRemoveEvent.js

@@ -0,0 +1,15 @@
+var Event = require('../../events/Event');
+
+var CacheRemoveEvent = function (cache, key, data)
+{
+    Event.call(this, 'CACHE_ADD_EVENT');
+
+    this.cache = cache;
+    this.key = key;
+    this.data = data;
+};
+
+CacheRemoveEvent.prototype = Object.create(Event.prototype);
+CacheRemoveEvent.prototype.constructor = CacheRemoveEvent;
+
+module.exports = CacheRemoveEvent;

v3/src/cache/events/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+
+    CACHE_ADD_EVENT: require('./CacheAddEvent'),
+    CACHE_REMOVE_EVENT: require('./CacheRemoveEvent')
+
+};

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'ebcb3f40-e3cf-11e6-b634-8762f6b557d0'
+build: '4ae31710-e708-11e6-93bd-59b161302f59'
 };
 module.exports = CHECKSUM;

v3/src/state/Systems.js

@@ -26,6 +26,7 @@ var Systems = function (state, config)
 
     //  CORE SYSTEMS / PROPERTIES
 
+    this.cache;
     this.textures;
 
     //  Reference to State specific managers (Factory, Tweens, Loader, Physics, etc)
@@ -58,6 +59,7 @@ Systems.prototype = {
 
         this.settings = Settings(this.config, this.game.config);
 
+        this.cache = this.game.cache;
         this.textures = this.game.textures;
 
         //  State specific managers (Factory, Tweens, Loader, Physics, etc)
@@ -96,6 +98,7 @@ Systems.prototype = {
         // this.state.transform = this.camera.transform;
 
         this.state.state = this.game.state;
+        this.state.cache = this.game.cache;
         this.state.textures = this.game.textures;
     },
 

v3/src/state/systems/Loader.js

@@ -139,6 +139,7 @@ Loader.prototype.processCallback = function ()
     }
 
     //  The global Texture Manager
+    var cache = this.state.sys.cache;
     var textures = this.state.sys.textures;
 
     //  Process multiatlas groups first
@@ -189,30 +190,57 @@ Loader.prototype.processCallback = function ()
 
     this.storage.each(function (file)
     {
-        if (file.type === 'image')
+        switch (file.type)
         {
-            textures.addImage(file.key, file.data);
-        }
-        else if (file.type === 'atlasjson')
-        {
-            var fileA = file.fileA;
-            var fileB = file.fileB;
+            case 'image':
+                textures.addImage(file.key, file.data);
+                break;
 
-            if (fileA.type === 'image')
-            {
-                textures.addAtlas(fileA.key, fileA.data, fileB.data);
-            }
-            else
-            {
-                textures.addAtlas(fileB.key, fileB.data, fileA.data);
-            }
-        }
-        else if (file.type === 'json')
-        {
-            // console.dir(file.data);
+            case 'atlasjson':
+                var fileA = file.fileA;
+                var fileB = file.fileB;
+
+                if (fileA.type === 'image')
+                {
+                    textures.addAtlas(fileA.key, fileA.data, fileB.data);
+                }
+                else
+                {
+                    textures.addAtlas(fileB.key, fileB.data, fileA.data);
+                }
+                break;
+
+            case 'json':
+                cache.json.add(file.key, file.data);
+                break;
+
+            case 'xml':
+                cache.xml.add(file.key, file.data);
+                break;
+
+            case 'text':
+                cache.text.add(file.key, file.data);
+                break;
+
+            case 'binary':
+                cache.binary.add(file.key, file.data);
+                break;
+
+            case 'sound':
+                cache.sound.add(file.key, file.data);
+                break;
+
+            case 'glsl':
+                cache.shader.add(file.key, file.data);
+                break;
         }
     });
 
+    // this.video = new BaseCache();
+    // this.physics = new BaseCache();
+    // this.tilemap = new BaseCache();
+    // this.bitmapFont = new BaseCache();
+
     this.storage.clear();
 };