Scene now sets a status flag for every state it goes through, allowing the manager to know when to allow updating and rendering

Author: photonstorm

src/scene/SceneManager.js

@@ -1,7 +1,7 @@
 var CanvasInterpolation = require('../display/canvas/CanvasInterpolation');
 var CanvasPool = require('../display/canvas/CanvasPool');
 var Class = require('../utils/Class');
-var CONST = require('../const');
+var CONST = require('./const');
 var GetValue = require('../utils/object/GetValue');
 var NOOP = require('../utils/NOOP');
 var Scene = require('./Scene');
@@ -230,6 +230,8 @@ var SceneManager = new Class({
             }
             else
             {
+                scene.sys.settings.status = CONST.LOADING;
+
                 //  Start the loader going as we have something in the queue
                 loader.once('complete', this.loadComplete, this);
 
@@ -295,7 +297,7 @@ var SceneManager = new Class({
         {
             var sys = this.scenes[i].sys;
 
-            if (sys.settings.active)
+            if (sys.settings.status === CONST.RUNNING)
             {
                 sys.step(time, delta);
             }
@@ -342,6 +344,8 @@ var SceneManager = new Class({
         {
             scene.create.call(scene, scene.sys.settings.data);
         }
+        
+        scene.sys.settings.status = CONST.RUNNING;
     },
 
     /**
@@ -781,6 +785,8 @@ var SceneManager = new Class({
 
                 if (loader.loadArray(scene.sys.settings.files))
                 {
+                    scene.sys.settings.status = CONST.LOADING;
+
                     loader.once('complete', this.payloadComplete, this);
 
                     loader.start();

src/scene/Systems.js

@@ -46,6 +46,8 @@ var Systems = new Class({
 
     init: function (game)
     {
+        this.settings.status = CONST.INIT;
+
         this.game = game;
 
         this.canvas = game.canvas;
@@ -117,6 +119,8 @@ var Systems = new Class({
     {
         if (this.settings.active)
         {
+            this.settings.status = CONST.PAUSED;
+
             this.settings.active = false;
 
             this.events.emit('pause', this);
@@ -127,6 +131,8 @@ var Systems = new Class({
     {
         if (!this.settings.active)
         {
+            this.settings.status = CONST.RUNNING;
+
             this.settings.active = true;
 
             this.events.emit('resume', this);
@@ -135,6 +141,8 @@ var Systems = new Class({
 
     sleep: function ()
     {
+        this.settings.status = CONST.SLEEPING;
+
         this.settings.active = false;
         this.settings.visible = false;
 
@@ -143,6 +151,8 @@ var Systems = new Class({
 
     wake: function ()
     {
+        this.settings.status = CONST.RUNNING;
+
         this.settings.active = true;
         this.settings.visible = true;
 
@@ -151,12 +161,12 @@ var Systems = new Class({
 
     isSleeping: function ()
     {
-        return (!this.settings.active && !this.settings.visible);
+        return (this.settings.status === CONST.SLEEPING);
     },
 
     isActive: function ()
     {
-        return this.settings.active;
+        return (this.settings.status === CONST.RUNNING);
     },
 
     isVisible: function ()
@@ -173,13 +183,20 @@ var Systems = new Class({
 
     setActive: function (value)
     {
-        this.settings.active = value;
-
-        return this;
+        if (value)
+        {
+            return this.resume();
+        }
+        else
+        {
+            return this.pause();
+        }
     },
 
     start: function (data)
     {
+        this.settings.status = CONST.START;
+
         this.settings.data = data;
 
         this.settings.active = true;
@@ -190,6 +207,8 @@ var Systems = new Class({
 
     shutdown: function ()
     {
+        this.settings.status = CONST.SHUTDOWN;
+
         this.settings.active = false;
         this.settings.visible = false;
 
@@ -198,6 +217,8 @@ var Systems = new Class({
 
     destroy: function ()
     {
+        this.settings.status = CONST.DESTROYED;
+
         this.events.emit('destroy', this);
     }
 

src/scene/const.js

@@ -2,7 +2,13 @@
 module.exports = {
 
     PENDING: 0,
-    INSTALLED: 1,
-    SHUTDOWN: 2
+    INIT: 1,
+    START: 2,
+    LOADING: 3,
+    RUNNING: 4,
+    PAUSED: 5,
+    SLEEPING: 6,
+    SHUTDOWN: 7,
+    DESTROYED: 8
 
 };