Light2D update

Author: bitnenfer

src/gameobjects/components/Pipeline.js

@@ -13,9 +13,10 @@ var Pipeline = {
         {
             this.defaultPipeline = renderer.getPipeline(pipelineName);
             this.pipeline = this.defaultPipeline;
+            return true;
         }
 
-        return this;
+        return false;
     },
 
     setPipeline: function (pipelineName)
@@ -25,15 +26,16 @@ var Pipeline = {
         if (renderer.gl && renderer.hasPipeline(pipelineName))
         {
             this.pipeline = renderer.getPipeline(pipelineName);
+            return true;
         }
 
-        return this;
+        return false;
     },
 
     resetPipeline: function ()
     {
         this.pipeline = this.defaultPipeline;
-        return this;
+        return (this.pipeline !== null);
     }
 
 };

src/gameobjects/text/static/TextWebGLRenderer.js

@@ -14,26 +14,7 @@ var TextWebGLRenderer = function (renderer, text, interpolationPercentage, camer
         text.dirty = false;
     }
 
-    var getTint = Utils.getTintAppendFloatAlpha;
-
-    this.pipeline.batchTexture(
-        text.canvasTexture,
-        text.canvasTexture.width, text.canvasTexture.height,
-        text.x, text.y,
-        text.canvasTexture.width, text.canvasTexture.height,
-        text.scaleX, text.scaleY,
-        text.rotation,
-        text.flipX, text.flipY,
-        text.scrollFactorX, text.scrollFactorY,
-        text.displayOriginX, text.displayOriginY,
-        0, 0, text.canvasTexture.width, text.canvasTexture.height,
-        getTint(text._tintTL, text._alphaTL), 
-        getTint(text._tintTR, text._alphaTR), 
-        getTint(text._tintBL, text._alphaBL), 
-        getTint(text._tintBR, text._alphaBR),
-        0, 0,
-        camera
-    );
+    this.pipeline.batchText(this, camera);
 };
 
 module.exports = TextWebGLRenderer;

src/gameobjects/tilemap/dynamiclayer/DynamicTilemapLayerWebGLRenderer.js

@@ -9,50 +9,7 @@ var DynamicTilemapLayerWebGLRenderer = function (renderer, tilemapLayer, interpo
     }
 
     tilemapLayer.cull(camera);
-
-    var renderTiles = tilemapLayer.culledTiles;
-    var length = renderTiles.length;
-    var texture = tilemapLayer.tileset.image.get().source.glTexture;
-    var tileset = tilemapLayer.tileset;
-    var scrollFactorX = tilemapLayer.scrollFactorX;
-    var scrollFactorY = tilemapLayer.scrollFactorY;
-    var alpha = tilemapLayer.alpha;
-    var x = tilemapLayer.x;
-    var y = tilemapLayer.y;
-    var sx = tilemapLayer.scaleX;
-    var sy = tilemapLayer.scaleY;
-    var getTint = Utils.getTintAppendFloatAlpha;
-    var pipeline = this.pipeline; 
-
-    for (var index = 0; index < length; ++index)
-    {
-        var tile = renderTiles[index];
-
-        var tileTexCoords = tileset.getTileTextureCoordinates(tile.index);
-        if (tileTexCoords === null) { continue; }
-
-        var frameWidth = tile.width * (tile.flipX ? -1 : 1);
-        var frameHeight = tile.height * (tile.flipY ? -1 : 1);
-        var frameX = tileTexCoords.x + (tile.flipX ? tile.width : 0);
-        var frameY = tileTexCoords.y + (tile.flipY ? tile.height : 0);
-        var tint = getTint(tile.tint, alpha * tile.alpha);
-
-        pipeline.batchTexture(
-            texture,
-            texture.width, texture.height,
-            x + tile.pixelX * sx, y + tile.pixelY * sy,
-            tile.width * sx, tile.height * sy,
-            1, 1,
-            0,
-            false, false,
-            scrollFactorX, scrollFactorY,
-            0, 0,
-            frameX, frameY, frameWidth, frameHeight,
-            tint, tint, tint, tint,
-            0, 0,
-            camera
-        );
-    }    
+    this.pipeline.batchDynamicTilemapLayer(tilemapLayer, camera); 
 };
 
 module.exports = DynamicTilemapLayerWebGLRenderer;

src/gameobjects/tilesprite/TileSpriteWebGLRenderer.js

@@ -9,28 +9,7 @@ var TileSpriteWebGLRenderer = function (renderer, tileSprite, interpolationPerce
     }
 
     tileSprite.updateTileTexture();
-
-    var getTint = Utils.getTintAppendFloatAlpha;
-
-    this.pipeline.batchTexture(
-        tileSprite.tileTexture,
-        tileSprite.frame.width,  tileSprite.frame.height,
-        tileSprite.x, tileSprite.y,
-        tileSprite.width, tileSprite.height,
-        tileSprite.scaleX, tileSprite.scaleY,
-        tileSprite.rotation,
-        tileSprite.flipX, tileSprite.flipY,
-        tileSprite.scrollFactorX, tileSprite.scrollFactorY,
-        tileSprite.originX * tileSprite.width, tileSprite.originY * tileSprite.height,
-        0, 0, tileSprite.width, tileSprite.height,
-        getTint(tileSprite._tintTL, tileSprite._alphaTL), 
-        getTint(tileSprite._tintTR, tileSprite._alphaTR), 
-        getTint(tileSprite._tintBL, tileSprite._alphaBL), 
-        getTint(tileSprite._tintBR, tileSprite._alphaBR),
-        tileSprite.tilePositionX / tileSprite.frame.width, 
-        tileSprite.tilePositionY / tileSprite.frame.height,
-        camera
-    );
+    this.pipeline.batchTileSprite(this, camera);
 };
 
 module.exports = TileSpriteWebGLRenderer;

src/renderer/webgl/WebGLPipeline.js

@@ -23,7 +23,6 @@ var WebGLPipeline = new Class({
         this.attributes = config.attributes;
         this.vertexSize = config.vertexSize;
         this.topology = config.topology;
-        this.currentProgram = this.program;
         this.bytes = new Uint8Array(this.vertexData);
         // This will store the amount of components of 32 bit length
         this.vertexComponentCount = Utils.getComponentCount(config.attributes);
@@ -41,12 +40,12 @@ var WebGLPipeline = new Class({
         return this;
     },
 
-    bind: function (overrideProgram)
+    bind: function ()
     {
         var gl = this.gl;
         var vertexBuffer = this.vertexBuffer;
         var attributes = this.attributes;
-        var program = (!overrideProgram ? this.program : overrideProgram); 
+        var program = this.program;
         var renderer = this.renderer;
         var vertexSize = this.vertexSize;
 
@@ -69,8 +68,6 @@ var WebGLPipeline = new Class({
             }
         }
 
-        this.currentProgram = program;
-
         return this;
     },
 

src/renderer/webgl/WebGLRenderer.js

@@ -134,7 +134,7 @@ var WebGLRenderer = new Class({
         this.addPipeline('TextureTintPipeline', new TextureTintPipeline(this.game, gl, this));
         this.addPipeline('FlatTintPipeline', new FlatTintPipeline(this.game, gl, this));
         this.addPipeline('BitmapMaskPipeline', new BitmapMaskPipeline(this.game, gl, this));
-        this.addPipeline('LightPipeline', new ForwardDiffuseLightPipeline(this.game, gl, this));
+        this.addPipeline('Light2D', new ForwardDiffuseLightPipeline(this.game, gl, this));
 
         this.setBlendMode(CONST.BlendModes.NORMAL);
         this.resize(this.width, this.height, this.game.config.resolution);
@@ -302,14 +302,15 @@ var WebGLRenderer = new Class({
         return this;
     },
 
-    setPipeline: function (pipelineInstance, overrideProgram)
+    setPipeline: function (pipelineInstance)
     {
         if (this.currentPipeline !== pipelineInstance ||
-            this.currentPipeline.vertexBuffer !== this.currentVertexBuffer)
+            this.currentPipeline.vertexBuffer !== this.currentVertexBuffer ||
+            this.currentPipeline.program !== this.currentProgram)
         {
             this.flush();
             this.currentPipeline = pipelineInstance;
-            this.currentPipeline.bind(overrideProgram);
+            this.currentPipeline.bind();
         }
 
         this.currentPipeline.onBind();

src/renderer/webgl/pipelines/BitmapMaskPipeline.js

@@ -50,9 +50,9 @@ var BitmapMaskPipeline = new Class({
         WebGLPipeline.prototype.onBind.call(this);
 
         var renderer = this.renderer;
-        var program = this.currentProgram;
+        var program = this.program;
 
-        if (this.resolutionDirty || (this.currentProgram !== this.program))
+        if (this.resolutionDirty)
         {
             renderer.setFloat2(program, 'uResolution', this.width, this.height);
             renderer.setInt1(program, 'uMainSampler', 0);

src/renderer/webgl/pipelines/FlatTintPipeline.js

@@ -814,7 +814,48 @@ var FlatTintPipeline = new Class({
                     break;
             }
         }
+    },
+
+    // Stubs
+
+    drawStaticTilemapLayer: function (tilemap, camera)
+    {
+    },
+
+    drawEmitterManager: function (emitterManager, camera)
+    {
+    },
+
+    drawBlitter: function (blitter, camera)
+    {
+    },
+
+    batchSprite: function (sprite, camera)
+    {
+    },
+
+    batchMesh: function (mesh, camera)
+    {
+    },
+
+    batchBitmapText: function (bitmapText, camera)
+    {
+    },
+
+    batchDynamicBitmapText: function (bitmapText, camera)
+    {
+    },
 
+    batchText: function (text, camera)
+    {
+    },
+
+    batchDynamicTilemapLayer: function (tilemapLayer, camera)
+    {
+    },
+
+    batchTileSprite: function (tileSprite, camera)
+    {
     }
 
 });