From 8a69dc89fa9a830e72a56c8ff836af49f7e23ef6 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sun, 21 Aug 2016 12:34:27 +0200 Subject: [PATCH] Add missing override keyword --- src/collision/shapes/BoxShape.h | 2 +- src/collision/shapes/CapsuleShape.h | 2 +- src/collision/shapes/ConcaveShape.h | 2 +- src/collision/shapes/ConeShape.h | 2 +- src/collision/shapes/ConvexMeshShape.h | 2 +- src/collision/shapes/CylinderShape.h | 2 +- src/collision/shapes/SphereShape.h | 2 +- src/collision/shapes/TriangleShape.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/collision/shapes/BoxShape.h b/src/collision/shapes/BoxShape.h index 2d0fef75..776356ba 100644 --- a/src/collision/shapes/BoxShape.h +++ b/src/collision/shapes/BoxShape.h @@ -100,7 +100,7 @@ class BoxShape : public ConvexShape { virtual void getLocalBounds(Vector3& min, Vector3& max) const override; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Return the local inertia tensor of the collision shape virtual void computeLocalInertiaTensor(Matrix3x3& tensor, decimal mass) const override; diff --git a/src/collision/shapes/CapsuleShape.h b/src/collision/shapes/CapsuleShape.h index 542fb12f..9c0a4545 100644 --- a/src/collision/shapes/CapsuleShape.h +++ b/src/collision/shapes/CapsuleShape.h @@ -102,7 +102,7 @@ class CapsuleShape : public ConvexShape { virtual void getLocalBounds(Vector3& min, Vector3& max) const override; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Return the local inertia tensor of the collision shape virtual void computeLocalInertiaTensor(Matrix3x3& tensor, decimal mass) const override; diff --git a/src/collision/shapes/ConcaveShape.h b/src/collision/shapes/ConcaveShape.h index 4af49338..c5657b2b 100644 --- a/src/collision/shapes/ConcaveShape.h +++ b/src/collision/shapes/ConcaveShape.h @@ -105,7 +105,7 @@ class ConcaveShape : public CollisionShape { virtual bool isConvex() const override; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Use a callback method on all triangles of the concave shape inside a given AABB virtual void testAllTriangles(TriangleCallback& callback, const AABB& localAABB) const=0; diff --git a/src/collision/shapes/ConeShape.h b/src/collision/shapes/ConeShape.h index 65ddb35e..16102163 100644 --- a/src/collision/shapes/ConeShape.h +++ b/src/collision/shapes/ConeShape.h @@ -108,7 +108,7 @@ class ConeShape : public ConvexShape { virtual void getLocalBounds(Vector3& min, Vector3& max) const override; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Return the local inertia tensor of the collision shape virtual void computeLocalInertiaTensor(Matrix3x3& tensor, decimal mass) const override; diff --git a/src/collision/shapes/ConvexMeshShape.h b/src/collision/shapes/ConvexMeshShape.h index aeb1edbe..66b624aa 100644 --- a/src/collision/shapes/ConvexMeshShape.h +++ b/src/collision/shapes/ConvexMeshShape.h @@ -141,7 +141,7 @@ class ConvexMeshShape : public ConvexShape { void addEdge(uint v1, uint v2); /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Return true if the edges information is used to speed up the collision detection bool isEdgesInformationUsed() const; diff --git a/src/collision/shapes/CylinderShape.h b/src/collision/shapes/CylinderShape.h index b58c454d..e0744a80 100644 --- a/src/collision/shapes/CylinderShape.h +++ b/src/collision/shapes/CylinderShape.h @@ -99,7 +99,7 @@ class CylinderShape : public ConvexShape { decimal getHeight() const; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Set the scaling vector of the collision shape virtual void setLocalScaling(const Vector3& scaling) override; diff --git a/src/collision/shapes/SphereShape.h b/src/collision/shapes/SphereShape.h index 58f20e6f..fe55a7a8 100644 --- a/src/collision/shapes/SphereShape.h +++ b/src/collision/shapes/SphereShape.h @@ -81,7 +81,7 @@ class SphereShape : public ConvexShape { decimal getRadius() const; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; /// Set the scaling vector of the collision shape virtual void setLocalScaling(const Vector3& scaling) override; diff --git a/src/collision/shapes/TriangleShape.h b/src/collision/shapes/TriangleShape.h index d1c82f70..29732f8f 100644 --- a/src/collision/shapes/TriangleShape.h +++ b/src/collision/shapes/TriangleShape.h @@ -117,7 +117,7 @@ class TriangleShape : public ConvexShape { Vector3 getVertex(int index) const; /// Return true if the collision shape is a polyhedron - virtual bool isPolyhedron() const; + virtual bool isPolyhedron() const override; // ---------- Friendship ---------- //