sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved AxisAlignedBox::GetCorner to Cube

Browse Source 
Former-commit-id: 59509594e6cda19089b93efd8dc77ab7bd20250c
This commit is contained in:
Lynix
2013-02-17 00:51:16 +01:00
parent f14a68fc04
commit 60d41f3c4b
5 changed files with 75 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Nazara/Utility/AxisAlignedBox.cpp
View File

@@ -84,6 +84,8 @@ void NzAxisAlignedBox::ExtendTo(const NzAxisAlignedBox& box)
operator=(box);
break;
}
NazaraError("Extend type not handled (0x" + NzString::Number(m_extend, 16) + ')');
}
void NzAxisAlignedBox::ExtendTo(const NzVector3f& vector)
@@ -103,38 +105,28 @@ void NzAxisAlignedBox::ExtendTo(const NzVector3f& vector)
m_cube.Set(vector, vector);
break;
}
NazaraError("Extend type not handled (0x" + NzString::Number(m_extend, 16) + ')');
}
NzVector3f NzAxisAlignedBox::GetCorner(nzCorner corner) const
{
switch (corner)
switch (m_extend)
{
case nzCorner_FarLeftBottom:
return NzVector3f(m_cube.x, m_cube.y, m_cube.z);
case nzExtend_Finite:
return m_cube.GetCorner(corner);
case nzCorner_FarLeftTop:
return NzVector3f(m_cube.x, m_cube.y+m_cube.height, m_cube.z);
case nzExtend_Infinite:
// Il est possible de renvoyer un vecteur avec des flottants infinis dont le signe dépend du coin
// Bien que ça soit plus juste mathématiquement, je ne vois pas l'intérêt...
NazaraError("Infinite AABB has no corner");
return NzVector3f();
case nzCorner_FarRightBottom:
return NzVector3f(m_cube.x+m_cube.width, m_cube.y, m_cube.z);
case nzCorner_FarRightTop:
return NzVector3f(m_cube.x+m_cube.width, m_cube.y+m_cube.height, m_cube.z);
case nzCorner_NearLeftBottom:
return NzVector3f(m_cube.x, m_cube.y, m_cube.z+m_cube.depth);
case nzCorner_NearLeftTop:
return NzVector3f(m_cube.x, m_cube.y+m_cube.height, m_cube.z+m_cube.depth);
case nzCorner_NearRightBottom:
return NzVector3f(m_cube.x+m_cube.width, m_cube.y, m_cube.z+m_cube.depth);
case nzCorner_NearRightTop:
return NzVector3f(m_cube.x+m_cube.width, m_cube.y+m_cube.height, m_cube.z+m_cube.depth);
case nzExtend_Null:
return NzVector3f::Zero();
}
NazaraError("Corner not handled (0x" + NzString::Number(corner, 16) + ')');
NazaraError("Extend type not handled (0x" + NzString::Number(m_extend, 16) + ')');
return NzVector3f();
}