haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GetVectorSnapped45 on distances > 1 m.

This commit is contained in:
Alex 2022-12-08 03:58:36 +03:00
parent 36ee9f72e2
commit 1f1feb51d7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/kimath/include/geometry/geometry_utils.h
View File

@ -105,23 +105,24 @@ template<typename T>
VECTOR2<T> GetVectorSnapped45( const VECTOR2<T>& aVec, bool only45 = false )
{
auto newVec = aVec;
const VECTOR2<T> absVec { std::abs( aVec.x ), std::abs( aVec.y ) };
const VECTOR2<T> absVec{ std::abs( aVec.x ), std::abs( aVec.y ) };
if ( !only45 && absVec.x > absVec.y * 2 )
if( !only45 && absVec.x > VECTOR2<T>::extended_type( absVec.y ) * 2 )
{
// snap along x-axis
newVec.y = 0;
}
else if ( !only45 && absVec.y > absVec.x * 2 )
else if( !only45 && absVec.y > VECTOR2<T>::extended_type( absVec.x ) * 2 )
{
// snap onto y-axis
newVec.x = 0;
}
else if ( absVec.x > absVec.y )
else if( absVec.x > absVec.y )
{
// snap away from x-axis towards 45
newVec.y = std::copysign( aVec.x, aVec.y );
} else
}
else
{
// snap away from y-axis towards 45
newVec.x = std::copysign( aVec.y, aVec.x );