mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 00:24:40 +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
|
|
@ -61,7 +61,7 @@ class ScenePolyhedralZone : public ScenePolyhedralObject< SceneSimpleZone >
|
|||
}
|
||||
|
||||
// SceneSimpleZone.
|
||||
virtual void _updateOrientedWorldBox();
|
||||
void _updateOrientedWorldBox() override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -69,13 +69,13 @@ class ScenePolyhedralZone : public ScenePolyhedralObject< SceneSimpleZone >
|
|||
ScenePolyhedralZone( const PolyhedronType& polyhedron );
|
||||
|
||||
// SimObject.
|
||||
virtual bool onAdd();
|
||||
bool onAdd() override;
|
||||
|
||||
// SceneObject.
|
||||
virtual void setTransform( const MatrixF& mat );
|
||||
void setTransform( const MatrixF& mat ) override;
|
||||
|
||||
// SceneZoneSpace.
|
||||
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
|
||||
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
|
||||
};
|
||||
|
||||
#endif // !_SCENEPOLYHEDRALZONE_H_
|
||||
|
|
|
|||
|
|
@ -46,24 +46,24 @@ class SceneRootZone : public SceneSimpleZone
|
|||
protected:
|
||||
|
||||
// SceneObject.
|
||||
virtual bool onSceneAdd();
|
||||
virtual void onSceneRemove();
|
||||
bool onSceneAdd() override;
|
||||
void onSceneRemove() override;
|
||||
|
||||
public:
|
||||
|
||||
SceneRootZone();
|
||||
|
||||
// SimObject.
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
virtual String describeSelf() const;
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
String describeSelf() const override;
|
||||
|
||||
// SceneObject.
|
||||
virtual bool containsPoint( const Point3F &point ) const;
|
||||
|
||||
// SceneZoneSpace.
|
||||
virtual U32 getPointZone( const Point3F &p ) const;
|
||||
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
|
||||
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
|
||||
};
|
||||
|
||||
#endif //_SCENEROOTZONE_H_
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class SceneSimpleZone : public SceneZoneSpace
|
|||
virtual void _updateOrientedWorldBox() { mOrientedWorldBox.set( getTransform(), getScale() ); }
|
||||
|
||||
// SceneObject.
|
||||
virtual bool onSceneAdd();
|
||||
bool onSceneAdd() override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -115,24 +115,24 @@ class SceneSimpleZone : public SceneZoneSpace
|
|||
/// @{
|
||||
|
||||
// SimObject.
|
||||
virtual String describeSelf() const;
|
||||
String describeSelf() const override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
// NetObject
|
||||
virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
|
||||
virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
|
||||
U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
|
||||
void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
|
||||
|
||||
// SceneObject
|
||||
virtual void prepRenderImage( SceneRenderState* state );
|
||||
virtual void setTransform( const MatrixF& mat );
|
||||
void prepRenderImage( SceneRenderState* state ) override;
|
||||
void setTransform( const MatrixF& mat ) override;
|
||||
|
||||
// SceneZoneSpace.
|
||||
virtual U32 getPointZone( const Point3F &p );
|
||||
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
|
||||
virtual void traverseZones( SceneTraversalState* state );
|
||||
virtual bool getZoneAmbientLightColor( U32 zone, LinearColorF& outColor ) const;
|
||||
virtual void traverseZones( SceneTraversalState* state, U32 startZoneId );
|
||||
U32 getPointZone( const Point3F &p ) override;
|
||||
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
|
||||
void traverseZones( SceneTraversalState* state ) override;
|
||||
bool getZoneAmbientLightColor( U32 zone, LinearColorF& outColor ) const override;
|
||||
void traverseZones( SceneTraversalState* state, U32 startZoneId ) override;
|
||||
|
||||
/// @}
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ class SceneZoneSpace : public SceneSpace
|
|||
/// @}
|
||||
|
||||
// SceneObject.
|
||||
virtual void onSceneRemove();
|
||||
void onSceneRemove() override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -282,13 +282,13 @@ class SceneZoneSpace : public SceneSpace
|
|||
/// @}
|
||||
|
||||
// SimObject.
|
||||
virtual bool writeField( StringTableEntry fieldName, const char* value );
|
||||
bool writeField( StringTableEntry fieldName, const char* value ) override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
// NetObject.
|
||||
virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
|
||||
virtual void unpackUpdate( NetConnection* connection, BitStream* stream );
|
||||
U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
|
||||
void unpackUpdate( NetConnection* connection, BitStream* stream ) override;
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue