eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 10:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix equal operator

Browse Source
This commit is contained in:
Bruno Herbelin
2022-05-01 22:25:20 +02:00
parent 80469ead18
commit 2140075133
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
GlmToolkit.cpp
View File

@@ -81,11 +81,6 @@ GlmToolkit::AxisAlignedBoundingBox::AxisAlignedBoundingBox(const GlmToolkit::Axi
{
}
void GlmToolkit::AxisAlignedBoundingBox::operator = (const GlmToolkit::AxisAlignedBoundingBox &D ) {
mMin = D.mMin;
mMax = D.mMax;
}
void GlmToolkit::AxisAlignedBoundingBox::extend(const glm::vec3& point)
{
if (isNull()) {
@@ -252,6 +247,16 @@ bool GlmToolkit::operator< (const GlmToolkit::AxisAlignedBoundingBox& A, const G
return ( glm::length2(A.mMax-A.mMin) < glm::length2(B.mMax-B.mMin) );
}
GlmToolkit::AxisAlignedBoundingBox& GlmToolkit::AxisAlignedBoundingBox::operator = (const GlmToolkit::AxisAlignedBoundingBox &D )
{
if (this != &D) {
this->mMin = D.mMin;
this->mMax = D.mMax;
}
return *this;
}
glm::ivec2 GlmToolkit::resolutionFromDescription(int aspectratio, int height)
{
int ar = glm::clamp(aspectratio, 0, 5);

2
GlmToolkit.h
View File

@@ -16,7 +16,7 @@ class AxisAlignedBoundingBox
public:
AxisAlignedBoundingBox();
AxisAlignedBoundingBox(const AxisAlignedBoundingBox &D);
void operator = (const AxisAlignedBoundingBox &D );
AxisAlignedBoundingBox& operator = (const AxisAlignedBoundingBox &D );
// test
inline bool isNull() const { return mMin.x > mMax.x || mMin.y > mMax.y || mMin.z > mMax.z;}