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

diff minimization

Browse source
This commit is contained in:
Seth Alves 2015-03-24 16:59:12 -07:00
parent 2f47f7c7ba
commit dccedeadff
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,14 +286,6 @@ const QString& RenderableModelEntityItem::getCollisionModelURL() const {
return _collisionModelURL; return _collisionModelURL;
} }
void RenderableModelEntityItem::updateDimensions(const glm::vec3& value) {
if (glm::distance(_dimensions, value) > MIN_DIMENSIONS_DELTA) {
_dimensions = value;
_dirtyFlags |= (EntityItem::DIRTY_SHAPE | EntityItem::DIRTY_MASS);
}
_model->setScaleToFit(true, _dimensions);
}
bool RenderableModelEntityItem::isReadyToComputeShape() { bool RenderableModelEntityItem::isReadyToComputeShape() {
if (!_model) { if (!_model) {

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

@ -56,8 +56,6 @@ public:
virtual bool hasCollisionModel() const; virtual bool hasCollisionModel() const;
virtual const QString& getCollisionModelURL() const; virtual const QString& getCollisionModelURL() const;
virtual void updateDimensions(const glm::vec3& value);
bool isReadyToComputeShape(); bool isReadyToComputeShape();
void computeShapeInfo(ShapeInfo& info); void computeShapeInfo(ShapeInfo& info);
ShapeType getShapeType() const; ShapeType getShapeType() const;

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

@ -40,15 +40,6 @@ class EntityTreeElementExtraEncodeData;
#define debugTreeVector(V) V << "[" << V << " in meters ]" #define debugTreeVector(V) V << "[" << V << " in meters ]"
extern const float MIN_POSITION_DELTA;
extern const float MIN_DIMENSIONS_DELTA;
extern const float MIN_ALIGNMENT_DOT;
extern const float MIN_VELOCITY_DELTA;
extern const float MIN_DAMPING_DELTA;
extern const float MIN_GRAVITY_DELTA;
extern const float MIN_SPIN_DELTA;
/// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
/// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
/// one directly, instead you must only construct one of it's derived classes with additional features. /// one directly, instead you must only construct one of it's derived classes with additional features.
@ -279,7 +270,7 @@ public:
void updatePositionInDomainUnits(const glm::vec3& value); void updatePositionInDomainUnits(const glm::vec3& value);
void updatePosition(const glm::vec3& value); void updatePosition(const glm::vec3& value);
void updateDimensionsInDomainUnits(const glm::vec3& value); void updateDimensionsInDomainUnits(const glm::vec3& value);
virtual void updateDimensions(const glm::vec3& value); void updateDimensions(const glm::vec3& value);
void updateRotation(const glm::quat& rotation); void updateRotation(const glm::quat& rotation);
void updateDensity(float value); void updateDensity(float value);
void updateMass(float value); void updateMass(float value);