From 45818025324ba82b575ffee9f3e54e21edf7f03e Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 11 Feb 2015 13:03:22 -0800 Subject: [PATCH] explicitly flag virtual functions as such --- libraries/entities/src/BoxEntityItem.h | 2 +- libraries/entities/src/ModelEntityItem.h | 3 +-- libraries/entities/src/SphereEntityItem.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/entities/src/BoxEntityItem.h b/libraries/entities/src/BoxEntityItem.h index fd760a97e1..e8459e7dbb 100644 --- a/libraries/entities/src/BoxEntityItem.h +++ b/libraries/entities/src/BoxEntityItem.h @@ -51,7 +51,7 @@ public: _color[BLUE_INDEX] = value.blue; } - ShapeType getShapeType() const { return SHAPE_TYPE_BOX; } + virtual ShapeType getShapeType() const { return SHAPE_TYPE_BOX; } virtual void debugDump() const; diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index bad053551e..94d262fc9f 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -49,8 +49,7 @@ public: virtual void debugDump() const; void updateShapeType(ShapeType type); - ShapeType getShapeType() const { return _shapeType; } - + virtual ShapeType getShapeType() const { return _shapeType; } // TODO: Move these to subclasses, or other appropriate abstraction // getters/setters applicable to models and particles diff --git a/libraries/entities/src/SphereEntityItem.h b/libraries/entities/src/SphereEntityItem.h index 610db483c2..f79a2db7ff 100644 --- a/libraries/entities/src/SphereEntityItem.h +++ b/libraries/entities/src/SphereEntityItem.h @@ -53,7 +53,7 @@ public: // TODO: implement proper contains for 3D ellipsoid //virtual bool contains(const glm::vec3& point) const; - ShapeType getShapeType() const { return SHAPE_TYPE_SPHERE; } + virtual ShapeType getShapeType() const { return SHAPE_TYPE_SPHERE; } virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,