Rename getCenter by get CenterPosition

This commit is contained in:
Atlante45 2015-05-15 18:34:28 +02:00
parent e5c3a93e54
commit c13ad83cc4
8 changed files with 11 additions and 13 deletions

View file

@ -650,7 +650,7 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg
glm::vec3 position = entity->getPosition();
glm::vec3 center = entity->getCenter();
glm::vec3 center = entity->getCenterPosition();
glm::vec3 dimensions = entity->getDimensions();
glm::quat rotation = entity->getRotation();

View file

@ -26,7 +26,7 @@ void RenderableBoxEntityItem::render(RenderArgs* args) {
PerformanceTimer perfTimer("RenderableBoxEntityItem::render");
assert(getType() == EntityTypes::Box);
glm::vec3 position = getPosition();
glm::vec3 center = getCenter();
glm::vec3 center = getCenterPosition();
glm::vec3 dimensions = getDimensions();
glm::quat rotation = getRotation();

View file

@ -22,7 +22,7 @@
void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, RenderArgs* args,
float puffedOut, glm::vec4& color) {
glm::vec3 position = entity->getPosition();
glm::vec3 center = entity->getCenter();
glm::vec3 center = entity->getCenterPosition();
glm::vec3 dimensions = entity->getDimensions();
glm::quat rotation = entity->getRotation();
@ -41,7 +41,7 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, Render
void RenderableDebugableEntityItem::renderHoverDot(EntityItem* entity, RenderArgs* args) {
glm::vec3 position = entity->getPosition();
glm::vec3 center = entity->getCenter();
glm::vec3 center = entity->getCenterPosition();
glm::vec3 dimensions = entity->getDimensions();
glm::quat rotation = entity->getRotation();
glm::vec4 blueColor(0.0f, 0.0f, 1.0f, 1.0f);

View file

@ -96,7 +96,7 @@ void RenderableParticleEffectEntityItem::renderUntexturedQuads(RenderArgs* args)
glPushMatrix();
glm::vec3 positionToCenter = getCenter() - position;
glm::vec3 positionToCenter = getCenterPosition() - position;
glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z);
DependencyManager::get<GeometryCache>()->renderVertices(gpu::QUADS, _cacheID);
@ -172,7 +172,7 @@ void RenderableParticleEffectEntityItem::renderTexturedQuads(RenderArgs* args) {
glPushMatrix();
glm::vec3 positionToCenter = getCenter() - position;
glm::vec3 positionToCenter = getCenterPosition() - position;
glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z);
DependencyManager::get<GeometryCache>()->renderVertices(gpu::QUADS, _cacheID);

View file

@ -27,7 +27,7 @@ void RenderableSphereEntityItem::render(RenderArgs* args) {
PerformanceTimer perfTimer("RenderableSphereEntityItem::render");
assert(getType() == EntityTypes::Sphere);
glm::vec3 position = getPosition();
glm::vec3 center = getCenter();
glm::vec3 center = getCenterPosition();
glm::vec3 dimensions = getDimensions();
glm::quat rotation = getRotation();

View file

@ -107,7 +107,7 @@ void RenderableZoneEntityItem::render(RenderArgs* args) {
case SHAPE_TYPE_SPHERE: {
PerformanceTimer perfTimer("zone->renderPrimitive");
glm::vec3 position = getPosition();
glm::vec3 center = getCenter();
glm::vec3 center = getCenterPosition();
glm::vec3 dimensions = getDimensions();
glm::quat rotation = getRotation();

View file

@ -998,10 +998,6 @@ void EntityItem::recordCreationTime() {
_lastSimulated = _created;
}
glm::vec3 EntityItem::getCenter() const {
return getPosition() + (getDimensions() * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
}
/// The maximum bounding cube for the entity, independent of it's rotation.
/// This accounts for the registration point (upon which rotation occurs around).
///

View file

@ -181,7 +181,9 @@ public:
// attributes applicable to all entity types
EntityTypes::EntityType getType() const { return _type; }
glm::vec3 getCenter() const;
inline glm::vec3 getCenterPosition() const {
return getPosition() + (getDimensions() * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
}
/// Position in meters (0.0 - TREE_SCALE)
inline const glm::vec3& getPosition() const { return _transform.getTranslation(); }