Calls to the Scene Manager that happen before the Scene is running ar…

…e now queued Thanks to gdomaradzki for bringing this one to my attention!
phaserjs · Jan 23, 2018 · 123c8f8 · 123c8f8
1 parent dfe2599
commit 123c8f8
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 26 deletions.
diff --git a/src/scene/SceneManager.js b/src/scene/SceneManager.js
@@ -90,25 +90,21 @@ var SceneManager = new Class({
 
                 this.start(entry);
             }
+
+            //  Clear the pending lists
+            this._start.length = 0;
+            this._pending.length = 0;
+
+            return;
         }
 
         for (i = 0; i < queueLength; i++)
         {
             entry = this._queue[i];
 
-            if (entry.op === 'swapPosition')
-            {
-                this.swapPosition(entry.keyA, entry.keyB);
-            }
-            else
-            {
-                this[entry.op](entry.key);
-            }
+            this[entry.op](entry.keyA, entry.keyB);
         }
-
-        //  Clear the pending lists
-        this._start.length = 0;
-        this._pending.length = 0;
+
         this._queue.length = 0;
     },
 
@@ -342,9 +338,11 @@ var SceneManager = new Class({
     {
         if (scene.create)
         {
+            scene.sys.settings.status = CONST.CREATING;
+
             scene.create.call(scene, scene.sys.settings.data);
         }
-        
+
         scene.sys.settings.status = CONST.RUNNING;
     },
 
@@ -902,7 +900,7 @@ var SceneManager = new Class({
     {
         if (this._processing)
         {
-            this._queue.push( { op: 'bringToTop', key: key });
+            this._queue.push( { op: 'bringToTop', keyA: key, keyB: null });
         }
         else
         {
@@ -934,7 +932,7 @@ var SceneManager = new Class({
     {
         if (this._processing)
         {
-            this._queue.push( { op: 'sendToBack', key: key });
+            this._queue.push( { op: 'sendToBack', keyA: key, keyB: null });
         }
         else
         {
@@ -966,7 +964,7 @@ var SceneManager = new Class({
     {
         if (this._processing)
         {
-            this._queue.push( { op: 'moveDown', key: key });
+            this._queue.push( { op: 'moveDown', keyA: key, keyB: null });
         }
         else
         {
@@ -1000,7 +998,7 @@ var SceneManager = new Class({
     {
         if (this._processing)
         {
-            this._queue.push( { op: 'moveUp', key: key });
+            this._queue.push( { op: 'moveUp', keyA: key, keyB: null });
         }
         else
         {
@@ -1020,6 +1018,13 @@ var SceneManager = new Class({
         return this;
     },
 
+    queueOp: function (op, keyA, keyB)
+    {
+        this._queue.push( { op: op, keyA: keyA, keyB: keyB });
+
+        return this;
+    },
+
     /**
      * [description]
      *

diff --git a/src/scene/ScenePlugin.js b/src/scene/ScenePlugin.js
@@ -1,4 +1,5 @@
 var Class = require('../utils/Class');
+var CONST = require('./const');
 var PluginManager = require('../plugins/PluginManager');
 
 //  A proxy class to the Global Scene Manager
@@ -44,8 +45,16 @@ var ScenePlugin = new Class({
 
         if (key !== this.key)
         {
-            this.manager.stop(this.key);
-            this.manager.start(key);
+            if (this.settings.status !== CONST.RUNNING)
+            {
+                this.manager.queueOp('stop', this.key);
+                this.manager.queueOp('start', key);
+            }
+            else
+            {
+                this.manager.stop(this.key);
+                this.manager.start(key);
+            }
         }
 
         return this;
@@ -64,7 +73,14 @@ var ScenePlugin = new Class({
     {
         if (key && key !== this.key)
         {
-            this.manager.start(key);
+            if (this.settings.status !== CONST.RUNNING)
+            {
+                this.manager.queueOp('start', key);
+            }
+            else
+            {
+                this.manager.start(key);
+            }
         }
 
         return this;
@@ -115,7 +131,14 @@ var ScenePlugin = new Class({
     {
         if (key !== this.key)
         {
-            this.manager.switch(this.key, key);
+            if (this.settings.status !== CONST.RUNNING)
+            {
+                this.manager.queueOp('switch', this.key, key);
+            }
+            else
+            {
+                this.manager.switch(this.key, key);
+            }
         }
 
         return this;

diff --git a/src/scene/const.js b/src/scene/const.js
@@ -5,10 +5,11 @@ module.exports = {
     INIT: 1,
     START: 2,
     LOADING: 3,
-    RUNNING: 4,
-    PAUSED: 5,
-    SLEEPING: 6,
-    SHUTDOWN: 7,
-    DESTROYED: 8
+    CREATING: 4,
+    RUNNING: 5,
+    PAUSED: 6,
+    SLEEPING: 7,
+    SHUTDOWN: 8,
+    DESTROYED: 9
 
 };