Swapped to using the math const and tidied up eslint errors.

Author: photonstorm

v3/src/gameobjects/graphics/Graphics.js

@@ -3,7 +3,7 @@ var GameObject = require('../GameObject');
 var Components = require('../../components');
 var Render = require('./GraphicsRender');
 var Commands = require('./Commands');
-var PI2 = 2 * Math.PI;
+var MATH_CONST = require('../../math/const');
 
 var Graphics = new Class({
 
@@ -20,11 +20,13 @@ var Graphics = new Class({
     function Graphics (state, x, y)
     {
         GameObject.call(this, state);
-        this.commandBuffer = [];
+
         this.setPosition(x, y);
+
+        this.commandBuffer = [];
     },
 
-    arc: function (x, y, radius, startAngle, endAngle, anticlockwise) 
+    arc: function (x, y, radius, startAngle, endAngle, anticlockwise)
     {
         this.commandBuffer.push(
             Commands.ARC,
@@ -42,21 +44,22 @@ var Graphics = new Class({
 
     fillStyle: function (color, alpha)
     {
-        alpha = (alpha !== undefined ? alpha : 1);
+        if (alpha === undefined) { alpha = 1; }
+
         this.commandBuffer.push(
             Commands.FILL_STYLE,
             color, alpha
         );
     },
 
-    beginPath: function () 
+    beginPath: function ()
     {
         this.commandBuffer.push(
             Commands.BEGIN_PATH
         );
     },
 
-    closePath: function () 
+    closePath: function ()
     {
         this.commandBuffer.push(
             Commands.CLOSE_PATH
@@ -77,31 +80,31 @@ var Graphics = new Class({
         );
     },
 
-    fillCircle: function (x, y, radius) 
+    fillCircle: function (x, y, radius)
     {
         this.beginPath();
-        this.arc(x, y, radius, 0, PI2);
+        this.arc(x, y, radius, 0, MATH_CONST.PI2);
         this.fillPath();
         this.closePath();
     },
 
-    fillRect: function (x, y, width, height) 
+    fillRect: function (x, y, width, height)
     {
         this.commandBuffer.push(
             Commands.FILL_RECT,
             x, y, width, height
         );
     },
 
-    strokeCircle: function (x, y, radius) 
+    strokeCircle: function (x, y, radius)
     {
         this.beginPath();
-        this.arc(x, y, radius, 0, PI2);
+        this.arc(x, y, radius, 0, MATH_CONST.PI2);
         this.strokePath();
         this.closePath();
     },
 
-    strokeRect: function (x, y, width, height) 
+    strokeRect: function (x, y, width, height)
     {
         this.beginPath();
         this.moveTo(x, y);
@@ -113,26 +116,27 @@ var Graphics = new Class({
         this.closePath();
     },
 
-    lineTo: function (x, y) 
+    lineTo: function (x, y)
     {
         this.commandBuffer.push(
             Commands.LINE_TO,
             x, y
         );
     },
 
-    moveTo: function (x, y) 
+    moveTo: function (x, y)
     {
         this.commandBuffer.push(
             Commands.MOVE_TO,
             x, y
         );
     },
 
-    clear: function () 
+    clear: function ()
     {
-        commandBuffer.length = 0;
+        this.commandBuffer.length = 0;
     }
+
 });
 
 module.exports = Graphics;

v3/src/gameobjects/graphics/GraphicsCanvasRenderer.js

@@ -1,14 +1,16 @@
 var Commands = require('./Commands');
-var PI2 = 2 * Math.PI;
+var MATH_CONST = require('../../math/const');
+
 var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
     if (this.renderMask !== this.renderFlags)
     {
         return;
     }
+
     var cameraScrollX = camera.scrollX;
     var cameraScrollY = camera.scrollY;
-    var srcX = src.x; 
+    var srcX = src.x;
     var srcY = src.y;
     var srcScaleX = src.scaleX;
     var srcScaleY = src.scaleY;
@@ -56,36 +58,41 @@ var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, c
     {
         var commandID = commandBuffer[index];
 
-        switch(commandID)
+        switch (commandID)
         {
             case Commands.ARC:
                 ctx.arc(
-                    commandBuffer[index + 1], 
-                    commandBuffer[index + 2], 
-                    commandBuffer[index + 3], 
-                    commandBuffer[index + 4], 
-                    commandBuffer[index + 5], 
+                    commandBuffer[index + 1],
+                    commandBuffer[index + 2],
+                    commandBuffer[index + 3],
+                    commandBuffer[index + 4],
+                    commandBuffer[index + 5],
                     commandBuffer[index + 6]
                 );
                 index += 6;
                 break;
+
             case Commands.LINE_STYLE:
                 lineWidth = commandBuffer[index + 1];
-                lineColor = commandBuffer[index + 2]
+                lineColor = commandBuffer[index + 2];
                 lineAlpha = commandBuffer[index + 3];
                 index += 3;
                 break;
+
             case Commands.FILL_STYLE:
                 fillColor = commandBuffer[index + 1];
                 fillAlpha = commandBuffer[index + 2];
                 index += 2;
                 break;
+
             case Commands.BEGIN_PATH:
                 ctx.beginPath();
                 break;
+
             case Commands.CLOSE_PATH:
                 ctx.closePath();
                 break;
+
             case Commands.FILL_PATH:
                 red = ((fillColor & 0xFF0000) >>> 16);
                 green = ((fillColor & 0xFF00) >>> 8);
@@ -94,6 +101,7 @@ var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, c
                 ctx.globalAlpha = fillAlpha;
                 ctx.fill();
                 break;
+
             case Commands.STROKE_PATH:
                 red = ((lineColor & 0xFF0000) >>> 16);
                 green = ((lineColor & 0xFF00) >>> 8);
@@ -103,6 +111,7 @@ var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, c
                 ctx.lineWidth = lineWidth;
                 ctx.stroke();
                 break;
+
             case Commands.FILL_RECT:
                 ctx.fillRect(
                     commandBuffer[index + 1],
@@ -119,6 +128,7 @@ var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, c
                 );
                 index += 2;
                 break;
+
             case Commands.MOVE_TO:
                 ctx.moveTo(
                     commandBuffer[index + 1],
@@ -134,7 +144,6 @@ var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, c
     }
 
     ctx.restore();
-    ctx.globalAlpha = 1.0;
-}
+};
 
 module.exports = GraphicsCanvasRenderer;