Fixed all of the Shape WebGL rendering issues

Author: photonstorm

src/gameobjects/shape/FillPathWebGL.js

@@ -49,9 +49,7 @@ var FillPathWebGL = function (pipeline, calcMatrix, src, alpha, dx, dy)
         var tx2 = calcMatrix.getX(x2, y2);
         var ty2 = calcMatrix.getY(x2, y2);
 
-        pipeline.setTexture2D();
-
-        pipeline.batchTri(tx0, ty0, tx1, ty1, tx2, ty2, 0, 0, 1, 1, fillTintColor, fillTintColor, fillTintColor, pipeline.tintEffect);
+        pipeline.batchTri(tx0, ty0, tx1, ty1, tx2, ty2, fillTintColor, fillTintColor, fillTintColor);
     }
 };
 

src/gameobjects/shape/StrokePathWebGL.js

@@ -47,8 +47,6 @@ var StrokePathWebGL = function (pipeline, src, alpha, dx, dy)
         var px2 = path[i] - dx;
         var py2 = path[i + 1] - dy;
 
-        pipeline.setTexture2D();
-
         pipeline.batchLine(
             px1,
             py1,

src/gameobjects/shape/arc/ArcWebGLRenderer.js

@@ -28,7 +28,7 @@ var ArcWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix1.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var dx = src._displayOriginX;
     var dy = src._displayOriginY;

src/gameobjects/shape/curve/CurveWebGLRenderer.js

@@ -28,7 +28,7 @@ var CurveWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var dx = src._displayOriginX + src._curveBounds.x;
     var dy = src._displayOriginY + src._curveBounds.y;

src/gameobjects/shape/ellipse/EllipseWebGLRenderer.js

@@ -28,7 +28,7 @@ var EllipseWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var dx = src._displayOriginX;
     var dy = src._displayOriginY;

src/gameobjects/shape/grid/GridWebGLRenderer.js

@@ -27,7 +27,7 @@ var GridWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     calcMatrix.translate(-src._displayOriginX, -src._displayOriginY);
 
@@ -63,8 +63,6 @@ var GridWebGLRenderer = function (renderer, src, camera, parentMatrix)
     var cw = 0;
     var ch = 0;
 
-    pipeline.setTexture2D();
-
     if (showOutline)
     {
         //  To make room for the grid lines (in case alpha < 1)

src/gameobjects/shape/isobox/IsoBoxWebGLRenderer.js

@@ -27,7 +27,7 @@ var IsoBoxWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var size = src.width;
     var height = src.height;
@@ -56,8 +56,6 @@ var IsoBoxWebGLRenderer = function (renderer, src, camera, parentMatrix)
     var x3;
     var y3;
 
-    pipeline.setTexture2D();
-
     //  Top Face
 
     if (src.showTop)
@@ -76,7 +74,7 @@ var IsoBoxWebGLRenderer = function (renderer, src, camera, parentMatrix)
         x3 = calcMatrix.getX(0, sizeB - height);
         y3 = calcMatrix.getY(0, sizeB - height);
 
-        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, 0, 0, 1, 1, tint, tint, tint, tint, 1);
+        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, tint, tint, tint, tint);
     }
 
     //  Left Face
@@ -97,7 +95,7 @@ var IsoBoxWebGLRenderer = function (renderer, src, camera, parentMatrix)
         x3 = calcMatrix.getX(-sizeA, -height);
         y3 = calcMatrix.getY(-sizeA, -height);
 
-        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, 0, 0, 1, 1, tint, tint, tint, tint, 1);
+        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, tint, tint, tint, tint);
     }
 
     //  Right Face
@@ -118,7 +116,7 @@ var IsoBoxWebGLRenderer = function (renderer, src, camera, parentMatrix)
         x3 = calcMatrix.getX(sizeA, -height);
         y3 = calcMatrix.getY(sizeA, -height);
 
-        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, 0, 0, 1, 1, tint, tint, tint, tint, 1);
+        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, tint, tint, tint, tint);
     }
 };
 

src/gameobjects/shape/isotriangle/IsoTriangleWebGLRenderer.js

@@ -27,7 +27,7 @@ var IsoTriangleWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var size = src.width;
     var height = src.height;
@@ -55,8 +55,6 @@ var IsoTriangleWebGLRenderer = function (renderer, src, camera, parentMatrix)
     var x2;
     var y2;
 
-    pipeline.setTexture2D();
-
     //  Top Face
 
     if (src.showTop && reversed)
@@ -75,7 +73,7 @@ var IsoTriangleWebGLRenderer = function (renderer, src, camera, parentMatrix)
         var x3 = calcMatrix.getX(0, sizeB - height);
         var y3 = calcMatrix.getY(0, sizeB - height);
 
-        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, 0, 0, 1, 1, tint, tint, tint, tint, 1);
+        pipeline.batchQuad(x0, y0, x1, y1, x2, y2, x3, y3, tint, tint, tint, tint);
     }
 
     //  Left Face
@@ -107,7 +105,7 @@ var IsoTriangleWebGLRenderer = function (renderer, src, camera, parentMatrix)
             y2 = calcMatrix.getY(0, sizeB - height);
         }
 
-        pipeline.batchTri(x0, y0, x1, y1, x2, y2, 0, 0, 1, 1, tint, tint, tint, 1);
+        pipeline.batchTri(x0, y0, x1, y1, x2, y2, tint, tint, tint);
     }
 
     //  Right Face
@@ -139,7 +137,7 @@ var IsoTriangleWebGLRenderer = function (renderer, src, camera, parentMatrix)
             y2 = calcMatrix.getY(0, sizeB - height);
         }
 
-        pipeline.batchTri(x0, y0, x1, y1, x2, y2, 0, 0, 1, 1, tint, tint, tint, 1);
+        pipeline.batchTri(x0, y0, x1, y1, x2, y2, tint, tint, tint);
     }
 };
 

src/gameobjects/shape/line/LineWebGLRenderer.js

@@ -27,7 +27,7 @@ var LineWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    renderer._tempMatrix3.copyFrom(result.calc);
+    pipeline.calcMatrix.copyFrom(result.calc);
 
     var dx = src._displayOriginX;
     var dy = src._displayOriginY;
@@ -46,8 +46,6 @@ var LineWebGLRenderer = function (renderer, src, camera, parentMatrix)
         var startWidth = src._startWidth;
         var endWidth = src._endWidth;
 
-        pipeline.setTexture2D();
-
         pipeline.batchLine(
             src.geom.x1 - dx,
             src.geom.y1 - dy,

src/gameobjects/shape/polygon/PolygonWebGLRenderer.js

@@ -28,7 +28,7 @@ var PolygonWebGLRenderer = function (renderer, src, camera, parentMatrix)
 
     var result = GetCalcMatrix(src, camera, parentMatrix);
 
-    var calcMatrix = renderer._tempMatrix3.copyFrom(result.calc);
+    var calcMatrix = pipeline.calcMatrix.copyFrom(result.calc);
 
     var dx = src._displayOriginX;
     var dy = src._displayOriginY;