Sorted out the mixin needed for the Canvas renderer.

Author: photonstorm

build/config.php

@@ -133,27 +133,6 @@
     <script src="$path/src/textures/parsers/JSONHash.js"></script>
     <script src="$path/src/textures/parsers/SpriteSheet.js"></script>
 
-    <script src="$path/src/renderer/canvas/CanvasRenderer.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/Container.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/Sprite.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/Graphics.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/SpriteBatch.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/Stage.js"></script>
-    <script src="$path/src/renderer/canvas/gameobjects/Text.js"></script>
-
-    <script src="$path/src/renderer/webgl/WebGLRenderer.js"></script>
-    <script src="$path/src/renderer/webgl/ShaderManager.js"></script>
-    <script src="$path/src/renderer/webgl/SpriteBatch.js"></script>
-    <script src="$path/src/renderer/webgl/shaders/Sprite.js"></script>
-    <script src="$path/src/renderer/webgl/shaders/SpriteBatch.js"></script>
-    <script src="$path/src/renderer/webgl/shaders/Strip.js"></script>
-    <script src="$path/src/renderer/webgl/shaders/PrimitiveGraphics.js"></script>
-    <script src="$path/src/renderer/webgl/gameobjects/Container.js"></script>
-    <script src="$path/src/renderer/webgl/gameobjects/Sprite.js"></script>
-    <script src="$path/src/renderer/webgl/gameobjects/Stage.js"></script>
-    <script src="$path/src/renderer/webgl/gameobjects/Text.js"></script>
-    <script src="$path/src/renderer/webgl/gameobjects/Graphics.js"></script>
-
 
 EOL;
 
@@ -219,6 +198,26 @@
     <script src="$path/src/plugins/path/PathPoint.js"></script>
     <script src="$path/src/plugins/path/EventTarget.js"></script>
 
+    <script src="$path/src/renderer/canvas/CanvasRenderer.js"></script>
+    <script src="$path/src/renderer/canvas/gameobjects/Container.js"></script>
+    <script src="$path/src/renderer/canvas/gameobjects/Sprite.js"></script>
+    <script src="$path/src/renderer/canvas/gameobjects/SpriteBatch.js"></script>
+    <script src="$path/src/renderer/canvas/gameobjects/Stage.js"></script>
+
+    <script src="$path/src/renderer/webgl/WebGLRenderer.js"></script>
+    <script src="$path/src/renderer/webgl/ShaderManager.js"></script>
+    <script src="$path/src/renderer/webgl/SpriteBatch.js"></script>
+    <script src="$path/src/renderer/webgl/shaders/Sprite.js"></script>
+    <script src="$path/src/renderer/webgl/shaders/SpriteBatch.js"></script>
+    <script src="$path/src/renderer/webgl/shaders/Strip.js"></script>
+    <script src="$path/src/renderer/webgl/shaders/PrimitiveGraphics.js"></script>
+    <script src="$path/src/renderer/webgl/gameobjects/Container.js"></script>
+    <script src="$path/src/renderer/webgl/gameobjects/Sprite.js"></script>
+    <script src="$path/src/renderer/webgl/gameobjects/Stage.js"></script>
+    <script src="$path/src/renderer/webgl/gameobjects/Text.js"></script>
+    <script src="$path/src/renderer/webgl/gameobjects/Graphics.js"></script>
+
+
 EOL;
 
     if ($modules['rope'])
@@ -281,6 +280,7 @@
     {
         echo <<<EOL
     <script src="$path/src/gameobjects/Text.js"></script>
+    <script src="$path/src/renderer/canvas/gameobjects/Text.js"></script>
 
 
 EOL;

src/core/Group.js

@@ -291,15 +291,6 @@ Phaser.Group = function (game, parent, name, addToStage, enableBody, physicsBody
     */
     this._sortProperty = 'z';
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Container.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Container.render;
-    }
-
 };
 
 Phaser.Group.prototype = Object.create(PIXI.DisplayObjectContainer.prototype);

src/core/Stage.js

@@ -93,15 +93,6 @@ Phaser.Stage = function (game) {
         this.parseConfig(game.config);
     }
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Stage.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Stage.render;
-    }
-
 };
 
 Phaser.Stage.prototype = Object.create(PIXI.DisplayObjectContainer.prototype);

src/gameobjects/Graphics.js

@@ -201,15 +201,6 @@ Phaser.Graphics = function (game, x, y) {
 
     Phaser.Component.Core.init.call(this, game, x, y, '', null);
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Graphics.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Graphics.render;
-    }
-
 };
 
 Phaser.Graphics.prototype = Object.create(PIXI.DisplayObjectContainer.prototype);

src/gameobjects/Image.js

@@ -50,15 +50,6 @@ Phaser.Image = function (game, x, y, key, frame) {
 
     Phaser.Component.Core.init.call(this, game, x, y, key, frame);
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Sprite.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Sprite.render;
-    }
-
 };
 
 Phaser.Image.prototype = Object.create(PIXI.Sprite.prototype);

src/gameobjects/Sprite.js

@@ -64,15 +64,6 @@ Phaser.Sprite = function (game, x, y, key, frame) {
 
     Phaser.Component.Core.init.call(this, game, x, y, key, frame);
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Sprite.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Sprite.render;
-    }
-
 };
 
 Phaser.Sprite.prototype = Object.create(PIXI.Sprite.prototype);

src/gameobjects/SpriteBatch.js

@@ -44,15 +44,6 @@ Phaser.SpriteBatch = function (game, parent, name, addToStage) {
     */
     this.ready = false;
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.SpriteBatch.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.SpriteBatch.render;
-    }
-
 };
 
 Phaser.SpriteBatch.prototype = Object.create(Phaser.Group.prototype);

src/gameobjects/Text.js

@@ -190,15 +190,6 @@ Phaser.Text = function (game, x, y, text, style) {
         this.updateText();
     }
 
-    if (this.game.renderType === Phaser.CANVAS)
-    {
-        this.render = Phaser.Renderer.Canvas.GameObjects.Text.render;
-    }
-    else
-    {
-        this.render = Phaser.Renderer.WebGL.GameObjects.Text.render;
-    }
-
 };
 
 Phaser.Text.prototype = Object.create(Phaser.Sprite.prototype);

src/renderer/canvas/CanvasRenderer.js

@@ -95,12 +95,7 @@ Phaser.Renderer.Canvas = function (game)
     this.currentBlendMode = 0;
     this.currentScaleMode = 0;
 
-    if (this.game.device.canUseMultiply)
-    {
-        this.mapBlendModes();
-    }
-
-    this.resize(this.width, this.height);
+    this.init();
 
 };
 
@@ -110,6 +105,27 @@ Phaser.Renderer.Canvas.prototype.constructor = Phaser.Renderer.Canvas;
 
 Phaser.Renderer.Canvas.prototype = {
 
+    init: function ()
+    {
+        //  Mixin the renderer functions
+        for (var renderer in Phaser.Renderer.Canvas.GameObjects)
+        {
+            var types = Phaser.Renderer.Canvas.GameObjects[renderer].TYPES;
+
+            for (var i = 0; i < types.length; i++)
+            {
+                types[i].render = Phaser.Renderer.Canvas.GameObjects[renderer].render;
+            }
+        }
+
+        if (this.game.device.canUseMultiply)
+        {
+            this.mapBlendModes();
+        }
+
+        this.resize(this.width, this.height);
+    },
+
     /**
      * Maps Blend modes to Canvas blend modes.
      *
@@ -199,7 +215,7 @@ Phaser.Renderer.Canvas.prototype = {
             }
         }
 
-        stage.render(this);
+        stage.render(this, stage);
 
         //  Add Post-render hook
     },

src/renderer/canvas/gameobjects/Container.js

@@ -1,45 +1,53 @@
 /**
-* Note that 'this' in all functions here refer to the owning object.
-* For example the Group, Stage, Sprite, etc. because the render function
-* here is mapped to the prototype for the game object.
+* @author       Richard Davey <rich@photonstorm.com>
+* @author       Mat Groves (@Doormat23)
+* @copyright    2016 Photon Storm Ltd.
+* @license      {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
 */
+
+
 Phaser.Renderer.Canvas.GameObjects.Container = {
 
-    render: function (renderer)
+    TYPES: [
+        Phaser.Group.prototype,
+        PIXI.DisplayObjectContainer.prototype
+    ],
+
+    render: function (renderer, src)
     {
-        if (this.visible === false || this.alpha === 0)
+        if (src.visible === false || src.alpha === 0)
         {
             return;
         }
 
-        if (this._cacheAsBitmap)
+        if (src._cacheAsBitmap)
         {
-            return this.renderCachedSprite(renderer);
+            return this.renderCachedSprite(renderer, src);
         }
 
-        if (this._mask)
+        if (src._mask)
         {
-            renderer.pushMask(this._mask);
+            renderer.pushMask(src._mask);
         }
 
-        for (var i = 0; i < this.children.length; i++)
+        for (var i = 0; i < src.children.length; i++)
         {
-            var child = this.children[i];
+            var child = src.children[i];
 
             child.render(renderer, child);
         }
 
-        if (this._mask)
+        if (src._mask)
         {
             renderer.popMask();
         }
 
     },
 
-    renderCachedSprite: function (renderer)
+    renderCachedSprite: function (renderer, src)
     {
         //  TODO
-        return renderer;
+        return src;
     }
 
 };