Working through context issues.

Author: photonstorm

v3/src/boot/CreateRenderer.js

@@ -80,6 +80,7 @@ var CreateRenderer = function (game)
     {
         game.renderer = new CanvasRenderer(game);
         game.context = game.renderer.gameContext;
+
         //  debug
         game.canvas.id = 'game';
     }

v3/src/boot/MainLoop.js

@@ -23,6 +23,8 @@ var MainLoop = function (framerate)
     */
     this.frameDelta = 0;
 
+    this.discardedTime = 0;
+
     /**
     * The timestamp in milliseconds of the last time the main loop was run.
     * Used to compute the time elapsed between frames.
@@ -134,9 +136,11 @@ MainLoop.prototype = {
 
     step: function (timestamp, active, renderer)
     {
+        var len = active.length;
+
         // Throttle the frame rate (if minFrameDelay is set to a non-zero value by
         // `MainLoop.setMaxAllowedFPS()`).
-        if (active.length === 0 || timestamp < this.lastFrameTimeMs + this.minFrameDelay)
+        if (len === 0 || timestamp < this.lastFrameTimeMs + this.minFrameDelay)
         {
             return;
         }
@@ -152,7 +156,7 @@ MainLoop.prototype = {
         //  Run any updates that are not dependent on time in the simulation.
         //  Here we'll need to run things like tween.update, input.update, etc.
 
-        for (var i = 0; i < active.length; i++)
+        for (var i = 0; i < len; i++)
         {
             active[i].state.sys.begin(timestamp, this.frameDelta);
         }
@@ -178,7 +182,7 @@ MainLoop.prototype = {
 
         while (this.frameDelta >= this.timestep)
         {
-            for (var i = 0; i < active.length; i++)
+            for (i = 0; i < len; i++)
             {
                 active[i].state.sys.update(this.timestep, this.physicsStep);
             }
@@ -198,6 +202,7 @@ MainLoop.prototype = {
 
         renderer.preRender();
 
+        //  This uses active.length, in case state.update removed the state from the active list
         for (i = 0; i < active.length; i++)
         {
             active[i].state.sys.render(interpolation, renderer);
@@ -211,9 +216,9 @@ MainLoop.prototype = {
             // it's better than the alternative (the application would look like it
             // was running very quickly until the simulation caught up to real
             // time).
-            var discardedTime = Math.round(this.resetFrameDelta());
+            this.discardedTime = Math.round(this.resetFrameDelta());
 
-            console.warn('Main loop panicked, tab probably put in the background. Discarding ' + discardedTime + 'ms');
+            // console.warn('Main loop panicked, tab probably put in the background. Discarding ' + discardedTime + 'ms');
         }
 
         this.panic = false;

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'ec84a400-ed6e-11e6-b72e-61e1cba6b1dc'
+build: '539c39d0-ed76-11e6-b722-c929a207674e'
 };
 module.exports = CHECKSUM;

v3/src/events/EventBinding.js

@@ -229,9 +229,6 @@ EventBinding.prototype = {
             return;
         }
 
-        console.log('EventBinding.tidy');
-        console.dir(this.active);
-
         var added = 0;
 
         var i = this.active.length - 1;

v3/src/renderer/canvas/CanvasRenderer.js

@@ -144,6 +144,11 @@ CanvasRenderer.prototype = {
      */
     render: function (state, list, interpolationPercentage, camera)
     {
+        if (window.d === 1)
+        {
+            console.log('render', state.sys.settings.key);
+        }
+
         var w = state.sys.width;
         var h = state.sys.height;
         var ctx = state.sys.context;
@@ -157,6 +162,11 @@ CanvasRenderer.prototype = {
 
         if (scissor)
         {
+            if (window.d === 1)
+            {
+                console.log('scissor');
+            }
+
             ctx.beginPath();
             ctx.rect(camera.x, camera.y, camera.width, camera.height);
             ctx.clip();
@@ -179,6 +189,11 @@ CanvasRenderer.prototype = {
 
         if (settings.renderToTexture)
         {
+            if (window.d === 1)
+            {
+                console.log('renderToTexture');
+            }
+
             if (settings.clearBeforeRender)
             {
                 ctx.clearRect(0, 0, w, h);
@@ -197,20 +212,30 @@ CanvasRenderer.prototype = {
         {
             var child = list[c].gameObject;
 
+            if (window.d === 1)
+            {
+                console.log('render child', state.sys.settings.key, child.frame.cutWidth);
+            }
+
             child.renderCanvas(this, child, interpolationPercentage);
         }
 
         //  Reset the transform so going into the devs render function the context is ready for use
         ctx.setTransform(1, 0, 0, 1, 0, 0);
 
         //  Call the State.render function
-        state.render(ctx, interpolationPercentage);
+        state.render.call(state, ctx, interpolationPercentage);
 
         //  Blast it to the Game Canvas (if needed)
         if (settings.renderToTexture)
         {
             this.gameContext.drawImage(state.sys.canvas, 0, 0, w, h, settings.x, settings.y, w, h);
         }
+
+        if (window.d === 1)
+        {
+            console.log('render end', state.sys.settings.key);
+        }
     },
 
     postRender: function ()

v3/src/state/StateManager.js

@@ -332,15 +332,17 @@ StateManager.prototype = {
 
     getActiveStateIndex: function (state)
     {
+        var index = -1;
+
         for (var i = 0; i < this.active.length; i++)
         {
             if (this.active[i].state === state)
             {
-                return this.active[i].index;
+                index = this.active[i].index;
             }
         }
 
-        return -1;
+        return index;
     },
 
     isActive: function (key)
@@ -434,7 +436,7 @@ StateManager.prototype = {
 
         if (state.preload)
         {
-            state.preload.call(state, this.game);
+            state.preload(this.game);
 
             //  Is the loader empty?
             if (loader.list.size === 0)
@@ -473,7 +475,7 @@ StateManager.prototype = {
         if (state.create)
         {
             console.log('startCreate.call', state.sys.settings.key);
-            state.create.call(state);
+            state.create();
         }
 
         //  Insert at the correct index, or it just all goes wrong :)

v3/src/state/Systems.js

@@ -136,7 +136,7 @@ Systems.prototype = {
             // }
         }
 
-        this.state.update(timestep, physicsStep);
+        this.state.update.call(this.state, timestep, physicsStep);
     },
 
     render: function (interpolation, renderer)