math/box2.h: normalize on construction, minor compilation warning fix
This commit is contained in:
parent
f4ec1e729e
commit
6639c2d8db
|
@ -66,7 +66,9 @@ public:
|
||||||
BOX2( const Vec& aPos, const Vec& aSize ) :
|
BOX2( const Vec& aPos, const Vec& aSize ) :
|
||||||
m_Pos( aPos ),
|
m_Pos( aPos ),
|
||||||
m_Size( aSize )
|
m_Size( aSize )
|
||||||
{ }
|
{
|
||||||
|
Normalize();
|
||||||
|
}
|
||||||
|
|
||||||
void SetMaximum()
|
void SetMaximum()
|
||||||
{
|
{
|
||||||
|
@ -416,10 +418,10 @@ public:
|
||||||
{
|
{
|
||||||
ecoord_type x2 = m_Pos.x + m_Size.x;
|
ecoord_type x2 = m_Pos.x + m_Size.x;
|
||||||
ecoord_type y2 = m_Pos.y + m_Size.y;
|
ecoord_type y2 = m_Pos.y + m_Size.y;
|
||||||
ecoord_type xdiff = std::max( aP.x < m_Pos.x ? m_Pos.x - aP.x : m_Pos.x - x2, 0 );
|
ecoord_type xdiff = std::max(aP.x < m_Pos.x ? m_Pos.x - aP.x : m_Pos.x - x2, (ecoord_type)0);
|
||||||
ecoord_type ydiff = std::max( aP.y < m_Pos.y ? m_Pos.y - aP.y : m_Pos.y - y2, 0 );
|
ecoord_type ydiff = std::max(aP.y < m_Pos.y ? m_Pos.y - aP.y : m_Pos.y - y2, (ecoord_type)0);
|
||||||
return xdiff * xdiff + ydiff * ydiff;
|
return xdiff * xdiff + ydiff * ydiff;
|
||||||
}
|
}
|
||||||
|
|
||||||
ecoord_type Distance( const Vec& aP ) const
|
ecoord_type Distance( const Vec& aP ) const
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue