TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rest of virtuals removed

Browse source 
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:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/environment/VolumetricFog.h
View file

@ -205,8 +205,8 @@ class VolumetricFog : public SceneObject
protected:
// Protected methods
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
void handleResize(VolumetricFogRTManager *RTM, bool resize);
void handleCanvasResize(GuiCanvas* canvas);
@ -215,7 +215,7 @@ class VolumetricFog : public SceneObject
void InitTexture();
bool UpdateBuffers(U32 dl,bool force=true);
void processTick(const Move *move);
void processTick(const Move *move) override;
void _enterFog(ShapeBase *control);
void _leaveFog(ShapeBase *control);
@ -229,12 +229,12 @@ class VolumetricFog : public SceneObject
~VolumetricFog();
static void initPersistFields();
virtual void inspectPostApply();
void inspectPostApply() 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 render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
void reflect_render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);

4
Engine/source/environment/VolumetricFogRTManager.h
View file

@ -62,8 +62,8 @@ class VolumetricFogRTManager : public SceneObject
U32 mWidth;
U32 mHeight;
void onRemove();
void onSceneRemove();
void onRemove() override;
void onSceneRemove() override;
void ResizeRT(WindowId did, S32 width, S32 height);
static VolumetricFogRTMResizeSignal smVolumetricFogRTMResizeSignal;

12
Engine/source/environment/basicClouds.h
View file

@ -68,17 +68,17 @@ public:
DECLARE_CATEGORY("Environment \t Weather");
// ConsoleObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
virtual void inspectPostApply();
void inspectPostApply() override;
// 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 );
void prepRenderImage( SceneRenderState *state ) override;
void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );
protected:

12
Engine/source/environment/cloudLayer.h
View file

@ -71,17 +71,17 @@ public:
DECLARE_CATEGORY("Environment \t Weather");
// ConsoleObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
virtual void inspectPostApply();
void inspectPostApply() override;
// 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
void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );
void onImageChanged() {}

10
Engine/source/environment/decalRoad.cpp
View file

@ -75,11 +75,11 @@ public:
DecalRoadNodeEvent() { mNodeList = NULL; }
virtual ~DecalRoadNodeEvent() { }
virtual void pack(NetConnection*, BitStream*);
virtual void unpack(NetConnection*, BitStream*);
void pack(NetConnection*, BitStream*) override;
void unpack(NetConnection*, BitStream*) override;
virtual void copyIntoList(NodeListManager::NodeList* copyInto);
virtual void padListToSize();
void copyIntoList(NodeListManager::NodeList* copyInto) override;
void padListToSize() override;
DECLARE_CONOBJECT(DecalRoadNodeEvent);
};
@ -192,7 +192,7 @@ public:
DecalRoadNodeListNotify( DecalRoad* road, U32 listId ) { mRoad = road; mListId = listId; }
virtual ~DecalRoadNodeListNotify() { mRoad = NULL; }
virtual void sendNotification( NodeListManager::NodeList* list );
void sendNotification( NodeListManager::NodeList* list ) override;
};
void DecalRoadNodeListNotify::sendNotification( NodeListManager::NodeList* list )

28
Engine/source/environment/decalRoad.h
View file

@ -51,7 +51,7 @@ class DecalRoadUpdateEvent : public SimEvent
public:
DecalRoadUpdateEvent( U32 mask, U32 ms ) { mMask = mask; mMs = ms; }
virtual void process( SimObject *object );
void process( SimObject *object ) override;
U32 mMask;
U32 mMs;
@ -161,23 +161,23 @@ public:
static void consoleInit();
// SimObject
bool onAdd();
void onRemove();
void onEditorEnable();
void onEditorDisable();
void inspectPostApply();
void onStaticModified(const char* slotName, const char*newValue = NULL);
void writeFields(Stream &stream, U32 tabStop);
bool writeField( StringTableEntry fieldname, const char *value );
bool onAdd() override;
void onRemove() override;
void onEditorEnable() override;
void onEditorDisable() override;
void inspectPostApply() override;
void onStaticModified(const char* slotName, const char*newValue = NULL) override;
void writeFields(Stream &stream, U32 tabStop) override;
bool writeField( StringTableEntry fieldname, const char *value ) override;
// NetObject
U32 packUpdate(NetConnection *, U32, BitStream *);
void unpackUpdate(NetConnection *, BitStream *);
U32 packUpdate(NetConnection *, U32, BitStream *) override;
void unpackUpdate(NetConnection *, BitStream *) override;
// SceneObject
virtual void prepRenderImage( SceneRenderState* state );
virtual void setTransform( const MatrixF &mat );
virtual void setScale( const VectorF &scale );
void prepRenderImage( SceneRenderState* state ) override;
void setTransform( const MatrixF &mat ) override;
void setScale( const VectorF &scale ) override;
virtual bool containsPoint( const Point3F& point ) const { return containsPoint( point, NULL ); }
// fxRoad Public Methods

32
Engine/source/environment/editors/guiMeshRoadEditorCtrl.h
View file

@ -63,25 +63,25 @@ class GuiMeshRoadEditorCtrl : public EditTSCtrl
DECLARE_CONOBJECT(GuiMeshRoadEditorCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// GuiControl
virtual void onSleep();
void onSleep() override;
// EditTSCtrl
bool onKeyDown(const GuiEvent& event);
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void on3DMouseDown(const Gui3DMouseEvent & event);
void on3DMouseUp(const Gui3DMouseEvent & event);
void on3DMouseMove(const Gui3DMouseEvent & event);
void on3DMouseDragged(const Gui3DMouseEvent & event);
void on3DMouseEnter(const Gui3DMouseEvent & event);
void on3DMouseLeave(const Gui3DMouseEvent & event);
void on3DRightMouseDown(const Gui3DMouseEvent & event);
void on3DRightMouseUp(const Gui3DMouseEvent & event);
void updateGuiInfo();
void renderScene(const RectI & updateRect);
bool onKeyDown(const GuiEvent& event) override;
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void on3DMouseDown(const Gui3DMouseEvent & event) override;
void on3DMouseUp(const Gui3DMouseEvent & event) override;
void on3DMouseMove(const Gui3DMouseEvent & event) override;
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
void updateGuiInfo() override;
void renderScene(const RectI & updateRect) override;
// GuiRiverEditorCtrl
bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
@ -189,8 +189,8 @@ class GuiMeshRoadEditorUndoAction : public UndoAction
SimObjectId mObjId;
F32 mMetersPerSegment;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
#endif // _GUIMESHROADEDITORCTRL_H_

34
Engine/source/environment/editors/guiRiverEditorCtrl.h
View file

@ -68,26 +68,26 @@ class GuiRiverEditorCtrl : public EditTSCtrl
DECLARE_CONOBJECT(GuiRiverEditorCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// GuiControl
virtual void onSleep();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onSleep() override;
void onRender(Point2I offset, const RectI &updateRect) override;
// EditTSCtrl
bool onKeyDown(const GuiEvent& event);
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void on3DMouseDown(const Gui3DMouseEvent & event);
void on3DMouseUp(const Gui3DMouseEvent & event);
void on3DMouseMove(const Gui3DMouseEvent & event);
void on3DMouseDragged(const Gui3DMouseEvent & event);
void on3DMouseEnter(const Gui3DMouseEvent & event);
void on3DMouseLeave(const Gui3DMouseEvent & event);
void on3DRightMouseDown(const Gui3DMouseEvent & event);
void on3DRightMouseUp(const Gui3DMouseEvent & event);
void updateGuiInfo();
void renderScene(const RectI & updateRect);
bool onKeyDown(const GuiEvent& event) override;
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void on3DMouseDown(const Gui3DMouseEvent & event) override;
void on3DMouseUp(const Gui3DMouseEvent & event) override;
void on3DMouseMove(const Gui3DMouseEvent & event) override;
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
void updateGuiInfo() override;
void renderScene(const RectI & updateRect) override;
// GuiRiverEditorCtrl
bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
@ -195,8 +195,8 @@ class GuiRiverEditorUndoAction : public UndoAction
F32 mMetersPerSegment;
U32 mSegmentsPerBatch;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
#endif

36
Engine/source/environment/editors/guiRoadEditorCtrl.h
View file

@ -59,27 +59,27 @@ class GuiRoadEditorCtrl : public EditTSCtrl
DECLARE_CONOBJECT(GuiRoadEditorCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// GuiControl
virtual void onSleep();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onSleep() override;
void onRender(Point2I offset, const RectI &updateRect) override;
// EditTSCtrl
bool onKeyDown(const GuiEvent& event);
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void on3DMouseDown(const Gui3DMouseEvent & event);
void on3DMouseUp(const Gui3DMouseEvent & event);
void on3DMouseMove(const Gui3DMouseEvent & event);
void on3DMouseDragged(const Gui3DMouseEvent & event);
void on3DMouseEnter(const Gui3DMouseEvent & event);
void on3DMouseLeave(const Gui3DMouseEvent & event);
void on3DRightMouseDown(const Gui3DMouseEvent & event);
void on3DRightMouseUp(const Gui3DMouseEvent & event);
void updateGuiInfo();
void renderScene(const RectI & updateRect);
void renderGui(Point2I offset, const RectI &updateRect);
bool onKeyDown(const GuiEvent& event) override;
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void on3DMouseDown(const Gui3DMouseEvent & event) override;
void on3DMouseUp(const Gui3DMouseEvent & event) override;
void on3DMouseMove(const Gui3DMouseEvent & event) override;
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
void updateGuiInfo() override;
void renderScene(const RectI & updateRect) override;
void renderGui(Point2I offset, const RectI &updateRect) override;
bool getTerrainPos( const Gui3DMouseEvent & event, Point3F &tpos );
void deleteSelectedNode();
@ -165,8 +165,8 @@ class GuiRoadEditorUndoAction : public UndoAction
U32 mSegmentsPerBatch;
F32 mTextureLength;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
#endif

10
Engine/source/environment/meshRoad.cpp
View file

@ -120,11 +120,11 @@ public:
MeshRoadNodeEvent() { mNodeList = NULL; }
virtual ~MeshRoadNodeEvent() { }
virtual void pack(NetConnection*, BitStream*);
virtual void unpack(NetConnection*, BitStream*);
void pack(NetConnection*, BitStream*) override;
void unpack(NetConnection*, BitStream*) override;
virtual void copyIntoList(NodeListManager::NodeList* copyInto);
virtual void padListToSize();
void copyIntoList(NodeListManager::NodeList* copyInto) override;
void padListToSize() override;
DECLARE_CONOBJECT(MeshRoadNodeEvent);
};
@ -253,7 +253,7 @@ public:
MeshRoadNodeListNotify( MeshRoad* road, U32 listId ) { mRoad = road; mListId = listId; }
virtual ~MeshRoadNodeListNotify() { mRoad = NULL; }
virtual void sendNotification( NodeListManager::NodeList* list );
void sendNotification( NodeListManager::NodeList* list ) override;
};
void MeshRoadNodeListNotify::sendNotification( NodeListManager::NodeList* list )

46
Engine/source/environment/meshRoad.h
View file

@ -166,12 +166,12 @@ public:
box = cv.box;
}
const MatrixF& getTransform() const;
Box3F getBoundingBox() const;
Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const;
Point3F support(const VectorF& vec) const;
void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
void getPolyList(AbstractPolyList* list);
const MatrixF& getTransform() const override;
Box3F getBoundingBox() const override;
Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override;
Point3F support(const VectorF& vec) const override;
void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
void getPolyList(AbstractPolyList* list) override;
};
@ -516,29 +516,29 @@ public:
static void consoleInit();
// SimObject
bool onAdd();
void onRemove();
void onEditorEnable();
void onEditorDisable();
void inspectPostApply();
void onStaticModified(const char* slotName, const char*newValue = NULL);
void writeFields(Stream &stream, U32 tabStop);
bool writeField( StringTableEntry fieldname, const char *value );
bool onAdd() override;
void onRemove() override;
void onEditorEnable() override;
void onEditorDisable() override;
void inspectPostApply() override;
void onStaticModified(const char* slotName, const char*newValue = NULL) override;
void writeFields(Stream &stream, U32 tabStop) override;
bool writeField( StringTableEntry fieldname, const char *value ) override;
// NetObject
U32 packUpdate(NetConnection *, U32, BitStream *);
void unpackUpdate(NetConnection *, BitStream *);
U32 packUpdate(NetConnection *, U32, BitStream *) override;
void unpackUpdate(NetConnection *, BitStream *) override;
// SceneObject
virtual void prepRenderImage( SceneRenderState* sceneState );
virtual void setTransform( const MatrixF &mat );
virtual void setScale( const VectorF &scale );
void prepRenderImage( SceneRenderState* sceneState ) override;
void setTransform( const MatrixF &mat ) override;
void setScale( const VectorF &scale ) override;
// SceneObject - Collision
virtual void buildConvex(const Box3F& box,Convex* convex);
virtual bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
virtual bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
virtual bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info);
void buildConvex(const Box3F& box,Convex* convex) override;
bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info) override;
// MeshRoad
void regenerate();

8
Engine/source/environment/nodeListManager.h
View file

@ -118,10 +118,10 @@ public:
NodeListEvent() { mId = 0; mNodeList = NULL; mTotalNodes = mLocalListStart = 0; }
virtual ~NodeListEvent();
virtual void pack(NetConnection*, BitStream*);
virtual void write(NetConnection*, BitStream*);
virtual void unpack(NetConnection*, BitStream*);
virtual void process(NetConnection*);
void pack(NetConnection*, BitStream*) override;
void write(NetConnection*, BitStream*) override;
void unpack(NetConnection*, BitStream*) override;
void process(NetConnection*) override;
virtual void mergeLists(NodeListManager::NodeList* oldList);
virtual void copyIntoList(NodeListManager::NodeList* copyInto) { }

10
Engine/source/environment/river.cpp
View file

@ -134,11 +134,11 @@ public:
RiverNodeEvent() { mNodeList = NULL; }
virtual ~RiverNodeEvent() { }
virtual void pack(NetConnection*, BitStream*);
virtual void unpack(NetConnection*, BitStream*);
void pack(NetConnection*, BitStream*) override;
void unpack(NetConnection*, BitStream*) override;
virtual void copyIntoList(NodeListManager::NodeList* copyInto);
virtual void padListToSize();
void copyIntoList(NodeListManager::NodeList* copyInto) override;
void padListToSize() override;
DECLARE_CONOBJECT(RiverNodeEvent);
};
@ -266,7 +266,7 @@ public:
RiverNodeListNotify( River* river, U32 listId ) { mRiver = river; mListId = listId; }
virtual ~RiverNodeListNotify() { mRiver = NULL; }
virtual void sendNotification( NodeListManager::NodeList* list );
void sendNotification( NodeListManager::NodeList* list ) override;
};
void RiverNodeListNotify::sendNotification( NodeListManager::NodeList* list )

42
Engine/source/environment/river.h
View file

@ -387,33 +387,33 @@ public:
static void consoleInit();
// SimObject
bool onAdd();
void onRemove();
void inspectPostApply();
void onStaticModified(const char* slotName, const char*newValue = NULL);
void writeFields(Stream &stream, U32 tabStop);
bool writeField( StringTableEntry fieldname, const char *value );
bool onAdd() override;
void onRemove() override;
void inspectPostApply() override;
void onStaticModified(const char* slotName, const char*newValue = NULL) override;
void writeFields(Stream &stream, U32 tabStop) override;
bool writeField( StringTableEntry fieldname, const char *value ) override;
// NetObject
U32 packUpdate(NetConnection *, U32, BitStream *);
void unpackUpdate(NetConnection *, BitStream *);
U32 packUpdate(NetConnection *, U32, BitStream *) override;
void unpackUpdate(NetConnection *, BitStream *) override;
// SceneObject
virtual void setTransform( const MatrixF &mat );
virtual void setScale( const VectorF &scale );
virtual bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
virtual bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info);
void setTransform( const MatrixF &mat ) override;
void setScale( const VectorF &scale ) override;
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info) override;
virtual bool containsPoint( const Point3F& point ) const { return containsPoint( point, NULL ); }
virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere );
bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override;
// WaterObject
virtual F32 getWaterCoverage( const Box3F &worldBox ) const;
virtual F32 getSurfaceHeight( const Point2F &pos ) const;
virtual VectorF getFlow( const Point3F &pos ) const;
F32 getWaterCoverage( const Box3F &worldBox ) const override;
F32 getSurfaceHeight( const Point2F &pos ) const override;
VectorF getFlow( const Point3F &pos ) const override;
virtual void onReflectionInfoChanged();
virtual void updateUnderwaterEffect( SceneRenderState *state );
void updateUnderwaterEffect( SceneRenderState *state ) override;
virtual bool isUnderwater( const Point3F &pnt ) const;
bool isUnderwater( const Point3F &pnt ) const override;
F32 distanceToSurface( const Point3F &pnt, U32 segmentIdx );
bool containsPoint( const Point3F &worldPos, U32 *nodeIdx ) const;
@ -487,9 +487,9 @@ protected:
bool _getTerrainHeight( F32 x, F32 y, F32 &height );
// WaterObject
virtual void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams &paramHandles );
virtual void innerRender( SceneRenderState *state );
virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos );
void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams &paramHandles ) override;
void innerRender( SceneRenderState *state ) override;
void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override;
protected:

20
Engine/source/environment/scatterSky.h
View file

@ -76,24 +76,24 @@ public:
~ScatterSky();
// SimObject
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
// ISceneLight
virtual void submitLights( LightManager *lm, bool staticLighting );
virtual LightInfo* getLight() { return mLight; }
void submitLights( LightManager *lm, bool staticLighting ) override;
LightInfo* getLight() override { return mLight; }
// ConsoleObject
DECLARE_CONOBJECT(ScatterSky);
DECLARE_CATEGORY("Environment \t Background");
void inspectPostApply();
void inspectPostApply() override;
static void initPersistFields();
// Network
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 setAzimuth( F32 azimuth );
@ -158,8 +158,8 @@ protected:
static bool ptSetAzimuth( void *object, const char *index, const char *data );
// SimObject.
virtual void _onSelected();
virtual void _onUnselected();
void _onSelected() override;
void _onUnselected() override;
protected:

14
Engine/source/environment/skyBox.h
View file

@ -78,20 +78,20 @@ public:
DECLARE_CATEGORY("Environment \t Background");
// SimObject
void onStaticModified( const char *slotName, const char *newValue );
void onStaticModified( const char *slotName, const char *newValue ) override;
// ConsoleObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
virtual void inspectPostApply();
void inspectPostApply() override;
// 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
void prepRenderImage( SceneRenderState* state );
void prepRenderImage( SceneRenderState* state ) override;
/// Our render delegate.
void _renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );

14
Engine/source/environment/skySphere.h
View file

@ -69,20 +69,20 @@ public:
DECLARE_CATEGORY("Environment \t Background");
// SimObject
void onStaticModified(const char* slotName, const char* newValue);
void onStaticModified(const char* slotName, const char* newValue) override;
// ConsoleObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
virtual void inspectPostApply();
void inspectPostApply() override;
// 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
void prepRenderImage(SceneRenderState* state);
void prepRenderImage(SceneRenderState* state) override;
/// Our render delegate.
void _renderObject(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* mi);

22
Engine/source/environment/sun.h
View file

@ -98,8 +98,8 @@ protected:
void _updateTimeOfDay( TimeOfDay *timeOfDay, F32 time );
// SimObject.
virtual void _onSelected();
virtual void _onUnselected();
void _onSelected() override;
void _onUnselected() override;
enum NetMaskBits
{
@ -112,28 +112,28 @@ public:
virtual ~Sun();
// SimObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
// ConsoleObject
DECLARE_CONOBJECT(Sun);
DECLARE_CATEGORY("Lighting \t Lights");
static void initPersistFields();
void inspectPostApply();
void inspectPostApply() override;
// 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;
// ISceneLight
virtual void submitLights( LightManager *lm, bool staticLighting );
virtual LightInfo* getLight() { return mLight; }
void submitLights( LightManager *lm, bool staticLighting ) override;
LightInfo* getLight() override { return mLight; }
// SceneObject
virtual void prepRenderImage( SceneRenderState* state );
void prepRenderImage( SceneRenderState* state ) override;
// ProcessObject
virtual void advanceTime( F32 dt );
void advanceTime( F32 dt ) override;
///
void setAzimuth( F32 azimuth );

12
Engine/source/environment/timeOfDay.h
View file

@ -77,18 +77,18 @@ public:
static void consoleInit();
DECLARE_CONOBJECT( TimeOfDay );
DECLARE_CATEGORY("Environment \t Weather");
void inspectPostApply();
void inspectPostApply() override;
// SimObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
// 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;
// ProcessObject
virtual void processTick( const Move *move );
void processTick( const Move *move ) override;
F32 getAzimuthRads() { return mAzimuth; }
F32 getElevationRads() { return mElevation; }

34
Engine/source/environment/waterPlane.h
View file

@ -92,10 +92,10 @@ private:
Frustum mFrustum;
SceneData setupSceneGraphInfo( SceneRenderState *state );
void setShaderParams( SceneRenderState *state, BaseMatInstance* mat, const WaterMatParams& paramHandles );
void setShaderParams( SceneRenderState *state, BaseMatInstance* mat, const WaterMatParams& paramHandles ) override;
void setupVBIB( SceneRenderState *state );
virtual void prepRenderImage( SceneRenderState *state );
virtual void innerRender( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
void innerRender( SceneRenderState *state ) override;
void setMultiPassProjection();
protected:
@ -103,11 +103,11 @@ protected:
//-------------------------------------------------------
// Standard engine functions
//-------------------------------------------------------
bool onAdd();
void onRemove();
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
bool onAdd() override;
void onRemove() override;
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
public:
WaterPlane();
@ -116,17 +116,17 @@ public:
DECLARE_CONOBJECT(WaterPlane);
static void initPersistFields();
void onStaticModified( const char* slotName, const char*newValue = NULL );
virtual void inspectPostApply();
virtual void setTransform( const MatrixF & mat );
virtual F32 distanceTo( const Point3F& point ) const;
virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere );
void onStaticModified( const char* slotName, const char*newValue = NULL ) override;
void inspectPostApply() override;
void setTransform( const MatrixF & mat ) override;
F32 distanceTo( const Point3F& point ) const override;
bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override;
// WaterObject
virtual F32 getWaterCoverage( const Box3F &worldBox ) const;
virtual F32 getSurfaceHeight( const Point2F &pos ) const;
F32 getWaterCoverage( const Box3F &worldBox ) const override;
F32 getSurfaceHeight( const Point2F &pos ) const override;
virtual void onReflectionInfoChanged();
virtual bool isUnderwater( const Point3F &pnt ) const;
bool isUnderwater( const Point3F &pnt ) const override;
// WaterBlock
bool isPointSubmerged ( const Point3F &pos, bool worldSpace = true ) const{ return true; }
@ -142,7 +142,7 @@ public:
protected:
// WaterObject
virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos );
void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override;
};
#endif // _WATERPLANE_H_