Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove excess argument from shift call

Browse Source 
Fixes #5345

Author: FeXoR
Reviewed by: elexis, smiley
Differential Revision: https://code.wildfiregames.com/D1675
This was SVN commit r22028.
This commit is contained in:
FeXoR 2019-01-05 16:54:37 +00:00
parent af39d45973
commit f21d79640c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binaries/data/mods/public/maps/random/rmgen/math.js
View File

@ -118,7 +118,9 @@ function getPointsInBoundingBox(boundingBox)
}
/**
* Sorts the given (x, y) points so that the distance between neighboring points becomes minimal (similar to the traveling salesman problem).
* Get the order of the given points to get the shortest closed path (similar to the traveling salesman problem).
* @param {Vectro2D[]} points - Points the path should go through
* @returns {number[]} Ordered indices, same length as points
*/
function sortPointsShortestCycle(points)
{
@ -137,9 +139,9 @@ function sortPointsShortestCycle(points)
for (let i = 0; i < 3; ++i)
{
order.push(i);
pointsToAdd.shift(i);
pointsToAdd.shift();
if (i)
distances.push(Math.euclidDistance2D(points[order[i]].x, points[order[i]].y, points[order[i - 1]].x, points[order[i - 1]].y));
distances.push(points[order[i]].distanceTo(points[order[i - 1]]));
}
distances.push(points[order[0]].distanceTo(points[order[order.length - 1]]));