Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix aabox operator+=

Browse source
This commit is contained in:
SamGondelman 2018-09-04 16:25:47 -07:00
parent ade58a52cc
commit 9e76c164ac
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/shared/src/AABox.h
View file

@ -86,19 +86,12 @@ public:
AABox clamp(float min, float max) const; AABox clamp(float min, float max) const;
inline AABox& operator+=(const glm::vec3& point) { inline AABox& operator+=(const glm::vec3& point) {
// Branchless version of: bool valid = !isInvalid();
//if (isInvalid()) { glm::vec3 maximum = glm::max(_corner + _scale, point);
// _corner = glm::min(_corner, point);
//} else {
// glm::vec3 maximum(_corner + _scale);
// _corner = glm::min(_corner, point);
// maximum = glm::max(maximum, point);
// _scale = maximum - _corner;
//}
float blend = (float)isInvalid();
glm::vec3 maximumScale(glm::max(_scale, point - _corner));
_corner = glm::min(_corner, point); _corner = glm::min(_corner, point);
_scale = blend * _scale + (1.0f - blend) * maximumScale; if (valid) {
_scale = maximum - _corner;
}
return (*this); return (*this);
} }
@ -136,7 +129,7 @@ public:
static const glm::vec3 INFINITY_VECTOR; static const glm::vec3 INFINITY_VECTOR;
bool isInvalid() const { return _corner == INFINITY_VECTOR; } bool isInvalid() const { return _corner.x == std::numeric_limits<float>::infinity(); }
void clear() { _corner = INFINITY_VECTOR; _scale = glm::vec3(0.0f); } void clear() { _corner = INFINITY_VECTOR; _scale = glm::vec3(0.0f); }