mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 14:44:36 +00:00
rest of virtuals removed
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -92,14 +92,14 @@ class DepthSortList : public ClippedPolyList
|
|||
void depthPartition(const Point3F * sourceVerts, U32 numVerts, Vector<Poly> & partition, Vector<Point3F> & partitionVerts);
|
||||
|
||||
// Virtual methods
|
||||
void end();
|
||||
void end() override;
|
||||
// U32 addPoint(const Point3F& p);
|
||||
// bool isEmpty() const;
|
||||
// void begin(U32 material,U32 surfaceKey);
|
||||
// void plane(U32 v1,U32 v2,U32 v3);
|
||||
// void plane(const PlaneF& p);
|
||||
// void vertex(U32 vi);
|
||||
bool getMapping(MatrixF *, Box3F *);
|
||||
bool getMapping(MatrixF *, Box3F *) override;
|
||||
|
||||
// access to the polys in order (note: returned pointers are volatile, may change if polys added).
|
||||
void getOrderedPoly(U32 ith, Poly ** poly, PolyExtents ** polyExtent);
|
||||
|
|
|
|||
|
|
@ -63,19 +63,19 @@ struct GjkCollisionState: public CollisionState
|
|||
bool closest(VectorF& v);
|
||||
bool degenerate(const VectorF& w);
|
||||
void nextBit();
|
||||
void swap();
|
||||
void swap() override;
|
||||
void reset(const MatrixF& a2w, const MatrixF& b2w);
|
||||
|
||||
GjkCollisionState();
|
||||
~GjkCollisionState();
|
||||
|
||||
void set(Convex* a,Convex* b,const MatrixF& a2w, const MatrixF& b2w);
|
||||
void set(Convex* a,Convex* b,const MatrixF& a2w, const MatrixF& b2w) override;
|
||||
|
||||
void getCollisionInfo(const MatrixF& mat, Collision* info);
|
||||
void getClosestPoints(Point3F& p1, Point3F& p2);
|
||||
bool intersect(const MatrixF& a2w, const MatrixF& b2w);
|
||||
F32 distance(const MatrixF& a2w, const MatrixF& b2w, const F32 dontCareDist,
|
||||
const MatrixF* w2a = NULL, const MatrixF* _w2b = NULL);
|
||||
const MatrixF* w2a = NULL, const MatrixF* _w2b = NULL) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,21 +37,21 @@ public:
|
|||
virtual ~VertexPolyList() {}
|
||||
|
||||
// AbstractPolyList
|
||||
U32 addPoint(const Point3F& p);
|
||||
U32 addPlane(const PlaneF& plane) { return 0; }
|
||||
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() {}
|
||||
const PlaneF& getIndexedPlane(const U32 index);
|
||||
U32 addPoint(const Point3F& p) override;
|
||||
U32 addPlane(const PlaneF& plane) override { return 0; }
|
||||
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 {}
|
||||
const PlaneF& getIndexedPlane(const U32 index) override;
|
||||
|
||||
/// Clears any captured verts.
|
||||
void clear();
|
||||
|
||||
/// Returns true if the polylist contains no verts.
|
||||
bool isEmpty() const { return mVertexList.empty(); }
|
||||
bool isEmpty() const override { return mVertexList.empty(); }
|
||||
|
||||
/// Returns the vertex list.
|
||||
Vector<Point3F>& getVertexList() { return mVertexList; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue