Formatting updates.

Author: photonstorm

src/pixi/renderers/canvas/CanvasGraphics.js

@@ -54,13 +54,13 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
                 context.lineTo(points[j * 2], points[j * 2 + 1]);
             }
 
-            if(shape.closed)
+            if (shape.closed)
             {
                 context.lineTo(points[0], points[1]);
             }
 
             // if the first and last point are the same close the path - much neater :)
-            if (points[0] === points[points.length - 2] && points[1] === points[points.length - 1])
+            if (points[0] === points[points.length-2] && points[1] === points[points.length-1])
             {
                 context.closePath();
             }
@@ -211,23 +211,21 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
 {
     var len = graphics.graphicsData.length;
 
-    if (len === 0) return;
-
-    if (len > 1)
+    if (len === 0)
     {
-        len = 1;
-        window.console.log('Pixi.js warning: masks in canvas can only mask using the first path in the graphics object');
+        return;
     }
 
-    for (var i = 0; i < 1; i++)
+    context.beginPath();
+
+    for (var i = 0; i < len; i++)
     {
         var data = graphics.graphicsData[i];
         var shape = data.shape;
 
         if (data.type === PIXI.Graphics.POLY)
         {
-            context.beginPath();
-        
+
             var points = shape.points;
 
             context.moveTo(points[0], points[1]);
@@ -238,27 +236,26 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
             }
 
             // if the first and last point are the same close the path - much neater :)
-            if (points[0] === points[points.length - 2] && points[1] === points[points.length - 1])
+            if (points[0] === points[points.length-2] && points[1] === points[points.length-1])
             {
                 context.closePath();
             }
 
         }
         else if (data.type === PIXI.Graphics.RECT)
         {
-            context.beginPath();
             context.rect(shape.x, shape.y, shape.width, shape.height);
             context.closePath();
         }
         else if (data.type === PIXI.Graphics.CIRC)
         {
             // TODO - need to be Undefined!
-            context.beginPath();
-            context.arc(shape.x, shape.y, shape.radius,0,2*Math.PI);
+            context.arc(shape.x, shape.y, shape.radius, 0, 2 * Math.PI);
             context.closePath();
         }
         else if (data.type === PIXI.Graphics.ELIP)
         {
+
             // ellipse code taken from: http://stackoverflow.com/questions/2172798/how-to-draw-an-oval-in-html5-canvas
 
             var w = shape.width * 2;
@@ -267,8 +264,6 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
             var x = shape.x - w/2;
             var y = shape.y - h/2;
 
-            context.beginPath();
-
             var kappa = 0.5522848,
                 ox = (w / 2) * kappa, // control point offset horizontal
                 oy = (h / 2) * kappa, // control point offset vertical
@@ -286,17 +281,16 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
         }
         else if (data.type === PIXI.Graphics.RREC)
         {
-            var pts = shape.points;
-            var rx = pts[0];
-            var ry = pts[1];
-            var width = pts[2];
-            var height = pts[3];
-            var radius = pts[4];
+
+            var rx = shape.x;
+            var ry = shape.y;
+            var width = shape.width;
+            var height = shape.height;
+            var radius = shape.radius;
 
             var maxRadius = Math.min(width, height) / 2 | 0;
             radius = radius > maxRadius ? maxRadius : radius;
 
-            context.beginPath();
             context.moveTo(rx, ry + radius);
             context.lineTo(rx, ry + height - radius);
             context.quadraticCurveTo(rx, ry + height, rx + radius, ry + height);
@@ -313,7 +307,10 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
 
 PIXI.CanvasGraphics.updateGraphicsTint = function(graphics)
 {
-    if (graphics.tint === 0xFFFFFF) return;
+    if (graphics.tint === 0xFFFFFF)
+    {
+        return;
+    }
 
     var tintR = (graphics.tint >> 16 & 0xFF) / 255;
     var tintG = (graphics.tint >> 8 & 0xFF) / 255;