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

remove EntityItem::getSize()

Browse source
This commit is contained in:
Andrew Meadows 2015-02-26 15:36:59 -08:00
parent 7210c7a88b
commit 64c28fe925
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -115,8 +115,8 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
bool drawAsModel = hasModel(); bool drawAsModel = hasModel();
glm::vec3 position = getPositionInMeters(); glm::vec3 position = getPositionInMeters();
float size = getSize() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInMeters(); glm::vec3 dimensions = getDimensionsInMeters();
float size = glm::length(dimensions);
if (drawAsModel) { if (drawAsModel) {
remapTextures(); remapTextures();

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

@ -888,11 +888,6 @@ void EntityItem::recordCreationTime() {
} }
// TODO: is this really correct? how do we use size, does it need to handle rotation?
float EntityItem::getSize() const {
return glm::length(_dimensions);
}
// TODO: doesn't this need to handle rotation? // TODO: doesn't this need to handle rotation?
glm::vec3 EntityItem::getCenterInDomainUnits() const { glm::vec3 EntityItem::getCenterInDomainUnits() const {
return _position + (_dimensions * (glm::vec3(0.5f,0.5f,0.5f) - _registrationPoint)); return _position + (_dimensions * (glm::vec3(0.5f,0.5f,0.5f) - _registrationPoint));

1
libraries/entities/src/EntityItem.h
View file

@ -212,7 +212,6 @@ public:
quint64 getExpiry() const; quint64 getExpiry() const;
// position, size, and bounds related helpers // position, size, and bounds related helpers
float getSize() const; /// get maximum dimension in domain scale units (0.0 - 1.0)
AACube getMaximumAACube() const; AACube getMaximumAACube() const;
AACube getMinimumAACube() const; AACube getMinimumAACube() const;
AABox getAABoxInMeters() const; /// axis aligned bounding box in world-frame (meters) AABox getAABoxInMeters() const; /// axis aligned bounding box in world-frame (meters)