mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 22:54:34 +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
|
|
@ -89,23 +89,23 @@ public:
|
|||
/// @{
|
||||
static void initPersistFields();
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
void onEditorEnable();
|
||||
void onEditorDisable();
|
||||
void inspectPostApply();
|
||||
void onEditorEnable() override;
|
||||
void onEditorDisable() override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
void setTransform(const MatrixF &mat);
|
||||
void setTransform(const MatrixF &mat) override;
|
||||
|
||||
void prepRenderImage(SceneRenderState *state);
|
||||
void prepRenderImage(SceneRenderState *state) override;
|
||||
void render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
|
||||
/// @}
|
||||
|
||||
/// @name NetObject
|
||||
/// @{
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream);
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
|
||||
/// @}
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ public:
|
|||
~duDebugDrawTorque();
|
||||
|
||||
/// Enable/disable Z read.
|
||||
void depthMask(bool state);
|
||||
void depthMask(bool state) override;
|
||||
|
||||
/// Enable/disable texturing. Not used.
|
||||
void texture(bool state);
|
||||
void texture(bool state) override;
|
||||
|
||||
/// Special colour overwrite for when I get picky about the colours Mikko chose.
|
||||
void overrideColor(unsigned int col);
|
||||
|
|
@ -48,7 +48,7 @@ public:
|
|||
/// Begin drawing primitives.
|
||||
/// @param prim [in] primitive type to draw, one of rcDebugDrawPrimitives.
|
||||
/// @param size [in] size of a primitive, applies to point size and line width only.
|
||||
void begin(duDebugDrawPrimitives prim, float size = 1.0f);
|
||||
void begin(duDebugDrawPrimitives prim, float size = 1.0f) override;
|
||||
|
||||
/// All new buffers go into this group.
|
||||
void beginGroup(U32 group);
|
||||
|
|
@ -56,25 +56,25 @@ public:
|
|||
/// Submit a vertex
|
||||
/// @param pos [in] position of the verts.
|
||||
/// @param color [in] color of the verts.
|
||||
void vertex(const float* pos, unsigned int color);
|
||||
void vertex(const float* pos, unsigned int color) override;
|
||||
|
||||
/// Submit a vertex
|
||||
/// @param x,y,z [in] position of the verts.
|
||||
/// @param color [in] color of the verts.
|
||||
void vertex(const float x, const float y, const float z, unsigned int color);
|
||||
void vertex(const float x, const float y, const float z, unsigned int color) override;
|
||||
|
||||
/// Submit a vertex
|
||||
/// @param pos [in] position of the verts.
|
||||
/// @param color [in] color of the verts.
|
||||
void vertex(const float* pos, unsigned int color, const float* uv);
|
||||
void vertex(const float* pos, unsigned int color, const float* uv) override;
|
||||
|
||||
/// Submit a vertex
|
||||
/// @param x,y,z [in] position of the verts.
|
||||
/// @param color [in] color of the verts.
|
||||
void vertex(const float x, const float y, const float z, unsigned int color, const float u, const float v);
|
||||
void vertex(const float x, const float y, const float z, unsigned int color, const float u, const float v) override;
|
||||
|
||||
/// End drawing primitives.
|
||||
void end();
|
||||
void end() override;
|
||||
|
||||
/// Render buffered primitive.
|
||||
void render();
|
||||
|
|
|
|||
|
|
@ -188,10 +188,10 @@ public:
|
|||
/// @name SimObject
|
||||
/// @{
|
||||
|
||||
virtual void onEditorEnable();
|
||||
virtual void onEditorDisable();
|
||||
void onEditorEnable() override;
|
||||
void onEditorDisable() override;
|
||||
|
||||
void write(Stream &stream, U32 tabStop, U32 flags);
|
||||
void write(Stream &stream, U32 tabStop, U32 flags) override;
|
||||
|
||||
/// @}
|
||||
|
||||
|
|
@ -200,8 +200,8 @@ public:
|
|||
|
||||
static void initPersistFields();
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
enum flags {
|
||||
BuildFlag = Parent::NextFreeMask << 0,
|
||||
|
|
@ -209,25 +209,25 @@ public:
|
|||
NextFreeMask = Parent::NextFreeMask << 2,
|
||||
};
|
||||
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream);
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
|
||||
|
||||
void setTransform(const MatrixF &mat);
|
||||
void setScale(const VectorF &scale);
|
||||
void setTransform(const MatrixF &mat) override;
|
||||
void setScale(const VectorF &scale) override;
|
||||
|
||||
/// @}
|
||||
|
||||
/// @name ProcessObject
|
||||
/// @{
|
||||
|
||||
void processTick(const Move *move);
|
||||
void processTick(const Move *move) override;
|
||||
|
||||
/// @}
|
||||
|
||||
/// @name Rendering
|
||||
/// @{
|
||||
|
||||
void prepRenderImage(SceneRenderState *state);
|
||||
void prepRenderImage(SceneRenderState *state) override;
|
||||
void render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
|
||||
void renderLinks(duDebugDraw &dd);
|
||||
void renderTileData(duDebugDrawTorque &dd, U32 tile);
|
||||
|
|
@ -247,7 +247,7 @@ public:
|
|||
/// Return the EventManager for all NavMeshes.
|
||||
static EventManager *getEventManager();
|
||||
|
||||
void inspectPostApply();
|
||||
void inspectPostApply() override;
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
|
|
@ -99,19 +99,19 @@ public:
|
|||
|
||||
static void initPersistFields();
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
void onEditorEnable();
|
||||
void onEditorDisable();
|
||||
void inspectPostApply();
|
||||
void onEditorEnable() override;
|
||||
void onEditorDisable() override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
void onDeleteNotify(SimObject *object);
|
||||
void onDeleteNotify(SimObject *object) override;
|
||||
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream);
|
||||
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
|
||||
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
|
||||
|
||||
void prepRenderImage(SceneRenderState *state);
|
||||
void prepRenderImage(SceneRenderState *state) override;
|
||||
void renderSimple(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
|
||||
|
||||
DECLARE_CONOBJECT(NavPath);
|
||||
|
|
@ -121,7 +121,7 @@ public:
|
|||
|
||||
/// @name ProcessObject
|
||||
/// @{
|
||||
void processTick(const Move *move);
|
||||
void processTick(const Move *move) override;
|
||||
/// @}
|
||||
|
||||
NavPath();
|
||||
|
|
|
|||
|
|
@ -35,20 +35,20 @@ public:
|
|||
/// @name AbstractPolyList
|
||||
/// @{
|
||||
|
||||
bool isEmpty() const;
|
||||
bool isEmpty() const override;
|
||||
|
||||
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 plane(U32 v1, U32 v2, U32 v3);
|
||||
void plane(const PlaneF& p);
|
||||
void plane(const U32 index);
|
||||
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);
|
||||
void vertex(U32 vi) override;
|
||||
|
||||
void end();
|
||||
void end() override;
|
||||
|
||||
/// @}
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ protected:
|
|||
/// Store a list of planes - not actually used.
|
||||
Vector<PlaneF> planes;
|
||||
/// Another inherited utility function.
|
||||
const PlaneF& getIndexedPlane(const U32 index) { return planes[index]; }
|
||||
const PlaneF& getIndexedPlane(const U32 index) override { return planes[index]; }
|
||||
|
||||
private:
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue