diff options
Diffstat (limited to 'src/BoundingBox.cpp')
| -rw-r--r-- | src/BoundingBox.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp index ecf810fa8..3e32fd3ef 100644 --- a/src/BoundingBox.cpp +++ b/src/BoundingBox.cpp @@ -60,6 +60,17 @@ cBoundingBox::cBoundingBox(const cBoundingBox & a_Orig) : +cBoundingBox & cBoundingBox::operator=(const cBoundingBox & a_Other) +{ + m_Min = a_Other.m_Min; + m_Max = a_Other.m_Max; + return *this; +} + + + + + void cBoundingBox::Move(double a_OffX, double a_OffY, double a_OffZ) { m_Min.x += a_OffX; @@ -119,10 +130,10 @@ cBoundingBox cBoundingBox::Union(const cBoundingBox & a_Other) { return cBoundingBox( std::min(m_Min.x, a_Other.m_Min.x), - std::min(m_Min.y, a_Other.m_Min.y), - std::min(m_Min.z, a_Other.m_Min.z), std::max(m_Max.x, a_Other.m_Max.x), + std::min(m_Min.y, a_Other.m_Min.y), std::max(m_Max.y, a_Other.m_Max.y), + std::min(m_Min.z, a_Other.m_Min.z), std::max(m_Max.z, a_Other.m_Max.z) ); } |