Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix a comment and rename the formation angle function to better reflect what it does

Browse Source 
wrong comment noticed by: @Silier
accepted by : @Freagarach

Differential revision: https://code.wildfiregames.com/D4658
This was SVN commit r26893.
This commit is contained in:
marder 2022-05-20 07:02:22 +00:00
parent 9a3ae16087
commit efc2d39372
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/simulation/components/Formation.js
View File

@ -523,7 +523,7 @@ Formation.prototype.MoveMembersIntoFormation = function(moveCenter, force, varia
// When we are out of world or the angle difference is big, trigger repositioning.
// Do this before setting up the position, because then we will always be in world.
if (!cmpPosition.IsInWorld() || !this.AreAnglesSimilar(newRotation, oldRotation))
if (!cmpPosition.IsInWorld() || !this.DoesAngleDifferenceAllowTurning(newRotation, oldRotation))
this.offsets = undefined;
this.SetupPositionAndHandleRotation(avgpos.x, avgpos.y, newRotation, true);
@ -885,12 +885,12 @@ Formation.prototype.GetRealOffsetPositions = function(offsets)
};
/**
* Returns true if the two given angles (in radians)
* Returns true if the difference between two given angles (in radians)
* are smaller than the maximum turning angle of the formation and therfore allow
* the formation turn without reassigning positions.
*/
Formation.prototype.AreAnglesSimilar = function(a1, a2)
Formation.prototype.DoesAngleDifferenceAllowTurning = function(a1, a2)
{
const d = Math.abs(a1 - a2) % (2 * Math.PI);
return d < this.maxTurningAngle || d > 2 * Math.PI - this.maxTurningAngle;

8
binaries/data/mods/public/simulation/components/tests/test_Formation.js
View File

@ -31,10 +31,10 @@ const testingAngles = [];
for (let i = 0; i < 179; i++)
testingAngles.push(i * Math.PI / 180);
TS_ASSERT(testingAngles.every(x => !cmpFormation.AreAnglesSimilar(0, x)));
TS_ASSERT(testingAngles.every(x => !cmpFormation.AreAnglesSimilar(0, -x)));
TS_ASSERT(testingAngles.every(x => !cmpFormation.DoesAngleDifferenceAllowTurning(0, x)));
TS_ASSERT(testingAngles.every(x => !cmpFormation.DoesAngleDifferenceAllowTurning(0, -x)));
cmpFormation.maxTurningAngle = Math.PI;
TS_ASSERT(testingAngles.every(x => cmpFormation.AreAnglesSimilar(0, x)));
TS_ASSERT(testingAngles.every(x => cmpFormation.AreAnglesSimilar(0, -x)));
TS_ASSERT(testingAngles.every(x => cmpFormation.DoesAngleDifferenceAllowTurning(0, x)));
TS_ASSERT(testingAngles.every(x => cmpFormation.DoesAngleDifferenceAllowTurning(0, -x)));