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

fix switch between square or circle approximation in UnitMotion, refs #3539

Browse Source 
This was SVN commit r17145.
This commit is contained in:
mimo 2015-10-26 22:59:26 +00:00
parent f4cb822d9d
commit e0771b98dd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/simulation2/components/CCmpUnitMotion.cpp
View File

@ -1507,11 +1507,15 @@ bool CCmpUnitMotion::ShouldTreatTargetAsCircle(entity_pos_t range, entity_pos_t
// is a round-cornered square which we can approximate as either a circle or as a square.
// Choose the shape that will minimise the worst-case error:
// For a square, error is (sqrt(2)-1) * range at the corners
entity_pos_t errSquare = (entity_pos_t::FromInt(4142)/10000).Multiply(range);
entity_pos_t rSquare = std::min(hw, hh);
if (range < rSquare)
return false;
// For a square, error is (sqrt(2)-1) * (range-rSquare) at the corners
entity_pos_t errSquare = (entity_pos_t::FromInt(4142)/10000).Multiply(range-rSquare);
// For a circle, error is radius-hw at the sides and radius-hh at the top/bottom
entity_pos_t errCircle = circleRadius - std::min(hw, hh);
entity_pos_t errCircle = circleRadius - rSquare;
return (errCircle < errSquare);
}