Adding in more renderer game objects.

Author: photonstorm

build/config.php

@@ -136,7 +136,10 @@
     <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>
@@ -147,6 +150,9 @@
     <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;

src/core/Group.js

@@ -291,6 +291,15 @@ 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,6 +93,15 @@ 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,6 +201,15 @@ 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);
@@ -1513,6 +1522,30 @@ Phaser.Graphics.prototype.drawShape = function (shape) {
 
 };
 
+Phaser.Graphics.prototype.updateGraphicsTint = function () {
+
+    if (this.tint === 0xFFFFFF)
+    {
+        return;
+    }
+
+    var tintR = (this.tint >> 16 & 0xFF) / 255;
+    var tintG = (this.tint >> 8 & 0xFF) / 255;
+    var tintB = (this.tint & 0xFF) / 255;
+
+    for (var i = 0; i < this.graphicsData.length; i++)
+    {
+        var data = this.graphicsData[i];
+
+        var fillColor = data.fillColor | 0;
+        var lineColor = data.lineColor | 0;
+
+        data._fillTint = (((fillColor >> 16 & 0xFF) / 255 * tintR * 255 << 16) + ((fillColor >> 8 & 0xFF) / 255 * tintG * 255 << 8) + (fillColor & 0xFF) / 255 * tintB * 255);
+        data._lineTint = (((lineColor >> 16 & 0xFF) / 255 * tintR * 255 << 16) + ((lineColor >> 8 & 0xFF) / 255 * tintG * 255 << 8) + (lineColor & 0xFF) / 255 * tintB * 255);
+    }
+
+};
+
 /**
  * When cacheAsBitmap is set to true the graphics object will be rendered as if it was a sprite.
  * This is useful if your graphics element does not change often, as it will speed up the rendering of the object in exchange for taking up texture memory.

src/gameobjects/Image.js

@@ -50,6 +50,15 @@ 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,6 +64,15 @@ 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,6 +44,15 @@ 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,6 +190,15 @@ 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/pixi/display/DisplayObjectContainer.js

@@ -33,9 +33,6 @@ PIXI.DisplayObjectContainer = function () {
     * @default
     */
     this.ignoreChildInput = false;
-
-    // this.render = Phaser.Renderer.Canvas.GameObjects.Container.render;
-    this.render = Phaser.Renderer.WebGL.GameObjects.Container.render;
 
 };
 

src/pixi/display/Sprite.js

@@ -116,9 +116,6 @@ PIXI.Sprite = function (texture) {
 
     this.renderable = true;
 
-    // this.render = Phaser.Renderer.Canvas.GameObjects.Sprite.render;
-    this.render = Phaser.Renderer.WebGL.GameObjects.Sprite.render;
-
 };
 
 // constructor