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

Added implicit conversion from AABB to String 

Former-commit-id: c41510f4e0527a174d4acb5f8f26f60f4984ce15
This commit is contained in:
Lynix 2012-11-02 21:50:33 +01:00
parent 1b3129868f
commit 9199e60436
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/AxisAlignedBox.hpp
View File

@ -38,6 +38,8 @@ class NAZARA_API NzAxisAlignedBox
NzString ToString() const; NzString ToString() const;
operator NzString() const;
static NzAxisAlignedBox Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation); static NzAxisAlignedBox Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation);
static const NzAxisAlignedBox Infinite; static const NzAxisAlignedBox Infinite;

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

@ -155,6 +155,11 @@ NzString NzAxisAlignedBox::ToString() const
return "NzAxisAlignedBox(ERROR)"; return "NzAxisAlignedBox(ERROR)";
} }
NzAxisAlignedBox::operator NzString() const
{
return ToString();
}
NzAxisAlignedBox NzAxisAlignedBox::Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation) NzAxisAlignedBox NzAxisAlignedBox::Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation)
{ {
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG