Fixed data passing.

Author: photonstorm

v3/src/boot/Game.js

@@ -9,7 +9,6 @@ var DebugHeader = require('./DebugHeader');
 var Device = require('../device');
 
 var AddToDOM = require('../dom/AddToDOM');
-// var RequestAnimationFrame = require('../dom/RequestAnimationFrame');
 var DOMContentLoaded = require('../dom/DOMContentLoaded');
 
 var MainLoop = require('./MainLoop');
@@ -30,12 +29,6 @@ var Game = function (config)
     this.isBooted = false;
     this.isRunning = false;
 
-    /**
-    * @property {Phaser.RequestAnimationFrame} raf - Automatically handles the core game loop via requestAnimationFrame or setTimeout
-    * @protected
-    */
-    // this.raf = new RequestAnimationFrame();
-
     /**
     * @property {Phaser.TextureManager} textures - Reference to the Phaser Texture Manager.
     */
@@ -102,18 +95,8 @@ Game.prototype = {
         this.config.postBoot();
 
         this.mainloop.start();
-
-        // this.raf.start(this.step.bind(this), this.config.forceSetTimeOut);
     }
 
-    /*
-    step: function (timestamp)
-    {
-        //  Pass in via game to 'start' instead of every update?
-        this.mainloop.step(timestamp, this.state.active, this.renderer);
-    }
-    */
-
 };
 
 module.exports = Game;

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'f6d064e0-f4b1-11e6-981a-5d27875bf1f1'
+build: '80ede0f0-f4b5-11e6-bebe-efbf3f13a534'
 };
 module.exports = CHECKSUM;

v3/src/state/GlobalStateManager.js

@@ -359,6 +359,7 @@ GlobalStateManager.prototype = {
         if (data === undefined) { data = {}; }
 
         // console.log('start:', key);
+        // console.dir(data);
 
         //  if not booted, then put state into a holding pattern
         if (!this.game.isBooted)
@@ -391,6 +392,8 @@ GlobalStateManager.prototype = {
 
             state.settings.active = true;
 
+            state.settings.data = data;
+
             var loader = state.sys.load;
 
             //  Files payload?
@@ -400,39 +403,38 @@ GlobalStateManager.prototype = {
 
                 if (loader.loadArray(state.sys.settings.files))
                 {
-                    loader.events.once('LOADER_COMPLETE_EVENT', this.payloadComplete.bind(this, data));
+                    loader.events.once('LOADER_COMPLETE_EVENT', this.payloadComplete.bind(this));
 
                     loader.start();
                 }
                 else
                 {
-                    this.bootState(state, data);
+                    this.bootState(state);
                 }
             }
             else
             {
-                this.bootState(state, data);
+                this.bootState(state);
             }
         }
     },
 
-    payloadComplete: function (event, data)
+    payloadComplete: function (event)
     {
         var state = event.loader.state;
 
         // console.log('payloadComplete', state.sys.settings.key);
 
-        this.bootState(state, data);
+        this.bootState(state);
     },
 
-    bootState: function (state, data)
+    bootState: function (state)
     {
-        console.log('bootState', state.sys.settings.key);
-        console.dir(data);
+        // console.log('bootState', state.sys.settings.key);
 
         if (state.init)
         {
-            state.init.call(state, data);
+            state.init.call(state, state.sys.settings.data);
         }
 
         var loader = state.sys.load;
@@ -446,36 +448,36 @@ GlobalStateManager.prototype = {
             //  Is the loader empty?
             if (loader.list.size === 0)
             {
-                this.create(state, data);
+                this.create(state);
             }
             else
             {
                 //  Start the loader going as we have something in the queue
 
-                loader.events.once('LOADER_COMPLETE_EVENT', this.loadComplete.bind(this, {}, data));
+                loader.events.once('LOADER_COMPLETE_EVENT', this.loadComplete.bind(this));
 
                 loader.start();
             }
         }
         else
         {
             //  No preload? Then there was nothing to load either
-            this.create(state, data);
+            this.create(state);
         }
     },
 
-    loadComplete: function (event, data)
+    loadComplete: function (event)
     {
         var state = event.loader.state;
 
         // console.log('loadComplete', state.sys.settings.key);
 
-        this.create(state, data);
+        this.create(state);
     },
 
-    create: function (state, data)
+    create: function (state)
     {
-        console.log('create', state.sys.settings.key);
+        // console.log('create', state.sys.settings.key);
 
         //  Insert at the correct index, or it just all goes wrong :)
 
@@ -492,7 +494,7 @@ GlobalStateManager.prototype = {
 
         if (state.create)
         {
-            state.create(data);
+            state.create(state.sys.settings.data);
         }
     },
 

v3/src/state/Settings.js

@@ -28,6 +28,8 @@ var Settings = {
 
             //  Loader payload array
 
+            data: {},
+
             files: GetObjectValue(config, 'files', false),
 
             //  -1 means the State Manager will set it to be the Game dimensions

v3/src/state/systems/StateManager.js

@@ -16,11 +16,11 @@ StateManager.prototype.constructor = StateManager;
 StateManager.prototype = {
 
     //  Start this State (or the one given via key)
-    start: function (key)
+    start: function (key, data)
     {
         if (key === undefined) { key = this.key; }
 
-        this.manager.start(key);
+        this.manager.start(key, data);
     },
 
     //  Pause this State (or the one given via key)