Renamed GetPointsOnLine as it conflicts with the new GetPoints function.

Author: photonstorm

v3/src/actions/PlaceOnLine.js

@@ -1,4 +1,4 @@
-var GetPointsOnLine = require('../geom/line/GetPointsOnLine');
+var GetPoints = require('../geom/line/GetPoints');
 
 /**
  * [description]
@@ -13,19 +13,15 @@ var GetPointsOnLine = require('../geom/line/GetPointsOnLine');
  */
 var PlaceOnLine = function (items, line)
 {
-    var points = GetPointsOnLine(line);
-    var step = points.length / items.length;
-    var p = 0;
+    var points = GetPoints(line, items.length);
 
     for (var i = 0; i < items.length; i++)
     {
         var item = items[i];
-        var point = points[Math.floor(p)];
+        var point = points[i];
 
-        item.x = point[0];
-        item.y = point[1];
-
-        p += step;
+        item.x = point.x;
+        item.y = point.y;
     }
 
     return items;

v3/src/actions/PlaceOnTriangle.js

@@ -1,4 +1,5 @@
-var GetPointsOnLine = require('../geom/line/GetPointsOnLine');
+// var GetPointsOnLine = require('../geom/line/GetPointsOnLine');
+var BresenhamPoints = require('../geom/line/BresenhamPoints');
 
 /**
  * [description]
@@ -14,9 +15,9 @@ var GetPointsOnLine = require('../geom/line/GetPointsOnLine');
  */
 var PlaceOnTriangle = function (items, triangle, stepRate)
 {
-    var p1 = GetPointsOnLine({ x1: triangle.x1, y1: triangle.y1, x2: triangle.x2, y2: triangle.y2 }, stepRate);
-    var p2 = GetPointsOnLine({ x1: triangle.x2, y1: triangle.y2, x2: triangle.x3, y2: triangle.y3 }, stepRate);
-    var p3 = GetPointsOnLine({ x1: triangle.x3, y1: triangle.y3, x2: triangle.x1, y2: triangle.y1 }, stepRate);
+    var p1 = BresenhamPoints({ x1: triangle.x1, y1: triangle.y1, x2: triangle.x2, y2: triangle.y2 }, stepRate);
+    var p2 = BresenhamPoints({ x1: triangle.x2, y1: triangle.y2, x2: triangle.x3, y2: triangle.y3 }, stepRate);
+    var p3 = BresenhamPoints({ x1: triangle.x3, y1: triangle.y3, x2: triangle.x1, y2: triangle.y1 }, stepRate);
 
     //  Remove overlaps
     p1.pop();

v3/src/geom/line/GetPointsOnLine.js v3/src/geom/line/BresenhamPoints.jsv3/src/geom/line/GetPointsOnLine.js renamed to v3/src/geom/line/BresenhamPoints.js

@@ -2,7 +2,7 @@
  * Using Bresenham's line algorithm this will return an array of all coordinates on this line.
  * The start and end points are rounded before this runs as the algorithm works on integers.
  *
- * @function Phaser.Geom.Line.GetPointsOnLine
+ * @function Phaser.Geom.Line.BresenhamPoints
  * @since 3.0.0
  *
  * @param {Phaser.Geom.Line} line - [description]
@@ -11,7 +11,7 @@
  *
  * @return {array} [description]
  */
-var GetPointsOnLine = function (line, stepRate, results)
+var BresenhamPoints = function (line, stepRate, results)
 {
     if (stepRate === undefined) { stepRate = 1; }
     if (results === undefined) { results = []; }
@@ -58,4 +58,4 @@ var GetPointsOnLine = function (line, stepRate, results)
     return results;
 };
 
-module.exports = GetPointsOnLine;
+module.exports = BresenhamPoints;

v3/src/geom/line/index.js

@@ -3,6 +3,7 @@
 var Line = require('./Line');
 
 Line.Angle = require('./Angle');
+Line.BresenhamPoints = require('./BresenhamPoints');
 Line.CenterOn = require('./CenterOn');
 Line.Clone = require('./Clone');
 Line.CopyFrom = require('./CopyFrom');
@@ -11,7 +12,6 @@ Line.GetMidPoint = require('./GetMidPoint');
 Line.GetNormal = require('./GetNormal');
 Line.GetPoint = require('./GetPoint');
 Line.GetPoints = require('./GetPoints');
-Line.GetPointsOnLine = require('./GetPointsOnLine');
 Line.Height = require('./Height');
 Line.Length = require('./Length');
 Line.NormalAngle = require('./NormalAngle');