From b4bd60e979d3ece722641f85cebf1dfecc67978a Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 12 Feb 2015 08:28:34 -0800 Subject: [PATCH] give TextEntityItem a box collision shape --- libraries/entities/src/EntityItem.h | 1 - libraries/entities/src/TextEntityItem.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 99fafa3343..a26783fc7c 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -253,7 +253,6 @@ public: // TODO: We need to get rid of these users of getRadius()... float getRadius() const; - void applyHardCollision(const CollisionInfo& collisionInfo); virtual bool contains(const glm::vec3& point) const { return getAABox().contains(point); } virtual void computeShapeInfo(ShapeInfo& info) const; diff --git a/libraries/entities/src/TextEntityItem.h b/libraries/entities/src/TextEntityItem.h index 1f0bd7d85e..d57b5442d6 100644 --- a/libraries/entities/src/TextEntityItem.h +++ b/libraries/entities/src/TextEntityItem.h @@ -24,6 +24,7 @@ public: /// set dimensions in domain scale units (0.0 - 1.0) this will also reset radius appropriately virtual void setDimensions(const glm::vec3& value); + virtual ShapeType getShapeType() const { return SHAPE_TYPE_BOX; } // methods for getting/setting all properties of an entity virtual EntityItemProperties getProperties() const;