New batch system working.

Author: photonstorm

build/config.php

@@ -140,13 +140,14 @@
     <script src="$path/src/renderer/webgl/FilterTexture.js"></script>
     <script src="$path/src/renderer/webgl/ShaderManager.js"></script>
     <script src="$path/src/renderer/webgl/StencilManager.js"></script>
+    <script src="$path/src/renderer/webgl/batches/BaseBatch.js"></script>
+    <script src="$path/src/renderer/webgl/batches/ImageBatch.js"></script>
     <script src="$path/src/renderer/webgl/shaders/ComplexPrimitiveGraphics.js"></script>
     <script src="$path/src/renderer/webgl/shaders/PrimitiveGraphics.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/gameobjects/components/Component.js"></script>
     <script src="$path/src/gameobjects/components/Angle.js"></script>
     <script src="$path/src/gameobjects/components/Animation.js"></script>

src/gameobjects/image/ImageWebGLRenderer.js

@@ -24,7 +24,8 @@ Phaser.Renderer.WebGL.GameObjects.Image = {
         var tint = src.color._glTint;
         var bg = src.color._glBg;
 
-        renderer.batch.add(src, verts, uvs, index, alpha, tint, bg);
+        renderer.batch.add(null, frame.source);
+        renderer.batch.imageBatch.add(verts, uvs, index, alpha, tint, bg);
 
         /*
 

src/renderer/webgl/BatchManager.js

@@ -37,6 +37,8 @@ Phaser.Renderer.WebGL.BatchManager.prototype = {
 
     init: function ()
     {
+        console.log('BatchManager.init');
+
         this.gl = this.renderer.gl;
 
         this.imageBatch.init();
@@ -57,29 +59,36 @@ Phaser.Renderer.WebGL.BatchManager.prototype = {
     add: function (batch, source)
     {
         //  Check Batch Size and flush if needed, OR if a different batch then swap
-        //  Also what about blend mode or shader?
-        if (this.currentBatchSize >= this.maxBatchSize)
+        //  Also what about blend mode or shader swaps?
+        if (this.currentBatch.size >= this.currentBatch.maxSize)
         {
-            this.flush();
+            this.currentBatch.flush();
         }
 
-        source.glLastUsed = this.renderer.startTime;
-
-        //  Does this Game Objects texture need updating?
-        if (source.glDirty)
+        if (source)
         {
-            this.renderer.updateTexture(source);
-        }
+            source.glLastUsed = this.renderer.startTime;
 
-        //  Does the batch need to activate a new texture?
-        if (this.renderer.textureArray[source.glTextureIndex] !== source)
-        {
-            this.setCurrentTexture(source);
+            //  Does this TextureSource need updating?
+            if (source.glDirty)
+            {
+                this.renderer.updateTexture(source);
+            }
+
+            //  Does the batch need to activate a new texture?
+            if (this.renderer.textureArray[source.glTextureIndex] !== source)
+            {
+                this.setCurrentTexture(source);
+            }
         }
 
+        //  Swap Batch check
+
+        //  At this point the game object should call 'add' on the batch it needs (ImageBatch, FXBatch, etc)
+
     },
 
-    flush: function ()
+    __flush: function ()
     {
         var gl = this.gl;
 

src/renderer/webgl/WebGLRenderer.js

@@ -474,15 +474,15 @@ Phaser.Renderer.WebGL.prototype = {
 
         // console.log('render');
 
-        this.batch.begin();
+        this.batch.start();
 
         // this.filterManager.begin();
 
         // console.log('render stage');
 
         stage.render(this, stage);
 
-        this.batch.end();
+        this.batch.stop();
 
         // debugger;
 

src/renderer/webgl/batches/BaseBatch.js

@@ -7,11 +7,11 @@
 /**
 *
 *
-* @class Phaser.Renderer.WebGL.Batch.Base
+* @class Phaser.Renderer.WebGL.Batch
 * @constructor
 * @param {Phaser.Renderer.WebGL} renderer - The WebGL Renderer.
 */
-Phaser.Renderer.WebGL.Batch.Base = function (manager, batchSize, vertSize)
+Phaser.Renderer.WebGL.Batch = function (manager, batchSize, vertSize)
 {
     this.batchManager = manager;
 
@@ -21,16 +21,16 @@ Phaser.Renderer.WebGL.Batch.Base = function (manager, batchSize, vertSize)
 
     //  Total number of objects we'll batch before flushing and rendering
     //  Integer
-    this.maxBatchSize = batchSize;
+    this.maxSize = batchSize;
 
     //  Integer
-    this.halfBatchSize = Math.floor(this.maxBatchSize / 2);
+    this.halfSize = Math.floor(this.maxSize / 2);
 
     //  Integer
     this.vertSize = vertSize;
 
     //  * 4 because there are 4 verts per batch entry (each corner of the quad)
-    var numVerts = this.vertSize * this.maxBatchSize * 4;
+    var numVerts = this.vertSize * this.maxSize * 4;
 
     //  ArrayBuffer
     //  This data is what changes every frame, populated by the game objects
@@ -41,10 +41,13 @@ Phaser.Renderer.WebGL.Batch.Base = function (manager, batchSize, vertSize)
     //  6 because there are 2 triangles per quad, and each triangle has 3 indices
     //  This Typed Array is set in the build method of the extended class, and then
     //  doesn't change again (it's populated just once)
-    this.indices = new Uint16Array(this.maxBatchSize * 6);
+    this.indices = new Uint16Array(this.maxSize * 6);
+
+    //  Populated by the flush operation when the batch is < 50% of the max size
+    this.view = null;
 
     //  Integer
-    this.currentBatchSize = 0;
+    this.size = 0;
 
     //  Boolean
     this.dirty = true;
@@ -82,17 +85,23 @@ Phaser.Renderer.WebGL.Batch.Base = function (manager, batchSize, vertSize)
     this._i = 0;
 };
 
-Phaser.Renderer.WebGL.Batch.Base.prototype.constructor = Phaser.Renderer.WebGL.Batch.Base;
+Phaser.Renderer.WebGL.Batch.prototype.constructor = Phaser.Renderer.WebGL.Batch;
 
-Phaser.Renderer.WebGL.Batch.Base.prototype = {
+Phaser.Renderer.WebGL.Batch.prototype = {
 
     start: function ()
     {
         this._i = 0;
 
-        this.currentBatchSize = 0;
+        this.size = 0;
+
+        //  We only need to do this if this batch isn't the current one
 
-        this.bindShader();
+        if (this.dirty)
+        {
+            this.bindShader();
+            this.dirty = false;
+        }
     },
 
     stop: function ()