New State Manager up and running.

Author: photonstorm

build/config.php

@@ -74,10 +74,11 @@
     <script src="$path/src/geom/Rectangle.js"></script>
     <script src="$path/src/geom/RoundedRectangle.js"></script>
 
+    <script src="$path/src/states/State.js"></script>
+    <script src="$path/src/states/StateManager.js"></script>
+
     <script src="$path/src/core/Camera.js"></script>
     <script src="$path/src/core/Create.js"></script>
-    <script src="$path/src/core/State.js"></script>
-    <script src="$path/src/core/StateManager.js"></script>
     <script src="$path/src/core/Signal.js"></script>
     <script src="$path/src/core/SignalBinding.js"></script>
     <script src="$path/src/core/Filter.js"></script>

src/components/Children.js

@@ -594,8 +594,9 @@ Phaser.Component.Children.prototype = {
         }
 
         return newParent;
-    },
+    }
 
+    /*
     preUpdate: function ()
     {
         for (var i = 0; i < this.list.length; i++)
@@ -605,7 +606,30 @@ Phaser.Component.Children.prototype = {
                 this.list[i].preUpdate();
             }
         }
+    },
+
+    update: function ()
+    {
+        for (var i = 0; i < this.list.length; i++)
+        {
+            if (this.list[i])
+            {
+                this.list[i].update();
+            }
+        }
+    },
+
+    postUpdate: function ()
+    {
+        for (var i = 0; i < this.list.length; i++)
+        {
+            if (this.list[i])
+            {
+                this.list[i].postUpdate();
+            }
+        }
     }
+    */
 
 };
 

src/core/Game.js

@@ -608,7 +608,7 @@ Phaser.Game.prototype = {
         this.updates = new Phaser.UpdateManager(this);
 
         this.scale = new Phaser.ScaleManager(this, this._width, this._height);
-        this.stage = new Phaser.Stage(this);
+        // this.stage = new Phaser.Stage(this);
 
         this.setUpRenderer();
 
@@ -631,7 +631,7 @@ Phaser.Game.prototype = {
 
         this.add = new Phaser.GameObject.Factory(this);
 
-        this.make = new Phaser.GameObjectCreator(this);
+        // this.make = new Phaser.GameObjectCreator(this);
         this.cache = new Phaser.Cache(this);
         this.load = new Phaser.Loader(this);
         this.time = new Phaser.Time(this);
@@ -645,7 +645,7 @@ Phaser.Game.prototype = {
         this.net = new Phaser.Net(this);
 
         this.time.boot();
-        this.stage.boot();
+        // this.stage.boot();
         // this.world.boot();
         this.scale.boot();
         this.input.boot();
@@ -772,14 +772,8 @@ Phaser.Game.prototype = {
         {
             //  They requested WebGL and their browser supports it
 
-            if (this.multiTexture || this.renderType === Phaser.WEBGL_MULTI)
-            {
-                PIXI.enableMultiTexture();
-            }
-
             this.renderType = Phaser.WEBGL;
 
-            // this.renderer = new PIXI.WebGLRenderer(this);
             this.renderer = new Phaser.Renderer.WebGL(this);
 
             this.context = null;
@@ -789,14 +783,14 @@ Phaser.Game.prototype = {
             this.canvas.addEventListener('webglcontextrestored', this.contextRestored.bind(this), false);
         }
 
-        if (this.device.cocoonJS)
-        {
-            this.canvas.screencanvas = (this.renderType === Phaser.CANVAS) ? true : false;
-        }
+        // if (this.device.cocoonJS)
+        // {
+        //     this.canvas.screencanvas = (this.renderType === Phaser.CANVAS) ? true : false;
+        // }
 
         if (this.renderType !== Phaser.HEADLESS)
         {
-            this.stage.smoothed = this.antialias;
+            // this.stage.smoothed = this.antialias;
 
             Phaser.Canvas.addToDOM(this.canvas, this.parent, false);
             Phaser.Canvas.setTouchAction(this.canvas);
@@ -964,11 +958,11 @@ Phaser.Game.prototype = {
             // this.physics.preUpdate();
             this.state.preUpdate(timeStep);
             // this.plugins.preUpdate(timeStep);
-            this.stage.preUpdate();
+            // this.stage.preUpdate();
 
             this.tweens.update();
             this.state.update();
-            this.stage.update();
+            // this.stage.update();
             // this.tweens.update();
 
             // this.sound.update();
@@ -977,7 +971,8 @@ Phaser.Game.prototype = {
             // this.particles.update();
             // this.plugins.update();
 
-            this.stage.postUpdate();
+            this.state.postUpdate();
+
             this.plugins.postUpdate();
         }
         else
@@ -1012,16 +1007,17 @@ Phaser.Game.prototype = {
             return;
         }
 
-        this.state.preRender(elapsedTime);
+        // this.state.preRender(elapsedTime);
 
         this.updates.start();
 
-        this.renderer.render(this.stage);
+        this.state.render(this.renderer);
 
-        // this.plugins.render(elapsedTime);
-
-        this.state.render(elapsedTime);
+        //  Disabled while building out the new State Manager
+        // this.renderer.render();
 
+        // this.plugins.render(elapsedTime);
+        // this.state.render(elapsedTime);
         // this.plugins.postRender(elapsedTime);
 
         this.updates.stop();

src/core/State.js

@@ -2173,7 +2173,7 @@ Phaser.Loader.prototype = {
 
         this.onLoadComplete.dispatch();
 
-        this.game.state.loadComplete();
+        // this.game.state.loadComplete();
 
         this.reset();
     },

src/loader/Loader.js

@@ -442,7 +442,7 @@ Phaser.Renderer.WebGL.prototype = {
      * @method render
      * @param stage {Stage} the Stage element to be rendered
      */
-    render: function (stage)
+    render: function (state)
     {
         //  No point rendering if our context has been blown up!
         if (this.contextLost)
@@ -471,10 +471,13 @@ Phaser.Renderer.WebGL.prototype = {
 
         this.batch.start();
 
-        stage.render(this, stage);
+        this.game.state.renderChildren(this, state);
 
         this.batch.stop();
 
+        //  Call state.render here, so we can do some extra shizzle on the top
+        //  Maybe pass in the FBO texture too?
+
         this.stateFBO.render(null);
 
         this.endTime = Date.now();