Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 20:34:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

explicitly flag virtual functions as such

Browse source
This commit is contained in:
Andrew Meadows 2015-02-11 13:03:22 -08:00
parent bd1817817b
commit 4581802532
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/BoxEntityItem.h
View file

@ -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;

3
libraries/entities/src/ModelEntityItem.h
View file

@ -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

2
libraries/entities/src/SphereEntityItem.h
View file

@ -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,