mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 15:14:35 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -43,9 +43,9 @@ public:
|
|||
BoxConvex() { mType = BoxConvexType; }
|
||||
void init(SceneObject* obj) { mObject = obj; }
|
||||
|
||||
Point3F support(const VectorF& v) const;
|
||||
void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
|
||||
void getPolyList(AbstractPolyList* list);
|
||||
Point3F support(const VectorF& v) const override;
|
||||
void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
|
||||
void getPolyList(AbstractPolyList* list) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ class OrthoBoxConvex: public BoxConvex
|
|||
public:
|
||||
OrthoBoxConvex() { mOrthoMatrixCache.identity(); }
|
||||
|
||||
virtual const MatrixF& getTransform() const;
|
||||
const MatrixF& getTransform() const override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -119,16 +119,16 @@ public:
|
|||
void clear();
|
||||
|
||||
// AbstractPolyList
|
||||
bool isEmpty() const;
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPointAndNormal(const Point3F& p, const Point3F& normal);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey);
|
||||
void plane(U32 v1,U32 v2,U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void end();
|
||||
bool isEmpty() const override;
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPointAndNormal(const Point3F& p, const Point3F& normal) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey) override;
|
||||
void plane(U32 v1,U32 v2,U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void end() override;
|
||||
|
||||
/// Often after clipping you'll end up with orphan verticies
|
||||
/// that are unused by the poly list. This removes these unused
|
||||
|
|
@ -145,7 +145,7 @@ public:
|
|||
protected:
|
||||
|
||||
// AbstractPolyList
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -73,23 +73,23 @@ class ConcretePolyList : public AbstractPolyList
|
|||
void clear();
|
||||
|
||||
// Virtual methods
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey);
|
||||
void plane(U32 v1,U32 v2,U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void end();
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey) override;
|
||||
void plane(U32 v1,U32 v2,U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void end() override;
|
||||
void render();
|
||||
|
||||
bool isEmpty() const;
|
||||
bool isEmpty() const override;
|
||||
|
||||
/// This breaks all polys in the polylist into triangles.
|
||||
void triangulate();
|
||||
|
||||
protected:
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
#endif // _CONCRETEPOLYLIST_H_
|
||||
|
|
|
|||
|
|
@ -80,18 +80,18 @@ class EarlyOutPolyList : public AbstractPolyList
|
|||
void clear();
|
||||
|
||||
// Virtual methods
|
||||
bool isEmpty() const;
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey);
|
||||
void plane(U32 v1,U32 v2,U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void end();
|
||||
bool isEmpty() const override;
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey) override;
|
||||
void plane(U32 v1,U32 v2,U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void end() override;
|
||||
|
||||
protected:
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
#endif // _H_EARLYOUTPOLYLIST_
|
||||
|
|
|
|||
|
|
@ -116,18 +116,18 @@ public:
|
|||
void adjustCollisionTime();
|
||||
|
||||
// Virtual methods
|
||||
bool isEmpty() const;
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
void begin(BaseMatInstance* material, U32 surfaceKey);
|
||||
void plane(U32 v1,U32 v2,U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void end();
|
||||
bool isEmpty() const override;
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
void begin(BaseMatInstance* material, U32 surfaceKey) override;
|
||||
void plane(U32 v1,U32 v2,U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void end() override;
|
||||
|
||||
protected:
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -123,21 +123,21 @@ class OptimizedPolyList : public AbstractPolyList
|
|||
void clear();
|
||||
|
||||
// Virtual methods
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
|
||||
void begin(BaseMatInstance* material, U32 surfaceKey);
|
||||
void begin(BaseMatInstance* material, U32 surfaceKey) override;
|
||||
void begin(BaseMatInstance* material, U32 surfaceKey, PolyType type);
|
||||
void plane(U32 v1, U32 v2, U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void plane(U32 v1, U32 v2, U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void vertex(const Point3F& p);
|
||||
void vertex(const Point3F& p,
|
||||
const Point3F& normal,
|
||||
const Point2F& uv0 = Point2F(0.0f, 0.0f),
|
||||
const Point2F& uv1 = Point2F(0.0f, 0.0f));
|
||||
void end();
|
||||
void end() override;
|
||||
|
||||
U32 insertPoint(const Point3F& point);
|
||||
U32 insertNormal(const Point3F& normal);
|
||||
|
|
@ -151,12 +151,12 @@ class OptimizedPolyList : public AbstractPolyList
|
|||
const Point2F& uv0 = Point2F(0.0f, 0.0f),
|
||||
const Point2F& uv1 = Point2F(0.0f, 0.0f));
|
||||
|
||||
bool isEmpty() const;
|
||||
bool isEmpty() const override;
|
||||
|
||||
Polyhedron toPolyhedron() const;
|
||||
|
||||
protected:
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
#endif // _OPTIMIZEDPOLYLIST_H_
|
||||
|
|
|
|||
|
|
@ -58,18 +58,18 @@ public:
|
|||
void clear();
|
||||
|
||||
// Virtual methods
|
||||
bool isEmpty() const;
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane);
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey);
|
||||
void plane(U32 v1,U32 v2,U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
void vertex(U32 vi);
|
||||
void end();
|
||||
bool isEmpty() const override;
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override;
|
||||
void begin(BaseMatInstance* material,U32 surfaceKey) override;
|
||||
void plane(U32 v1,U32 v2,U32 v3) override;
|
||||
void plane(const PlaneF& p) override;
|
||||
void plane(const U32 index) override;
|
||||
void vertex(U32 vi) override;
|
||||
void end() override;
|
||||
|
||||
protected:
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue