Huge amount of work getting the WebGL renderer sorted out, tidied up and merged with the latest Texture and Transform components.

Author: photonstorm

src/core/Filter.js

@@ -32,8 +32,8 @@
 * @param {object} [uniforms] - Uniform mappings object. The uniforms are added on the default uniforms, or replace them if the keys are the same.
 * @param {Array|string} [fragmentSrc] - The fragment shader code. Either an array, one element per line of code, or a string.
 */
-Phaser.Filter = function (game, uniforms, fragmentSrc) {
-
+Phaser.Filter = function (game, uniforms, fragmentSrc)
+{
     /**
     * @property {Phaser.Game} game - A reference to the currently running game.
     */
@@ -90,7 +90,7 @@ Phaser.Filter = function (game, uniforms, fragmentSrc) {
         resolution: { type: '2f', value: { x: 256, y: 256 }},
         time: { type: '1f', value: 0 },
         mouse: { type: '2f', value: { x: 0.0, y: 0.0 } },
-        date: { type: '4fv', value: [ d.getFullYear(),  d.getMonth(),  d.getDate(), d.getHours() *60 * 60 + d.getMinutes() * 60 + d.getSeconds() ] },
+        date: { type: '4fv', value: [ d.getFullYear(), d.getMonth(), d.getDate(), d.getHours() * 60 * 60 + d.getMinutes() * 60 + d.getSeconds() ] },
         sampleRate: { type: '1f', value: 44100.0 },
         iChannel0: { type: 'sampler2D', value: null, textureData: { repeat: true } },
         iChannel1: { type: 'sampler2D', value: null, textureData: { repeat: true } },
@@ -125,10 +125,11 @@ Phaser.Filter.prototype = {
 
     /**
     * This should be over-ridden. Will receive a variable number of arguments.
-    * 
+    *
     * @method Phaser.Filter#init
     */
-    init: function () {
+    init: function ()
+    {
 
         //  This should be over-ridden. Will receive a variable number of arguments.
 
@@ -141,21 +142,20 @@ Phaser.Filter.prototype = {
     * @param {number} width - The width of the display.
     * @param {number} height - The height of the display.
     */
-    setResolution: function (width, height) {
-
+    setResolution: function (width, height)
+    {
         this.uniforms.resolution.value.x = width;
         this.uniforms.resolution.value.y = height;
-
     },
 
     /**
     * Updates the filter.
-    * 
+    *
     * @method Phaser.Filter#update
     * @param {Phaser.Pointer} [pointer] - A Pointer object to use for the filter. The coordinates are mapped to the mouse uniform.
     */
-    update: function (pointer) {
-
+    update: function (pointer)
+    {
         if (pointer)
         {
             var x = pointer.x / this.game.width;
@@ -170,11 +170,10 @@ Phaser.Filter.prototype = {
         }
 
         this.uniforms.time.value = this.game.time.totalElapsedSeconds();
-
     },
 
     /**
-    * Creates a new Phaser.Image object using a blank texture and assigns 
+    * Creates a new Phaser.Image object using a blank texture and assigns
     * this Filter to it. The image is then added to the world.
     *
     * If you don't provide width and height values then Filter.width and Filter.height are used.
@@ -191,8 +190,8 @@ Phaser.Filter.prototype = {
     * @param {number} [anchorY=0] - Set the y anchor point of the Image. A value between 0 and 1, where 0 is the top-left and 1 is bottom-right.
     * @return {Phaser.Image} The newly added Image object.
     */
-    addToWorld: function (x, y, width, height, anchorX, anchorY) {
-
+    addToWorld: function (x, y, width, height, anchorX, anchorY)
+    {
         if (anchorX === undefined) { anchorX = 0; }
         if (anchorY === undefined) { anchorY = 0; }
 
@@ -232,30 +231,28 @@ Phaser.Filter.prototype = {
     * 
     * @method Phaser.Filter#syncUniforms
     */
-    syncUniforms: function () {
-
+    syncUniforms: function ()
+    {
         for (var i = 0; i < this.shaders.length; i++)
         {
             this.shaders[i].dirty = true;
         }
-
     },
 
     /**
     * Clear down this Filter and null out references to game.
-    * 
+    *
     * @method Phaser.Filter#destroy
     */
-    destroy: function () {
-
+    destroy: function ()
+    {
         this.passes.length = 0;
         this.shaders.length = 0;
         this.fragmentSrc.length = 0;
 
         this.game = null;
         this.uniforms = null;
         this.prevPoint = null;
-
     }
 
 };

src/gameobjects/image/ImageWebGLRenderer.js

@@ -6,14 +6,15 @@ Phaser.Renderer.WebGL.GameObjects.Image = {
 
     render: function (renderer, src)
     {
-        // If the sprite is not visible or the alpha is 0 then no need to render this element
-        if (!src.visible || src.alpha === 0 || !src.renderable)
+        var frame = src.frame;
+
+        //  Skip rendering?
+
+        if (src.skipRender || !src.visible || src.worldAlpha <= 0 || !frame.cutWidth || !frame.cutHeight)
         {
             return;
         }
 
-        // Add back in: || src.texture.crop.width <= 0 || src.texture.crop.height <= 0
-
         renderer.spriteBatch.render(src);
     }
 

src/gameobjects/stage/StageWebGLRenderer.js

@@ -11,11 +11,19 @@ Phaser.Renderer.WebGL.GameObjects.Stage = {
 
     render: function (renderer, src)
     {
-        if (src.visible === false || src.alpha === 0 || src.children.length === 0)
+        if (!src.visible || src.alpha === 0 || src.children.list.length === 0)
         {
             return;
         }
 
+        for (var i = 0; i < src.children.list.length; i++)
+        {
+            var child = src.children.list[i];
+
+            child.render(renderer, child);
+        }
+
+        /*
         var i;
 
         if (src._mask || src._filters)
@@ -64,6 +72,7 @@ Phaser.Renderer.WebGL.GameObjects.Stage = {
                 child.render(renderer, child);
             }
         }
+        */
 
     }
 

src/loader/Cache.js

@@ -329,7 +329,7 @@ Phaser.Cache.prototype = {
 
         img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgAQMAAABJtOi3AAAAA1BMVEX///+nxBvIAAAAAXRSTlMAQObYZgAAABVJREFUeF7NwIEAAAAAgKD9qdeocAMAoAABm3DkcAAAAABJRU5ErkJggg==';
 
-        this.game.textures.addImage('__DEFAULT', img);
+        // this.game.textures.addImage('__DEFAULT', img);
     },
 
     /**
@@ -347,7 +347,7 @@ Phaser.Cache.prototype = {
 
         img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJ9JREFUeNq01ssOwyAMRFG46v//Mt1ESmgh+DFmE2GPOBARKb2NVjo+17PXLD8a1+pl5+A+wSgFygymWYHBb0FtsKhJDdZlncG2IzJ4ayoMDv20wTmSMzClEgbWYNTAkQ0Z+OJ+A/eWnAaR9+oxCF4Os0H8htsMUp+pwcgBBiMNnAwF8GqIgL2hAzaGFFgZauDPKABmowZ4GL369/0rwACp2yA/ttmvsQAAAABJRU5ErkJggg==';
 
-        this.game.textures.addImage('__MISSING', img);
+        // this.game.textures.addImage('__MISSING', img);
     },
 
     /**