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

code review

Browse source
This commit is contained in:
Seth Alves 2017-12-22 09:07:16 -08:00
parent 897b96d092
commit 533aa3d918
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityItem.cpp
View file

@ -1674,16 +1674,12 @@ void EntityItem::setParentID(const QUuid& value) {
glm::vec3 EntityItem::getScaledDimensions() const { glm::vec3 EntityItem::getScaledDimensions() const {
glm::vec3 scale = getSNScale(); glm::vec3 scale = getSNScale();
return glm::vec3(_unscaledDimensions.x * scale.x, return _unscaledDimensions * scale;
_unscaledDimensions.y * scale.y,
_unscaledDimensions.z * scale.z);
} }
void EntityItem::setScaledDimensions(const glm::vec3& value) { void EntityItem::setScaledDimensions(const glm::vec3& value) {
glm::vec3 parentScale = getSNScale(); glm::vec3 parentScale = getSNScale();
setUnscaledDimensions(glm::vec3(value.x / parentScale.x, setUnscaledDimensions(value * parentScale);
value.y / parentScale.y,
value.z / parentScale.z));
} }
void EntityItem::setUnscaledDimensions(const glm::vec3& value) { void EntityItem::setUnscaledDimensions(const glm::vec3& value) {

4
libraries/entities/src/ShapeEntityItem.cpp
View file

@ -206,12 +206,12 @@ void ShapeEntityItem::setColor(const QColor& value) {
void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) { void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
const float MAX_FLAT_DIMENSION = 0.0001f; const float MAX_FLAT_DIMENSION = 0.0001f;
if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) { if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) {
// enforce flatness in Y // enforce flatness in Y
glm::vec3 newDimensions = value; glm::vec3 newDimensions = value;
newDimensions.y = MAX_FLAT_DIMENSION; newDimensions.y = MAX_FLAT_DIMENSION;
EntityItem::setUnscaledDimensions(newDimensions); EntityItem::setUnscaledDimensions(newDimensions);
} else { } else {
EntityItem::setUnscaledDimensions(value); EntityItem::setUnscaledDimensions(value);
} }
} }