From 954978454b1b926b09ead39a61921ddb2679a2bb Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 16 Apr 2016 11:49:09 -1000 Subject: [PATCH] Add CAABox::skNullBox --- include/zeus/CAABox.hpp | 1 + src/CAABox.cpp | 10 +++++++++- src/CQuaternion.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/zeus/CAABox.hpp b/include/zeus/CAABox.hpp index c2359d8..731f62e 100644 --- a/include/zeus/CAABox.hpp +++ b/include/zeus/CAABox.hpp @@ -40,6 +40,7 @@ public: }; static const CAABox skInvertedBox; + static const CAABox skNullBox; CVector3f m_min; CVector3f m_max; diff --git a/src/CAABox.cpp b/src/CAABox.cpp index 025cffd..466ff0f 100644 --- a/src/CAABox.cpp +++ b/src/CAABox.cpp @@ -1,2 +1,10 @@ #include "zeus/CAABox.hpp" -const zeus::CAABox zeus::CAABox::skInvertedBox = CAABox(); +#include "zeus/CVector3f.hpp" + +namespace zeus +{ + +const CAABox CAABox::skInvertedBox = CAABox(); +const CAABox CAABox::skNullBox = CAABox(CVector3f::skZero, CVector3f::skZero); + +} diff --git a/src/CQuaternion.cpp b/src/CQuaternion.cpp index 6c9635c..2b70e5a 100644 --- a/src/CQuaternion.cpp +++ b/src/CQuaternion.cpp @@ -3,7 +3,7 @@ namespace zeus { -CQuaternion const CQuaternion::skNoRotation; +const CQuaternion CQuaternion::skNoRotation; void CQuaternion::fromVector3f(const CVector3f& vec) {