From dccedeadff030cd721caae413bca87804141b33e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 24 Mar 2015 16:59:12 -0700 Subject: [PATCH] diff minimization --- .../src/RenderableModelEntityItem.cpp | 8 -------- .../entities-renderer/src/RenderableModelEntityItem.h | 2 -- libraries/entities/src/EntityItem.h | 11 +---------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index aab9786762..43dbb95b6d 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -286,14 +286,6 @@ const QString& RenderableModelEntityItem::getCollisionModelURL() const { 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() { if (!_model) { diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h index 90535954b4..9146a04cf8 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.h +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h @@ -56,8 +56,6 @@ public: virtual bool hasCollisionModel() const; virtual const QString& getCollisionModelURL() const; - virtual void updateDimensions(const glm::vec3& value); - bool isReadyToComputeShape(); void computeShapeInfo(ShapeInfo& info); ShapeType getShapeType() const; diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 49e450c45e..88287f8965 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -40,15 +40,6 @@ class EntityTreeElementExtraEncodeData; #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 /// 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. @@ -279,7 +270,7 @@ public: void updatePositionInDomainUnits(const glm::vec3& value); void updatePosition(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 updateDensity(float value); void updateMass(float value);