From 9199e60436ed4d846ab77497fd1899be88f1edfe Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 2 Nov 2012 21:50:33 +0100 Subject: [PATCH] Added implicit conversion from AABB to String Former-commit-id: c41510f4e0527a174d4acb5f8f26f60f4984ce15 --- include/Nazara/Utility/AxisAlignedBox.hpp | 2 ++ src/Nazara/Utility/AxisAlignedBox.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/Nazara/Utility/AxisAlignedBox.hpp b/include/Nazara/Utility/AxisAlignedBox.hpp index 1f0a123be..c52573a29 100644 --- a/include/Nazara/Utility/AxisAlignedBox.hpp +++ b/include/Nazara/Utility/AxisAlignedBox.hpp @@ -38,6 +38,8 @@ class NAZARA_API NzAxisAlignedBox NzString ToString() const; + operator NzString() const; + static NzAxisAlignedBox Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation); static const NzAxisAlignedBox Infinite; diff --git a/src/Nazara/Utility/AxisAlignedBox.cpp b/src/Nazara/Utility/AxisAlignedBox.cpp index 75b23468a..a481fb703 100644 --- a/src/Nazara/Utility/AxisAlignedBox.cpp +++ b/src/Nazara/Utility/AxisAlignedBox.cpp @@ -155,6 +155,11 @@ NzString NzAxisAlignedBox::ToString() const return "NzAxisAlignedBox(ERROR)"; } +NzAxisAlignedBox::operator NzString() const +{ + return ToString(); +} + NzAxisAlignedBox NzAxisAlignedBox::Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation) { #ifdef NAZARA_DEBUG