Update SpriteBatch to work properly with Transform

Author: bitnenfer

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '8e926790-de9d-11e6-bab6-b1cd883c1600'
+build: '791c9de0-df38-11e6-a5ba-6db6a9dcaab8'
 };
 module.exports = CHECKSUM;

v3/src/components/Transform.js

@@ -551,20 +551,20 @@ Transform.prototype = {
         var vert = this.glVertextData;
 
         //  Top Left Vert
-        vert.x0 = (a * w1) + (c * h1) + tx;
-        vert.y0 = (d * h1) + (b * w1) + ty;
+        // vert.x0 = (a * w1) + (c * h1) + tx;
+        // vert.y0 = (d * h1) + (b * w1) + ty;
 
         //  Top Right Vert
-        vert.x1 = (a * w0) + (c * h1) + tx;
-        vert.y1 = (d * h1) + (b * w0) + ty;
+        // vert.x1 = (a * w0) + (c * h1) + tx;
+        // vert.y1 = (d * h1) + (b * w0) + ty;
 
         //  Bottom Right Vert
-        vert.x2 = (a * w0) + (c * h0) + tx;
-        vert.y2 = (d * h0) + (b * w0) + ty;
+        // vert.x2 = (a * w0) + (c * h0) + tx;
+        // vert.y2 = (d * h0) + (b * w0) + ty;
 
         //  Bottom Left Vert
-        vert.x3 = (a * w1) + (c * h0) + tx;
-        vert.y3 = (d * h0) + (b * w1) + ty;
+        // vert.x3 = (a * w1) + (c * h0) + tx;
+        // vert.y3 = (d * h0) + (b * w1) + ty;
 
         return vert;
     },

v3/src/gameobjects/image/ImageWebGLRenderer.js

@@ -20,9 +20,8 @@ var ImageWebGLRenderer = function (renderer, src, interpolationPercentage)
     var transform = src.transform;
 
     renderer.spriteBatch.add(
-        0, 0,
-        frame.cutWidth, frame.cutHeight,
-        0, 0, 1, 1,
+        frame,
+        transform._pivotX, transform._pivotY,
         transform.world.tx, transform.world.ty,
         transform._worldScaleX, transform._worldScaleY,
         transform._worldRotation

v3/src/renderer/webgl/batches/sprite/SpriteBatch.js

@@ -132,7 +132,7 @@ SpriteBatch.prototype = {
         return (this.vertexDataBuffer.getByteLength() >= this.vertexDataBuffer.getByteCapacity());
     },
 
-    add: function (x, y, width, height, umin, vmin, umax, vmax, translateX, translateY, scaleX, scaleY, rotation)
+    add: function (frame, pivotX, pivotY, translateX, translateY, scaleX, scaleY, rotation)
     {
         this.manager.setBatch(this);
 
@@ -141,11 +141,16 @@ SpriteBatch.prototype = {
         var vertexDataBuffer = this.vertexDataBuffer;
         var vertexBuffer = vertexDataBuffer.floatView;
         var vertexOffset = vertexDataBuffer.allocate(CONST.SPRITE_VERTEX_COMPONENT_COUNT * CONST.SPRITE_VERTEX_COUNT);
+        var uvs = frame.uvs;
+        var x = -pivotX;
+        var y = -pivotY;
+        var width = frame.width;
+        var height = frame.height;
 
         vertexBuffer[vertexOffset++] = x;
         vertexBuffer[vertexOffset++] = y;
-        vertexBuffer[vertexOffset++] = umin;
-        vertexBuffer[vertexOffset++] = vmin;
+        vertexBuffer[vertexOffset++] = uvs.x0;
+        vertexBuffer[vertexOffset++] = uvs.y0;
         vertexBuffer[vertexOffset++] = translateX;
         vertexBuffer[vertexOffset++] = translateY;
         vertexBuffer[vertexOffset++] = scaleX;
@@ -154,8 +159,8 @@ SpriteBatch.prototype = {
 
         vertexBuffer[vertexOffset++] = x;
         vertexBuffer[vertexOffset++] = y + height;
-        vertexBuffer[vertexOffset++] = umin;
-        vertexBuffer[vertexOffset++] = vmax;
+        vertexBuffer[vertexOffset++] = uvs.x1;
+        vertexBuffer[vertexOffset++] = uvs.y1;
         vertexBuffer[vertexOffset++] = translateX;
         vertexBuffer[vertexOffset++] = translateY;
         vertexBuffer[vertexOffset++] = scaleX;
@@ -164,8 +169,8 @@ SpriteBatch.prototype = {
 
         vertexBuffer[vertexOffset++] = x + width;
         vertexBuffer[vertexOffset++] = y + height;
-        vertexBuffer[vertexOffset++] = umax;
-        vertexBuffer[vertexOffset++] = vmax;
+        vertexBuffer[vertexOffset++] = uvs.x2;
+        vertexBuffer[vertexOffset++] = uvs.y2;
         vertexBuffer[vertexOffset++] = translateX;
         vertexBuffer[vertexOffset++] = translateY;
         vertexBuffer[vertexOffset++] = scaleX;
@@ -174,8 +179,8 @@ SpriteBatch.prototype = {
 
         vertexBuffer[vertexOffset++] = x + width;
         vertexBuffer[vertexOffset++] = y;
-        vertexBuffer[vertexOffset++] = umax;
-        vertexBuffer[vertexOffset++] = vmin;
+        vertexBuffer[vertexOffset++] = uvs.x3;
+        vertexBuffer[vertexOffset++] = uvs.y3;
         vertexBuffer[vertexOffset++] = translateX;
         vertexBuffer[vertexOffset++] = translateY;
         vertexBuffer[vertexOffset++] = scaleX;

v3/src/textures/Frame.js

@@ -221,14 +221,14 @@ Frame.prototype = {
         uvs.x0 = this.cutX / tw;
         uvs.y0 = this.cutY / th;
 
-        uvs.x1 = (this.cutX + this.cutWidth) / tw;
-        uvs.y1 = this.cutY / th;
+        uvs.x1 = this.cutX / tw;
+        uvs.y1 = (this.cutY + this.cutHeight) / th;
 
         uvs.x2 = (this.cutX + this.cutWidth) / tw;
         uvs.y2 = (this.cutY + this.cutHeight) / th;
 
-        uvs.x3 = this.cutX / tw;
-        uvs.y3 = (this.cutY + this.cutHeight) / th;
+        uvs.x3 = (this.cutX + this.cutWidth) / tw;
+        uvs.y3 = this.cutY / th;
 
         return this;
     },