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

Added [Box|Rect]::Get[Maximum|Minimum]() 

Former-commit-id: 5226f2dfd2beaec2bc9075543f555cc48a457e3a
This commit is contained in:
Lynix 2013-06-09 15:41:57 +02:00
parent c940abdb75
commit bb31a1666f
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Box.hpp
View File

@ -41,6 +41,8 @@ class NzBox
NzVector3<T> GetCorner(nzCorner corner) const;
NzVector3<T> GetCenter() const;
NzVector3<T> GetLengths() const;
NzVector3<T> GetMaximum() const;
NzVector3<T> GetMinimum() const;
NzVector3<T> GetNegativeVertex(const NzVector3<T>& normal) const;
NzVector3<T> GetPosition() const;
NzVector3<T> GetPositiveVertex(const NzVector3<T>& normal) const;

13
include/Nazara/Math/Box.inl
View File

@ -168,6 +168,19 @@ NzVector3<T> NzBox<T>::GetLengths() const
return NzVector3<T>(width, height, depth);
}
template<typename T>
NzVector3<T> NzBox<T>::GetMaximum() const
{
return GetPosition() + GetLengths();
}
template<typename T>
NzVector3<T> NzBox<T>::GetMinimum() const
{
///DOC: Alias de GetPosition()
return GetPosition();
}
template<typename T>
NzVector3<T> NzBox<T>::GetNegativeVertex(const NzVector3<T>& normal) const
{

2
include/Nazara/Math/Rect.hpp
View File

@ -34,6 +34,8 @@ class NzRect
NzVector2<T> GetCenter() const;
NzVector2<T> GetLengths() const;
NzVector2<T> GetMaximum() const;
NzVector2<T> GetMinimum() const;
NzVector2<T> GetNegativeVertex(const NzVector2<T>& normal) const;
NzVector2<T> GetPosition() const;
NzVector2<T> GetPositiveVertex(const NzVector2<T>& normal) const;

13
include/Nazara/Math/Rect.inl
View File

@ -115,6 +115,19 @@ NzVector2<T> NzRect<T>::GetLengths() const
return NzVector2<T>(width, height);
}
template<typename T>
NzVector2<T> NzRect<T>::GetMaximum() const
{
return GetPosition() + GetLengths();
}
template<typename T>
NzVector2<T> NzRect<T>::GetMinimum() const
{
///DOC: Alias de GetPosition()
return GetPosition();
}
template<typename T>
NzVector2<T> NzRect<T>::GetNegativeVertex(const NzVector2<T>& normal) const
{

4
src/Nazara/Renderer/DebugDrawer.cpp
View File

@ -63,8 +63,8 @@ void NzDebugDrawer::Draw(const NzBoxf& box)
NzVertexStruct_XYZ* vertex = reinterpret_cast<NzVertexStruct_XYZ*>(mapper.GetPointer());
NzVector3f max, min;
max = box.GetPosition() + box.GetLengths();
min = box.GetPosition();
max = box.GetMaximum();
min = box.GetMinimum();
vertex->position.Set(min.x, min.y, min.z);
vertex++;