Renaming vars

This commit is contained in:
bwent 2015-07-31 10:47:05 -07:00
parent 67760fad79
commit aab1f70800
3 changed files with 5 additions and 5 deletions

View file

@ -129,9 +129,9 @@ void EntityItemProperties::setSittingPoints(const QVector<SittingPoint>& sitting
}
}
void EntityItemProperties::setNaturalPosition(const glm::vec3& min, const glm::vec3& max) {
glm::vec3 radius = (max - min) / 2.0f;
_naturalPosition = max - radius;
void EntityItemProperties::calculateNaturalPosition(const glm::vec3& min, const glm::vec3& max) {
glm::vec3 halfDimension = (max - min) / 2.0f;
_naturalPosition = max - halfDimension;
}
bool EntityItemProperties::animationSettingsChanged() const {

View file

@ -194,7 +194,7 @@ public:
void setNaturalDimensions(const glm::vec3& value) { _naturalDimensions = value; }
const glm::vec3& getNaturalPosition() const { return _naturalPosition; }
void setNaturalPosition(const glm::vec3& min, const glm::vec3& max);
void calculateNaturalPosition(const glm::vec3& min, const glm::vec3& max);
const QStringList& getTextureNames() const { return _textureNames; }
void setTextureNames(const QStringList& value) { _textureNames = value; }

View file

@ -118,7 +118,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
results.setSittingPoints(geometry->sittingPoints);
Extents meshExtents = geometry->getUnscaledMeshExtents();
results.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
results.setNaturalPosition(meshExtents.minimum, meshExtents.maximum);
results.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
}
}