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

try again on AACube::operator +=

Browse source
This commit is contained in:
Seth Alves 2015-12-21 11:34:53 -08:00
parent 00e0b26f05
commit 68cfda1af9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/shared/src/AACube.cpp
View file

@ -466,9 +466,15 @@ AABox AACube::clamp(float min, float max) const {
} }
AACube& AACube::operator += (const glm::vec3& point) { AACube& AACube::operator += (const glm::vec3& point) {
_corner = glm::min(_corner, point); glm::vec3 oldMaximumPoint = getMaximumPoint();
glm::vec3 scale = point - _corner; _corner = glm::vec3(glm::min(_corner.x, point.x),
_scale = glm::max(_scale, scale.x, scale.y, scale.z); glm::min(_corner.y, point.y),
glm::min(_corner.z, point.z));
glm::vec3 scaleOld = oldMaximumPoint - _corner;
glm::vec3 scalePoint = point - _corner;
_scale = glm::max(_scale, scalePoint.x, scalePoint.y, scalePoint.z);
_scale = glm::max(_scale, scaleOld.x, scaleOld.y, scaleOld.z);
return (*this); return (*this);
} }