diff --git a/Engine/lib/.clang-tidy b/Engine/lib/.clang-tidy new file mode 100644 index 000000000..a81863691 --- /dev/null +++ b/Engine/lib/.clang-tidy @@ -0,0 +1,5 @@ +--- +Checks: '-*' +WarningsAsErrors: '' +HeaderFilterRegex: '.*' +FormatStyle: 'file' diff --git a/Engine/source/T3D/Scene.h b/Engine/source/T3D/Scene.h index 3a912b4ea..c3781afb2 100644 --- a/Engine/source/T3D/Scene.h +++ b/Engine/source/T3D/Scene.h @@ -52,16 +52,16 @@ public: static bool _editPostEffects(void* object, const char* index, const char* data); - virtual bool onAdd(); - virtual void onRemove(); - virtual void onPostAdd(); + bool onAdd() override; + void onRemove() override; + void onPostAdd() override; - virtual void interpolateTick(F32 delta); - virtual void processTick(); - virtual void advanceTime(F32 timeDelta); + void interpolateTick(F32 delta) override; + void processTick() override; + void advanceTime(F32 timeDelta) override; - virtual void addObject(SimObject* object); - virtual void removeObject(SimObject* object); + void addObject(SimObject* object) override; + void removeObject(SimObject* object) override; void addDynamicObject(SceneObject* object); void removeDynamicObject(SceneObject* object); @@ -76,8 +76,8 @@ public: // //Networking - 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; // Vector getObjectsByClass(String className, bool checkSubscenes); diff --git a/Engine/source/T3D/accumulationVolume.h b/Engine/source/T3D/accumulationVolume.h index 85b78cb53..66b2c8a31 100644 --- a/Engine/source/T3D/accumulationVolume.h +++ b/Engine/source/T3D/accumulationVolume.h @@ -59,7 +59,7 @@ class AccumulationVolume : public ScenePolyhedralSpace mutable Vector< SceneObject* > mVolumeQueryList; // SceneSpace. - virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ); + void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override; DECLARE_IMAGEASSET(AccumulationVolume, Texture, onTextureChanged, GFXStaticTextureSRGBProfile); DECLARE_ASSET_NET_SETGET(AccumulationVolume, Texture, -1); @@ -76,9 +76,9 @@ class AccumulationVolume : public ScenePolyhedralSpace DECLARE_DESCRIPTION( "Allows objects in an area to have accumulation effect applied." ); DECLARE_CATEGORY("Volume"); - virtual bool onAdd(); - virtual void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; void setTexture( const String& name ); // Static Functions. @@ -93,12 +93,12 @@ class AccumulationVolume : public ScenePolyhedralSpace static void updateObject(SceneObject* object); // Network - U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *, BitStream *stream ); + U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ) override; + void unpackUpdate( NetConnection *, BitStream *stream ) override; // SceneObject. - virtual void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ); - virtual void setTransform( const MatrixF& mat ); + void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ) override; + void setTransform( const MatrixF& mat ) override; }; #endif // !_AccumulationVolume_H_ diff --git a/Engine/source/T3D/aiClient.h b/Engine/source/T3D/aiClient.h index be185db45..b65f88f95 100644 --- a/Engine/source/T3D/aiClient.h +++ b/Engine/source/T3D/aiClient.h @@ -82,7 +82,7 @@ class AIClient : public AIConnection { AIClient(); ~AIClient(); - U32 getMoveList( Move **movePtr,U32 *numMoves ); + U32 getMoveList( Move **movePtr,U32 *numMoves ) override; // ---Targeting and aiming sets/gets void setTargetObject( ShapeBase *targetObject ); diff --git a/Engine/source/T3D/aiPlayer.h b/Engine/source/T3D/aiPlayer.h index adeb3a009..1274de0b8 100644 --- a/Engine/source/T3D/aiPlayer.h +++ b/Engine/source/T3D/aiPlayer.h @@ -157,11 +157,11 @@ public: static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - virtual bool getAIMove( Move *move ); - virtual void updateMove(const Move *move); + bool getAIMove( Move *move ) override; + void updateMove(const Move *move) override; /// Clear out the current path. void clearPath(); /// Stop searching for cover. @@ -176,7 +176,7 @@ public: void setAimLocation( const Point3F &location ); Point3F getAimLocation() const { return mAimLocation; } void clearAim(); - void getMuzzleVector(U32 imageSlot,VectorF* vec); + void getMuzzleVector(U32 imageSlot,VectorF* vec) override; bool checkInLos(GameBase* target = NULL, bool _useMuzzle = false, bool _checkEnabled = false); bool checkInFoV(GameBase* target = NULL, F32 camFov = 45.0f, bool _checkEnabled = false); F32 getTargetDistance(GameBase* target, bool _checkEnabled); diff --git a/Engine/source/T3D/assets/CppAsset.h b/Engine/source/T3D/assets/CppAsset.h index 3211eab77..40ad8ebfc 100644 --- a/Engine/source/T3D/assets/CppAsset.h +++ b/Engine/source/T3D/assets/CppAsset.h @@ -55,7 +55,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(CppAsset); @@ -67,8 +67,8 @@ public: inline StringTableEntry getHeaderFile(void) const { return mHeaderFile; }; protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setCppFile(void *obj, const char *index, const char *data) { static_cast(obj)->setCppFile(data); return false; } static const char* getCppFile(void* obj, const char* data) { return static_cast(obj)->getCppFile(); } diff --git a/Engine/source/T3D/assets/CubemapAsset.h b/Engine/source/T3D/assets/CubemapAsset.h index 095aee68c..bb0a17d6a 100644 --- a/Engine/source/T3D/assets/CubemapAsset.h +++ b/Engine/source/T3D/assets/CubemapAsset.h @@ -61,12 +61,12 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(CubemapAsset); - StringTableEntry getComponentName() { return mComponentName; } + StringTableEntry getComponentName() override { return mComponentName; } StringTableEntry getComponentClass() { return mComponentClass; } StringTableEntry getFriendlyName() { return mFriendlyName; } StringTableEntry getComponentType() { return mComponentType; } @@ -84,8 +84,8 @@ public: inline StringTableEntry getScriptFile(void) const { return mScriptFile; }; protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast(obj)->setScriptFile(data); return false; } static const char* getScriptFile(void* obj, const char* data) { return static_cast(obj)->getScriptFile(); } @@ -106,8 +106,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeCubemapAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; #endif #endif // _ASSET_BASE_H_ diff --git a/Engine/source/T3D/assets/ExampleAsset.h b/Engine/source/T3D/assets/ExampleAsset.h index b3a5a7695..2a6efa5a3 100644 --- a/Engine/source/T3D/assets/ExampleAsset.h +++ b/Engine/source/T3D/assets/ExampleAsset.h @@ -49,14 +49,14 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(ExampleAsset); protected: - virtual void initializeAsset(void) {} - virtual void onAssetRefresh(void) {} + void initializeAsset(void) override {} + void onAssetRefresh(void) override {} }; DefineConsoleType(TypeExampleAssetPtr, ExampleAsset) diff --git a/Engine/source/T3D/assets/GUIAsset.h b/Engine/source/T3D/assets/GUIAsset.h index 439b79c95..9b1b1363d 100644 --- a/Engine/source/T3D/assets/GUIAsset.h +++ b/Engine/source/T3D/assets/GUIAsset.h @@ -58,7 +58,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; static StringTableEntry getAssetIdByGUIName(StringTableEntry guiName); @@ -74,8 +74,8 @@ public: inline StringTableEntry getScriptPath(void) const { return mScriptPath; }; protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setGUIFile(void *obj, const char *index, const char *data) { static_cast(obj)->setGUIFile(data); return false; } static const char* getGUIFile(void* obj, const char* data) { return static_cast(obj)->getGUIFile(); } @@ -99,8 +99,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeGUIAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; #endif #endif // _ASSET_BASE_H_ diff --git a/Engine/source/T3D/assets/GameObjectAsset.h b/Engine/source/T3D/assets/GameObjectAsset.h index bad53d6b9..e4d1f71c1 100644 --- a/Engine/source/T3D/assets/GameObjectAsset.h +++ b/Engine/source/T3D/assets/GameObjectAsset.h @@ -59,7 +59,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; const char* create(); @@ -72,8 +72,8 @@ public: inline StringTableEntry getTAMLFile(void) const { return mTAMLFile; }; protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast(obj)->setScriptFile(data); return false; } static const char* getScriptFile(void* obj, const char* data) { return static_cast(obj)->getScriptFile(); } @@ -100,8 +100,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeGameObjectAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; #endif #endif // _ASSET_BASE_H_ diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index c7e8e3708..3c5786d06 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -131,7 +131,7 @@ const String ImageAsset::mErrCodeStrings[] = "UnKnown" }; //----------------------------------------------------------------------------- -ImageAsset::ImageAsset() : AssetBase(), mUseMips(true), mIsHDRImage(false), mIsValidImage(false), mImageType(Albedo) +ImageAsset::ImageAsset() : AssetBase(), mIsValidImage(false), mUseMips(true), mIsHDRImage(false), mImageType(Albedo) { mImageFileName = StringTable->EmptyString(); mImagePath = StringTable->EmptyString(); diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index d5b3b0b48..6849a5a87 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -119,7 +119,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(ImageAsset); @@ -154,8 +154,8 @@ public: U32 load(); protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setImageFileName(void* obj, StringTableEntry index, StringTableEntry data) { static_cast(obj)->setImageFileName(data); return false; } static StringTableEntry getImageFileName(void* obj, StringTableEntry data) { return static_cast(obj)->getImageFileName(); } diff --git a/Engine/source/T3D/assets/ImageAssetInspectors.h b/Engine/source/T3D/assets/ImageAssetInspectors.h index 5c4a38dbf..36d4a9788 100644 --- a/Engine/source/T3D/assets/ImageAssetInspectors.h +++ b/Engine/source/T3D/assets/ImageAssetInspectors.h @@ -21,11 +21,11 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeImageAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; bool renderTooltip(const Point2I& hoverPos, const Point2I& cursorPos, const char* tipText = NULL); - virtual void updateValue(); + void updateValue() override; void updatePreviewImage(); void setPreviewImage(StringTableEntry assetId); diff --git a/Engine/source/T3D/assets/LevelAsset.h b/Engine/source/T3D/assets/LevelAsset.h index 6b85bb476..b58aca4ba 100644 --- a/Engine/source/T3D/assets/LevelAsset.h +++ b/Engine/source/T3D/assets/LevelAsset.h @@ -77,7 +77,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(LevelAsset); @@ -133,8 +133,8 @@ protected: static const char* getNavmeshFile(void* obj, const char* data) { return static_cast(obj)->getNavmeshFile(); } - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; void loadAsset(); }; diff --git a/Engine/source/T3D/assets/MaterialAsset.h b/Engine/source/T3D/assets/MaterialAsset.h index 4fa868ff7..6c4d8943f 100644 --- a/Engine/source/T3D/assets/MaterialAsset.h +++ b/Engine/source/T3D/assets/MaterialAsset.h @@ -102,7 +102,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; U32 load(); @@ -130,8 +130,8 @@ public: DECLARE_CONOBJECT(MaterialAsset); protected: - virtual void initializeAsset(); - virtual void onAssetRefresh(void); + void initializeAsset() override; + void onAssetRefresh(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { @@ -160,10 +160,10 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeMaterialAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; - virtual void updateValue(); + void updateValue() override; void updatePreviewImage(); void setPreviewImage(StringTableEntry assetId); diff --git a/Engine/source/T3D/assets/ParticleAsset.h b/Engine/source/T3D/assets/ParticleAsset.h index 9a94348df..99d854327 100644 --- a/Engine/source/T3D/assets/ParticleAsset.h +++ b/Engine/source/T3D/assets/ParticleAsset.h @@ -55,14 +55,14 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(ParticleAsset); protected: - virtual void initializeAsset(void) {} - virtual void onAssetRefresh(void) {} + void initializeAsset(void) override {} + void onAssetRefresh(void) override {} }; DefineConsoleType(TypeParticleAssetPtr, ParticleAsset) @@ -81,8 +81,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeParticleAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; #endif #endif // _ASSET_BASE_H_ diff --git a/Engine/source/T3D/assets/PostEffectAsset.h b/Engine/source/T3D/assets/PostEffectAsset.h index 7ffa36e3c..2fb942230 100644 --- a/Engine/source/T3D/assets/PostEffectAsset.h +++ b/Engine/source/T3D/assets/PostEffectAsset.h @@ -60,7 +60,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; void setScriptFile(const char* pScriptFile); inline StringTableEntry getScriptFile(void) const { return mScriptFile; }; @@ -78,8 +78,8 @@ public: DECLARE_CONOBJECT(PostEffectAsset); protected: - virtual void initializeAsset(); - virtual void onAssetRefresh(void); + void initializeAsset() override; + void onAssetRefresh(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast(obj)->setScriptFile(data); return false; } static const char* getScriptFile(void* obj, const char* data) { return static_cast(obj)->getScriptFile(); } diff --git a/Engine/source/T3D/assets/ScriptAsset.h b/Engine/source/T3D/assets/ScriptAsset.h index 392080ef7..5373a6314 100644 --- a/Engine/source/T3D/assets/ScriptAsset.h +++ b/Engine/source/T3D/assets/ScriptAsset.h @@ -60,7 +60,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(ScriptAsset); @@ -77,9 +77,9 @@ public: DECLARE_CALLBACK(void, onUnloadAsset, ()); protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); - virtual void unloadAsset(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; + void unloadAsset(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast(obj)->setScriptFile(data); return false; } static const char* getScriptFile(void* obj, const char* data) { return static_cast(obj)->getScriptFile(); } diff --git a/Engine/source/T3D/assets/ShapeAnimationAsset.h b/Engine/source/T3D/assets/ShapeAnimationAsset.h index ad286ccbb..1755e695d 100644 --- a/Engine/source/T3D/assets/ShapeAnimationAsset.h +++ b/Engine/source/T3D/assets/ShapeAnimationAsset.h @@ -98,7 +98,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; void setAnimationFile(const char* pAnimationFile); inline StringTableEntry getAnimationFile(void) const { return mFileName; }; @@ -109,8 +109,8 @@ public: DECLARE_CONOBJECT(ShapeAnimationAsset); protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setAnimationFile(void *obj, const char *index, const char *data) { static_cast(obj)->setAnimationFile(data); return false; } static const char* getAnimationFile(void* obj, const char* data) { return static_cast(obj)->getAnimationFile(); } diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index 29a72e2bf..650c6bdb9 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/Engine/source/T3D/assets/ShapeAsset.h @@ -123,11 +123,11 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; virtual void setDataField(StringTableEntry slotName, StringTableEntry array, StringTableEntry value); - virtual void initializeAsset(); + void initializeAsset() override; /// Declare Console Object. DECLARE_CONOBJECT(ShapeAsset); @@ -195,7 +195,7 @@ public: #endif protected: - virtual void onAssetRefresh(void); + void onAssetRefresh(void) override; static bool setShapeFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast(obj)->setShapeFile(data); return false; } static const char* getShapeFile(void* obj, const char* data) { return static_cast(obj)->getShapeFile(); } @@ -229,10 +229,10 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeShapeAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; - virtual void updateValue(); + void updateValue() override; void updatePreviewImage(); void setPreviewImage(StringTableEntry assetId); diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h index a6fda3f3f..e9f851f7b 100644 --- a/Engine/source/T3D/assets/SoundAsset.h +++ b/Engine/source/T3D/assets/SoundAsset.h @@ -147,7 +147,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; //SFXResource* getSound() { return mSoundResource; } Resource getSoundResource(const U32 slotId = 0) { load(); return mSFXProfile[slotId].getResource(); } @@ -172,9 +172,9 @@ public: static U32 getAssetByFileName(StringTableEntry fileName, AssetPtr* matAsset); protected: - virtual void initializeAsset(void); + void initializeAsset(void) override; void _onResourceChanged(const Torque::Path & path); - virtual void onAssetRefresh(void); + void onAssetRefresh(void) override; }; DefineConsoleType(TypeSoundAssetPtr, SoundAsset) diff --git a/Engine/source/T3D/assets/SoundAssetInspectors.h b/Engine/source/T3D/assets/SoundAssetInspectors.h index 6fb23fdfc..ab74516a2 100644 --- a/Engine/source/T3D/assets/SoundAssetInspectors.h +++ b/Engine/source/T3D/assets/SoundAssetInspectors.h @@ -17,8 +17,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; class GuiInspectorTypeSoundAssetId : public GuiInspectorTypeSoundAssetPtr diff --git a/Engine/source/T3D/assets/TerrainAsset.h b/Engine/source/T3D/assets/TerrainAsset.h index 991bab461..09800c37e 100644 --- a/Engine/source/T3D/assets/TerrainAsset.h +++ b/Engine/source/T3D/assets/TerrainAsset.h @@ -72,7 +72,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; virtual void setDataField(StringTableEntry slotName, const char* array, const char* value); @@ -92,8 +92,8 @@ public: DECLARE_CONOBJECT(TerrainAsset); protected: - virtual void initializeAsset(); - virtual void onAssetRefresh(void); + void initializeAsset() override; + void onAssetRefresh(void) override; static bool setTerrainFileName(void *obj, const char *index, const char *data) { static_cast(obj)->setTerrainFileName(data); return false; } static const char* getTerrainFileName(void* obj, const char* data) { return static_cast(obj)->getTerrainFileName(); } @@ -115,8 +115,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeTerrainAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; class GuiInspectorTypeTerrainAssetId : public GuiInspectorTypeTerrainAssetPtr diff --git a/Engine/source/T3D/assets/TerrainMaterialAsset.h b/Engine/source/T3D/assets/TerrainMaterialAsset.h index 107c6fc92..b5c966e54 100644 --- a/Engine/source/T3D/assets/TerrainMaterialAsset.h +++ b/Engine/source/T3D/assets/TerrainMaterialAsset.h @@ -87,7 +87,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; U32 load(); @@ -117,8 +117,8 @@ public: DECLARE_CONOBJECT(TerrainMaterialAsset); protected: - virtual void initializeAsset(); - virtual void onAssetRefresh(void); + void initializeAsset() override; + void onAssetRefresh(void) override; static bool setScriptFile(void *obj, const char *index, const char *data) { @@ -144,8 +144,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeTerrainMaterialAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; class GuiInspectorTypeTerrainMaterialAssetId : public GuiInspectorTypeTerrainMaterialAssetPtr { diff --git a/Engine/source/T3D/assets/assetImporter.h b/Engine/source/T3D/assets/assetImporter.h index 6e77ef965..001eb3b77 100644 --- a/Engine/source/T3D/assets/assetImporter.h +++ b/Engine/source/T3D/assets/assetImporter.h @@ -432,8 +432,8 @@ public: AssetImportConfig(); virtual ~AssetImportConfig(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; /// Engine. static void initPersistFields(); @@ -571,8 +571,8 @@ public: AssetImportObject(); virtual ~AssetImportObject(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; /// Engine. static void initPersistFields(); @@ -663,8 +663,8 @@ public: AssetImporter(); virtual ~AssetImporter(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; /// Engine. static void initPersistFields(); diff --git a/Engine/source/T3D/assets/stateMachineAsset.h b/Engine/source/T3D/assets/stateMachineAsset.h index d1c6cd9f1..c1ccc24cf 100644 --- a/Engine/source/T3D/assets/stateMachineAsset.h +++ b/Engine/source/T3D/assets/stateMachineAsset.h @@ -55,7 +55,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Declare Console Object. DECLARE_CONOBJECT(StateMachineAsset); @@ -66,8 +66,8 @@ public: inline StringTableEntry getStateMachinePath(void) const { return mStateMachinePath; }; protected: - virtual void initializeAsset(void); - virtual void onAssetRefresh(void); + void initializeAsset(void) override; + void onAssetRefresh(void) override; static bool setStateMachineFile(void *obj, const char *index, const char *data) { static_cast(obj)->setStateMachineFile(data); return false; } static const char* getStateMachineFile(void* obj, const char* data) { return static_cast(obj)->getStateMachineFile(); } @@ -88,8 +88,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeStateMachineAssetPtr); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; #endif #endif diff --git a/Engine/source/T3D/camera.h b/Engine/source/T3D/camera.h index e54c90ab1..5057f8a48 100644 --- a/Engine/source/T3D/camera.h +++ b/Engine/source/T3D/camera.h @@ -49,8 +49,8 @@ class CameraData: public ShapeBaseData DECLARE_DESCRIPTION( "A datablock that describes a camera." ); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -161,14 +161,14 @@ class Camera: public ShapeBase static bool _setNewtonField( void *object, const char *index, const char *data ); // ShapeBase. - virtual F32 getCameraFov(); - virtual void setCameraFov( F32 fov ); - virtual F32 getDefaultCameraFov(); - virtual bool isValidCameraFov( F32 fov ); - virtual F32 getDamageFlash() const; - virtual F32 getWhiteOut() const; - virtual void setTransform( const MatrixF& mat ); - virtual void setRenderTransform( const MatrixF& mat ); + F32 getCameraFov() override; + void setCameraFov( F32 fov ) override; + F32 getDefaultCameraFov() override; + bool isValidCameraFov( F32 fov ) override; + F32 getDamageFlash() const override; + F32 getWhiteOut() const override; + void setTransform( const MatrixF& mat ) override; + void setRenderTransform( const MatrixF& mat ) override; public: @@ -188,7 +188,7 @@ class Camera: public ShapeBase void setOrbitMode( GameBase *obj, const Point3F& pos, const Point3F& rot, const Point3F& offset, F32 minDist, F32 maxDist, F32 curDist, bool ownClientObject, bool locked = false ); void setTrackObject( GameBase *obj, const Point3F& offset); - void onDeleteNotify( SimObject* obj ); + void onDeleteNotify( SimObject* obj ) override; GameBase* getOrbitObject() { return(mOrbitObject); } bool isObservingClientObject() { return(mObservingClientObject); } @@ -197,8 +197,8 @@ class Camera: public ShapeBase /// @{ void setNewtonFlyMode(); - VectorF getVelocity() const { return mVelocity; } - void setVelocity( const VectorF& vel ); + VectorF getVelocity() const override { return mVelocity; } + void setVelocity( const VectorF& vel ) override; VectorF getAngularVelocity() const { return mAngularVelocity; } void setAngularVelocity( const VectorF& vel ); bool isRotationDamped() {return mNewtonRotation;} @@ -232,27 +232,27 @@ class Camera: public ShapeBase static void initPersistFields(); static void consoleInit(); - virtual void onEditorEnable(); - virtual void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; - virtual bool onAdd(); - virtual void onRemove(); - virtual bool onNewDataBlock( GameBaseData *dptr, bool reload ); - virtual void processTick( const Move* move ); - virtual void interpolateTick( F32 delta); - virtual void getCameraTransform( F32* pos,MatrixF* mat ); - virtual void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void processTick( const Move* move ) override; + void interpolateTick( F32 delta) override; + void getCameraTransform( F32* pos,MatrixF* mat ) override; + void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ) override; - virtual void writePacketData( GameConnection* conn, BitStream* stream ); - virtual void readPacketData( GameConnection* conn, BitStream* stream ); - virtual U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ); - virtual void unpackUpdate( NetConnection* conn, BitStream* stream ); + void writePacketData( GameConnection* conn, BitStream* stream ) override; + void readPacketData( GameConnection* conn, BitStream* stream ) override; + U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ) override; + void unpackUpdate( NetConnection* conn, BitStream* stream ) override; DECLARE_CONOBJECT( Camera ); DECLARE_CATEGORY("Actor \t Controllable"); DECLARE_DESCRIPTION( "Represents a position, direction and field of view to render a scene from." ); static F32 getMovementSpeed() { return smMovementSpeed; } - bool isCamera() const { return true; } + bool isCamera() const override { return true; } //Not yet implemented GFXTexHandle getCameraRenderTarget() { return GFXTexHandle(); } diff --git a/Engine/source/T3D/convexShape.h b/Engine/source/T3D/convexShape.h index 45a2bb551..dfe0eaea4 100644 --- a/Engine/source/T3D/convexShape.h +++ b/Engine/source/T3D/convexShape.h @@ -60,9 +60,9 @@ public: pShape = cv.pShape; } - Point3F support(const VectorF& vec) const; - void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf); - void getPolyList(AbstractPolyList* list); + Point3F support(const VectorF& vec) const override; + void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override; + void getPolyList(AbstractPolyList* list) override; }; @@ -200,25 +200,25 @@ public: static void initPersistFields(); // SimObject - virtual void inspectPostApply(); - virtual bool onAdd(); - virtual void onRemove(); - virtual void writeFields(Stream &stream, U32 tabStop); - virtual bool writeField( StringTableEntry fieldname, const char *value ); + void inspectPostApply() override; + bool onAdd() override; + void onRemove() override; + void writeFields(Stream &stream, U32 tabStop) override; + bool writeField( StringTableEntry fieldname, const char *value ) 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 onScaleChanged(); - virtual void setTransform( const MatrixF &mat ); - virtual void prepRenderImage( SceneRenderState *state ); - virtual void buildConvex( const Box3F &box, Convex *convex ); - virtual bool buildPolyList( PolyListContext context, AbstractPolyList *polyList, const Box3F &box, const SphereF &sphere ); - virtual bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &); - virtual bool castRay( const Point3F &start, const Point3F &end, RayInfo *info ); - virtual bool collideBox( const Point3F &start, const Point3F &end, RayInfo *info ); + void onScaleChanged() override; + void setTransform( const MatrixF &mat ) override; + void prepRenderImage( SceneRenderState *state ) override; + void buildConvex( const Box3F &box, Convex *convex ) override; + bool buildPolyList( PolyListContext context, AbstractPolyList *polyList, const Box3F &box, const SphereF &sphere ) override; + bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &) override; + bool castRay( const Point3F &start, const Point3F &end, RayInfo *info ) override; + bool collideBox( const Point3F &start, const Point3F &end, RayInfo *info ) override; void updateBounds( bool recenter ); diff --git a/Engine/source/T3D/debris.h b/Engine/source/T3D/debris.h index 4f896d184..a0ff99520 100644 --- a/Engine/source/T3D/debris.h +++ b/Engine/source/T3D/debris.h @@ -96,11 +96,11 @@ struct DebrisData : public GameBaseData DebrisData(); - bool onAdd(); - bool preload( bool server, String &errorStr ); + bool onAdd() override; + bool preload( bool server, String &errorStr ) override; static void initPersistFields(); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; DECLARE_CONOBJECT(DebrisData); @@ -108,8 +108,8 @@ public: /*C*/ DebrisData(const DebrisData&, bool = false); /*D*/ ~DebrisData(); DebrisData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } void onShapeChanged() {} }; @@ -152,14 +152,14 @@ private: void rotate( F32 dt ); protected: - virtual void processTick(const Move* move); - virtual void advanceTime( F32 dt ); - void prepRenderImage(SceneRenderState *state); + void processTick(const Move* move) override; + void advanceTime( F32 dt ) override; + void prepRenderImage(SceneRenderState *state) override; void prepBatchRender(SceneRenderState *state); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; void updateEmitters( Point3F &pos, Point3F &vel, U32 ms ); public: @@ -169,13 +169,13 @@ public: static void initPersistFields(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; void init( const Point3F &position, const Point3F &velocity ); void setLifetime( F32 lifetime ){ mLifetime = lifetime; } void setPartInstance( TSPartInstance *part ){ mPart = part; } void setSize( F32 size ); - void setVelocity( const Point3F &vel ){ mVelocity = vel; } + void setVelocity( const Point3F &vel ) override{ mVelocity = vel; } void setRotAngles( const Point3F &angles ){ mRotAngles = angles; } DECLARE_CONOBJECT(Debris); diff --git a/Engine/source/T3D/decal/decalData.h b/Engine/source/T3D/decal/decalData.h index 4a053f303..850aa7149 100644 --- a/Engine/source/T3D/decal/decalData.h +++ b/Engine/source/T3D/decal/decalData.h @@ -103,14 +103,14 @@ class DecalData : public SimDataBlock DECLARE_CONOBJECT(DecalData); static void initPersistFields(); - virtual void onStaticModified( const char *slotName, const char *newValue = NULL ); + void onStaticModified( const char *slotName, const char *newValue = NULL ) override; - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; - virtual bool preload( bool server, String &errorStr ); - virtual void packData( BitStream* ); - virtual void unpackData( BitStream* ); + bool preload( bool server, String &errorStr ) override; + void packData( BitStream* ) override; + void unpackData( BitStream* ) override; Material* getMaterialDefinition(); BaseMatInstance* getMaterialInstance(); @@ -118,7 +118,7 @@ class DecalData : public SimDataBlock static SimSet* getSet(); static DecalData* findDatablock( String lookupName ); - virtual void inspectPostApply(); + void inspectPostApply() override; void reloadRects(); protected: diff --git a/Engine/source/T3D/decal/decalManager.h b/Engine/source/T3D/decal/decalManager.h index 9dee7bd8a..edeef194e 100644 --- a/Engine/source/T3D/decal/decalManager.h +++ b/Engine/source/T3D/decal/decalManager.h @@ -157,7 +157,7 @@ class DecalManager : public SceneObject U32 _generateConvexHull( const Vector &points, Vector *outPoints ); // Rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; void _generateWindingOrder( const Point3F &cornerPoint, Vector *sortPoints ); @@ -180,8 +180,8 @@ class DecalManager : public SceneObject bool _createDataFile(); // SceneObject. - virtual bool onSceneAdd(); - virtual void onSceneRemove(); public: + bool onSceneAdd() override; + void onSceneRemove() override; public: public: diff --git a/Engine/source/T3D/examples/renderMeshExample.h b/Engine/source/T3D/examples/renderMeshExample.h index 45686b4a6..dd8ea12bc 100644 --- a/Engine/source/T3D/examples/renderMeshExample.h +++ b/Engine/source/T3D/examples/renderMeshExample.h @@ -99,21 +99,21 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Override this so that we can dirty the network flag when it is called - void setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); + U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate( NetConnection *conn, BitStream *stream ); + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; //-------------------------------------------------------------------------- // Object Rendering @@ -130,7 +130,7 @@ public: void updateMaterial(); // This is the function that allows this object to submit itself for rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; }; #endif // _RENDERMESHEXAMPLE_H_ diff --git a/Engine/source/T3D/examples/renderObjectExample.h b/Engine/source/T3D/examples/renderObjectExample.h index faa009602..e971dcf15 100644 --- a/Engine/source/T3D/examples/renderObjectExample.h +++ b/Engine/source/T3D/examples/renderObjectExample.h @@ -97,18 +97,18 @@ public: static void initPersistFields(); // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Override this so that we can dirty the network flag when it is called - void setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); + U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate( NetConnection *conn, BitStream *stream ); + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; //-------------------------------------------------------------------------- // Object Rendering @@ -124,7 +124,7 @@ public: void createGeometry(); // This is the function that allows this object to submit itself for rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; // This is the function that actually gets called to do the rendering // Note that there is no longer a predefined name for this function. diff --git a/Engine/source/T3D/examples/renderShapeExample.h b/Engine/source/T3D/examples/renderShapeExample.h index 2b3ccf86e..3f452c72a 100644 --- a/Engine/source/T3D/examples/renderShapeExample.h +++ b/Engine/source/T3D/examples/renderShapeExample.h @@ -88,21 +88,21 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Override this so that we can dirty the network flag when it is called - void setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); + U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate( NetConnection *conn, BitStream *stream ); + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; //-------------------------------------------------------------------------- // Object Rendering @@ -116,7 +116,7 @@ public: void createShape(); // This is the function that allows this object to submit itself for rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; }; #endif // _RENDERSHAPEEXAMPLE_H_ \ No newline at end of file diff --git a/Engine/source/T3D/fps/guiClockHud.cpp b/Engine/source/T3D/fps/guiClockHud.cpp index 88be62f96..5a98444a8 100644 --- a/Engine/source/T3D/fps/guiClockHud.cpp +++ b/Engine/source/T3D/fps/guiClockHud.cpp @@ -55,7 +55,7 @@ public: void setReverseTime(F32 reverseTime); F32 getTime(); - void onRender( Point2I, const RectI &); + void onRender( Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiClockHud ); DECLARE_CATEGORY( "Gui Game" ); diff --git a/Engine/source/T3D/fps/guiCrossHairHud.cpp b/Engine/source/T3D/fps/guiCrossHairHud.cpp index 17f1a6cdc..eaa318c53 100644 --- a/Engine/source/T3D/fps/guiCrossHairHud.cpp +++ b/Engine/source/T3D/fps/guiCrossHairHud.cpp @@ -53,7 +53,7 @@ protected: public: GuiCrossHairHud(); - void onRender( Point2I, const RectI &); + void onRender( Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiCrossHairHud ); DECLARE_CATEGORY( "Gui Game" ); diff --git a/Engine/source/T3D/fps/guiHealthBarHud.cpp b/Engine/source/T3D/fps/guiHealthBarHud.cpp index a76f8284e..b2c387aca 100644 --- a/Engine/source/T3D/fps/guiHealthBarHud.cpp +++ b/Engine/source/T3D/fps/guiHealthBarHud.cpp @@ -57,7 +57,7 @@ class GuiHealthBarHud : public GuiControl public: GuiHealthBarHud(); - void onRender( Point2I, const RectI &); + void onRender( Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiHealthBarHud ); DECLARE_CATEGORY( "Gui Game" ); diff --git a/Engine/source/T3D/fps/guiHealthTextHud.cpp b/Engine/source/T3D/fps/guiHealthTextHud.cpp index 57b7f6751..9bde220de 100644 --- a/Engine/source/T3D/fps/guiHealthTextHud.cpp +++ b/Engine/source/T3D/fps/guiHealthTextHud.cpp @@ -55,7 +55,7 @@ class GuiHealthTextHud : public GuiControl public: GuiHealthTextHud(); - void onRender(Point2I, const RectI &); + void onRender(Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT(GuiHealthTextHud); DECLARE_CATEGORY("Gui Game"); diff --git a/Engine/source/T3D/fps/guiShapeNameHud.cpp b/Engine/source/T3D/fps/guiShapeNameHud.cpp index b293a4a87..377b05d92 100644 --- a/Engine/source/T3D/fps/guiShapeNameHud.cpp +++ b/Engine/source/T3D/fps/guiShapeNameHud.cpp @@ -69,7 +69,7 @@ public: GuiShapeNameHud(); // GuiControl - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiShapeNameHud ); diff --git a/Engine/source/T3D/fx/cameraFXMgr.h b/Engine/source/T3D/fx/cameraFXMgr.h index b40411f3a..2bebf1059 100644 --- a/Engine/source/T3D/fx/cameraFXMgr.h +++ b/Engine/source/T3D/fx/cameraFXMgr.h @@ -80,9 +80,9 @@ public: void setFalloff( F32 falloff ){ mFalloff = falloff; } void setFrequency( VectorF &freq ){ mFreq = freq; } void setAmplitude( VectorF & ){ mStartAmp = amp; } - bool isExpired(); + bool isExpired() override; - virtual void update( F32 dt ); + void update( F32 dt ) override; }; diff --git a/Engine/source/T3D/fx/explosion.h b/Engine/source/T3D/fx/explosion.h index ab17cf6d3..447b7747d 100644 --- a/Engine/source/T3D/fx/explosion.h +++ b/Engine/source/T3D/fx/explosion.h @@ -132,16 +132,16 @@ class ExplosionData : public GameBaseData { ExplosionData(); DECLARE_CONOBJECT(ExplosionData); - bool onAdd(); - bool preload(bool server, String &errorStr); + bool onAdd() override; + bool preload(bool server, String &errorStr) override; static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; public: /*C*/ ExplosionData(const ExplosionData&, bool = false); /*D*/ ~ExplosionData(); ExplosionData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } void onShapeChanged() {} }; @@ -175,12 +175,12 @@ class Explosion : public GameBase, public ISceneLight U32 mCollideType; protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; bool explode(); - void processTick(const Move *move); - void advanceTime(F32 dt); + void processTick(const Move *move) override; + void advanceTime(F32 dt) override; void updateEmitters( F32 dt ); void launchDebris( Point3F &axis ); void spawnSubExplosions(); @@ -188,7 +188,7 @@ class Explosion : public GameBase, public ISceneLight // Rendering protected: - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; void prepBatchRender(SceneRenderState *state); void prepModelView(SceneRenderState*); @@ -198,10 +198,10 @@ class Explosion : public GameBase, public ISceneLight void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0); // 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; } - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; void setCollideType( U32 cType ){ mCollideType = cType; } DECLARE_CONOBJECT(Explosion); diff --git a/Engine/source/T3D/fx/fxFoliageReplicator.h b/Engine/source/T3D/fx/fxFoliageReplicator.h index 901ac128b..a37c16eb6 100644 --- a/Engine/source/T3D/fx/fxFoliageReplicator.h +++ b/Engine/source/T3D/fx/fxFoliageReplicator.h @@ -246,16 +246,16 @@ public: void HideReplication(void); // SceneObject - virtual void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; // SimObject - bool onAdd(); - void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + 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; // Editor void onGhostAlwaysDone(); diff --git a/Engine/source/T3D/fx/fxShapeReplicator.h b/Engine/source/T3D/fx/fxShapeReplicator.h index 08df63506..23c7dde72 100644 --- a/Engine/source/T3D/fx/fxShapeReplicator.h +++ b/Engine/source/T3D/fx/fxShapeReplicator.h @@ -56,7 +56,7 @@ public: ~fxShapeReplicatedStatic() {}; void touchNetFlags(const U32 m, bool setflag = true) { if (setflag) mNetFlags.set(m); else mNetFlags.clear(m); }; TSShape* getShape(void) { return mShapeInstance->getShape(); }; - void setTransform(const MatrixF & mat) { Parent::setTransform(mat); setRenderTransform(mat); }; + void setTransform(const MatrixF & mat) override { Parent::setTransform(mat); setRenderTransform(mat); }; DECLARE_CONOBJECT(fxShapeReplicatedStatic); DECLARE_CATEGORY("UNLISTED"); @@ -102,16 +102,16 @@ public: void renderPlacementArea(const F32 ElapsedTime); // SceneObject - virtual void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; // SimObject - bool onAdd(); - void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + 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; // Editor void onGhostAlwaysDone(); diff --git a/Engine/source/T3D/fx/groundCover.h b/Engine/source/T3D/fx/groundCover.h index 3cd03887a..b2ef23e05 100644 --- a/Engine/source/T3D/fx/groundCover.h +++ b/Engine/source/T3D/fx/groundCover.h @@ -93,11 +93,11 @@ public: GroundCoverShaderConstHandles(); - virtual void init( GFXShader *shader ); + void init( GFXShader *shader ) override; - virtual void setConsts( SceneRenderState *state, + void setConsts( SceneRenderState *state, const SceneData &sgData, - GFXShaderConstBuffer *buffer ); + GFXShaderConstBuffer *buffer ) override; GroundCover *mGroundCover; @@ -128,16 +128,16 @@ public: static void consoleInit(); static void initPersistFields(); - bool onAdd(); - void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; // Network - U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *, BitStream *stream ); + U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ) override; + void unpackUpdate( NetConnection *, BitStream *stream ) override; // Rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; // Editor void onTerrainUpdated( U32 flags, TerrainBlock *tblock, const Point2I& min, const Point2I& max ); diff --git a/Engine/source/T3D/fx/lightning.cpp b/Engine/source/T3D/fx/lightning.cpp index 75c2ad3a9..c5fa25a6b 100644 --- a/Engine/source/T3D/fx/lightning.cpp +++ b/Engine/source/T3D/fx/lightning.cpp @@ -131,10 +131,10 @@ class LightningStrikeEvent : public NetEvent LightningStrikeEvent(); ~LightningStrikeEvent(); - void pack(NetConnection*, BitStream*); - void write(NetConnection*, BitStream*){} - void unpack(NetConnection*, BitStream*); - void process(NetConnection*); + void pack(NetConnection*, BitStream*) override; + void write(NetConnection*, BitStream*) override{} + void unpack(NetConnection*, BitStream*) override; + void process(NetConnection*) override; DECLARE_CONOBJECT(LightningStrikeEvent); }; diff --git a/Engine/source/T3D/fx/lightning.h b/Engine/source/T3D/fx/lightning.h index d68f6c1d2..55834251c 100644 --- a/Engine/source/T3D/fx/lightning.h +++ b/Engine/source/T3D/fx/lightning.h @@ -80,15 +80,15 @@ class LightningData : public GameBaseData U32 mNumStrikeTextures; protected: - bool onAdd(); + bool onAdd() override; public: LightningData(); ~LightningData(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorStr); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorStr) override; DECLARE_CONOBJECT(LightningData); static void initPersistFields(); @@ -162,9 +162,9 @@ class Lightning : public GameBase typedef GameBase Parent; protected: - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; DECLARE_CALLBACK( void, applyDamage, ( const Point3F& hitPosition, const Point3F& hitNormal, SceneObject* hitObject )); @@ -206,13 +206,13 @@ class Lightning : public GameBase protected: // Rendering - void prepRenderImage(SceneRenderState *state); + void prepRenderImage(SceneRenderState *state) override; void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* ); // Time management - void processTick(const Move *move); - void interpolateTick(F32 delta); - void advanceTime(F32 dt); + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; + void advanceTime(F32 dt) override; // Strike management void scheduleThunder(Strike*); @@ -242,8 +242,8 @@ class Lightning : public GameBase DECLARE_CATEGORY("Environment \t Weather"); static void initPersistFields(); - 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; }; #endif // _H_LIGHTNING diff --git a/Engine/source/T3D/fx/particle.h b/Engine/source/T3D/fx/particle.h index e05b67b88..12e6a242a 100644 --- a/Engine/source/T3D/fx/particle.h +++ b/Engine/source/T3D/fx/particle.h @@ -101,18 +101,18 @@ public: // move this procedure to Particle void initializeParticle(Particle*, const Point3F&); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); - bool preload(bool server, String &errorStr); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; + bool preload(bool server, String &errorStr) override; DECLARE_CONOBJECT(ParticleData); static void initPersistFields(); bool reload(char errorBuffer[256]); public: /*C*/ ParticleData(const ParticleData&, bool = false); - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } protected: F32 spinBias; bool randomizeSpinDir; @@ -160,4 +160,4 @@ struct Particle }; -#endif // _PARTICLE_H_ \ No newline at end of file +#endif // _PARTICLE_H_ diff --git a/Engine/source/T3D/fx/particleEmitter.h b/Engine/source/T3D/fx/particleEmitter.h index b11e53ce8..e0dd49308 100644 --- a/Engine/source/T3D/fx/particleEmitter.h +++ b/Engine/source/T3D/fx/particleEmitter.h @@ -69,10 +69,10 @@ class ParticleEmitterData : public GameBaseData ParticleEmitterData(); DECLARE_CONOBJECT(ParticleEmitterData); static void initPersistFields(); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool preload(bool server, String &errorStr); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool preload(bool server, String &errorStr) override; + bool onAdd() override; void allocPrimBuffer( S32 overrideSize = -1 ); public: @@ -147,7 +147,7 @@ public: /*C*/ ParticleEmitterData(const ParticleEmitterData&, bool = false); /*D*/ ~ParticleEmitterData(); virtual ParticleEmitterData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } }; //***************************************************************************** @@ -184,7 +184,7 @@ class ParticleEmitter : public GameBase void setColors( LinearColorF *colorList ); ParticleEmitterData *getDataBlock(){ return mDataBlock; } - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; /// By default, a particle renderer will wait for it's owner to delete it. When this /// is turned on, it will delete itself as soon as it's particle count drops to zero. @@ -259,15 +259,15 @@ class ParticleEmitter : public GameBase /// @} protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - void processTick(const Move *move); - void advanceTime(F32 dt); + void processTick(const Move *move) override; + void advanceTime(F32 dt) override; // Rendering protected: - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; void copyToVB( const Point3F &camPos, const LinearColorF &ambientColor ); // PEngine interface diff --git a/Engine/source/T3D/fx/particleEmitterNode.h b/Engine/source/T3D/fx/particleEmitterNode.h index 24c45e697..ddbd5a1c0 100644 --- a/Engine/source/T3D/fx/particleEmitterNode.h +++ b/Engine/source/T3D/fx/particleEmitterNode.h @@ -38,7 +38,7 @@ class ParticleEmitterNodeData : public GameBaseData typedef GameBaseData Parent; protected: - bool onAdd(); + bool onAdd() override; //-------------------------------------- Console set variables public: @@ -51,9 +51,9 @@ class ParticleEmitterNodeData : public GameBaseData ParticleEmitterNodeData(); ~ParticleEmitterNodeData(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorStr); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorStr) override; DECLARE_CONOBJECT(ParticleEmitterNodeData); static void initPersistFields(); @@ -78,10 +78,10 @@ class ParticleEmitterNode : public GameBase ParticleEmitterNodeData* mDataBlock; protected: - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void inspectPostApply() override; ParticleEmitterData* mEmitterDatablock; S32 mEmitterDatablockId; @@ -99,15 +99,15 @@ class ParticleEmitterNode : public GameBase // Time/Move Management public: - void processTick(const Move* move); - void advanceTime(F32 dt); + void processTick(const Move* move) override; + void advanceTime(F32 dt) override; DECLARE_CONOBJECT(ParticleEmitterNode); DECLARE_CATEGORY("Environment \t FX"); static void initPersistFields(); - 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; inline bool getActive( void ) { return mActive; }; inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); }; diff --git a/Engine/source/T3D/fx/precipitation.h b/Engine/source/T3D/fx/precipitation.h index 04bc02f46..25aad8e60 100644 --- a/Engine/source/T3D/fx/precipitation.h +++ b/Engine/source/T3D/fx/precipitation.h @@ -64,10 +64,10 @@ class PrecipitationData : public GameBaseData PrecipitationData(); DECLARE_CONOBJECT(PrecipitationData); - bool preload( bool server, String& errorStr ); + bool preload( bool server, String& errorStr ) override; static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; void onDropChanged() {} void onSplashChanged() {} @@ -233,8 +233,8 @@ class Precipitation : public GameBase } mTurbulenceData; //other functions... - void processTick(const Move*); - void interpolateTick(F32 delta); + void processTick(const Move*) override; + void interpolateTick(F32 delta) override; VectorF getWindVelocity(); void fillDropList(); ///< Adds/removes drops from the list to have the right # of drops @@ -253,20 +253,20 @@ class Precipitation : public GameBase GFXPrimitiveBufferHandle mRainIB; GFXVertexBufferHandle mRainVB; - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Rendering - void prepRenderImage( SceneRenderState* state ); + void prepRenderImage( SceneRenderState* state ) override; void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* ); - void setTransform(const MatrixF &mat); + void setTransform(const MatrixF &mat) override; public: Precipitation(); ~Precipitation(); - void inspectPostApply(); + void inspectPostApply() override; enum { @@ -278,13 +278,13 @@ class Precipitation : public GameBase NextFreeMask = Parent::NextFreeMask << 5 }; - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; DECLARE_CONOBJECT(Precipitation); DECLARE_CATEGORY("Environment \t Weather"); static void initPersistFields(); - U32 packUpdate(NetConnection*, U32 mask, BitStream* stream); - void unpackUpdate(NetConnection*, BitStream* stream); + U32 packUpdate(NetConnection*, U32 mask, BitStream* stream) override; + void unpackUpdate(NetConnection*, BitStream* stream) override; void setPercentage(F32 pct); void modifyStorm(F32 pct, U32 ms); diff --git a/Engine/source/T3D/fx/ribbon.h b/Engine/source/T3D/fx/ribbon.h index b10041ba3..3eba7720d 100644 --- a/Engine/source/T3D/fx/ribbon.h +++ b/Engine/source/T3D/fx/ribbon.h @@ -44,7 +44,7 @@ class RibbonData : public GameBaseData typedef GameBaseData Parent; protected: - bool onAdd(); + bool onAdd() override; public: @@ -70,9 +70,9 @@ public: RibbonData(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorBuffer); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorBuffer) override; static void initPersistFields(); DECLARE_CONOBJECT(RibbonData); @@ -104,13 +104,13 @@ class Ribbon : public GameBase protected: - bool onAdd(); - void processTick(const Move*); - void advanceTime(F32); - void interpolateTick(F32 delta); + bool onAdd() override; + void processTick(const Move*) override; + void advanceTime(F32) override; + void interpolateTick(F32 delta) override; // Rendering - void prepRenderImage(SceneRenderState *state); + void prepRenderImage(SceneRenderState *state) override; void setShaderParams(); ///Checks to see if ribbon is too long @@ -126,8 +126,8 @@ public: DECLARE_CONOBJECT(Ribbon); DECLARE_CATEGORY("UNLISTED"); static void initPersistFields(); - bool onNewDataBlock(GameBaseData*,bool); - void onRemove(); + bool onNewDataBlock(GameBaseData*,bool) override; + void onRemove() override; /// Used to add another segment to the ribbon. void addSegmentPoint(Point3F &point, MatrixF &mat); diff --git a/Engine/source/T3D/fx/ribbonNode.h b/Engine/source/T3D/fx/ribbonNode.h index a071f87a2..4e7aed65d 100644 --- a/Engine/source/T3D/fx/ribbonNode.h +++ b/Engine/source/T3D/fx/ribbonNode.h @@ -63,10 +63,10 @@ class RibbonNode : public GameBase RibbonNodeData* mDataBlock; protected: - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void inspectPostApply() override; RibbonData* mRibbonDatablock; S32 mRibbonDatablockId; @@ -83,15 +83,15 @@ public: // Time/Move Management - void processTick(const Move* move); - void advanceTime(F32 dt); + void processTick(const Move* move) override; + void advanceTime(F32 dt) override; DECLARE_CONOBJECT(RibbonNode); DECLARE_CATEGORY("Environment \t FX"); static void initPersistFields(); - 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; inline bool getActive( void ) { return mActive; }; inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); }; diff --git a/Engine/source/T3D/fx/splash.h b/Engine/source/T3D/fx/splash.h index 523fd6e19..754103cc5 100644 --- a/Engine/source/T3D/fx/splash.h +++ b/Engine/source/T3D/fx/splash.h @@ -130,11 +130,11 @@ public: SplashData(); DECLARE_CONOBJECT(SplashData); - bool onAdd(); - bool preload(bool server, String &errorStr); + bool onAdd() override; + bool preload(bool server, String &errorStr) override; static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; //-------------------------------------------------------------------------- @@ -172,10 +172,10 @@ protected: S32 mDelayMS; protected: - bool onAdd(); - void onRemove(); - void processTick(const Move *move); - void advanceTime(F32 dt); + bool onAdd() override; + void onRemove() override; + void processTick(const Move *move) override; + void advanceTime(F32 dt) override; void updateEmitters( F32 dt ); void updateWave( F32 dt ); void updateColor(); @@ -190,10 +190,10 @@ public: ~Splash(); void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0); - 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; - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; DECLARE_CONOBJECT(Splash); DECLARE_CATEGORY("UNLISTED"); }; diff --git a/Engine/source/T3D/gameBase/extended/extendedMove.h b/Engine/source/T3D/gameBase/extended/extendedMove.h index 5f0dae742..a3aa64d4d 100644 --- a/Engine/source/T3D/gameBase/extended/extendedMove.h +++ b/Engine/source/T3D/gameBase/extended/extendedMove.h @@ -29,11 +29,11 @@ struct ExtendedMove : public Move ExtendedMove(); - virtual void pack(BitStream *stream, const Move * move = NULL); - virtual void unpack(BitStream *stream, const Move * move = NULL); + void pack(BitStream *stream, const Move * move = NULL) override; + void unpack(BitStream *stream, const Move * move = NULL) override; - virtual void clamp(); - virtual void unclamp(); + void clamp() override; + void unclamp() override; }; extern const ExtendedMove NullExtendedMove; diff --git a/Engine/source/T3D/gameBase/gameBase.h b/Engine/source/T3D/gameBase/gameBase.h index bda0aa479..7c175f71e 100644 --- a/Engine/source/T3D/gameBase/gameBase.h +++ b/Engine/source/T3D/gameBase/gameBase.h @@ -99,17 +99,17 @@ public: Signal mReloadSignal; // Triggers the reload signal. - void inspectPostApply(); + void inspectPostApply() override; - bool onAdd(); + bool onAdd() override; // The derived class should provide the following: DECLARE_CONOBJECT(GameBaseData); DECLARE_CATEGORY("Datablock"); GameBaseData(); static void initPersistFields(); - bool preload(bool server, String &errorStr); - void unpackData(BitStream* stream); + bool preload(bool server, String &errorStr) override; + void unpackData(BitStream* stream) override; /// @name Callbacks /// @{ @@ -256,9 +256,9 @@ public: /// @name Inherited Functionality. /// @{ - bool onAdd(); - void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; static void initPersistFields(); static void consoleInit(); @@ -308,7 +308,7 @@ public: /// @} // ProcessObject override - void processTick( const Move *move ); + void processTick( const Move *move ) override; /// @name GameBase NetFlags & Hifi-Net Interface /// @{ @@ -359,10 +359,10 @@ public: /// @name Network /// @see NetObject, NetConnection /// @{ - void interpolateTick(F32 dt); - F32 getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips ); - U32 packUpdate ( NetConnection *conn, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *conn, BitStream *stream ); + void interpolateTick(F32 dt) override; + F32 getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips ) override; + U32 packUpdate ( NetConnection *conn, U32 mask, BitStream *stream ) override; + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; /// Write state information necessary to perform client side prediction of an object. /// @@ -387,7 +387,7 @@ public: /// /// @see writePacketData /// @param conn Game connection - virtual U32 getPacketDataChecksum( GameConnection *conn ); + U32 getPacketDataChecksum( GameConnection *conn ) override; ///@} @@ -396,8 +396,8 @@ public: public: - virtual void onMount( SceneObject *obj, S32 node ); - virtual void onUnmount( SceneObject *obj,S32 node ); + void onMount( SceneObject *obj, S32 node ) override; + void onUnmount( SceneObject *obj,S32 node ) override; /// @} @@ -405,7 +405,7 @@ public: /// @{ /// Returns the client controlling this object - GameConnection *getControllingClient() { return mControllingClient; } + GameConnection *getControllingClient() override { return mControllingClient; } const GameConnection *getControllingClient() const { return mControllingClient; } /// Returns the MoveList of the client controlling this object. @@ -466,7 +466,7 @@ private: /// void _onDatablockModified(); protected: - void onScopeIdChange() { setMaskBits(ScopeIdMask); } + void onScopeIdChange() override { setMaskBits(ScopeIdMask); } }; diff --git a/Engine/source/T3D/gameBase/gameConnection.h b/Engine/source/T3D/gameBase/gameConnection.h index 64cdb3cbd..c9e32e14b 100644 --- a/Engine/source/T3D/gameBase/gameConnection.h +++ b/Engine/source/T3D/gameBase/gameConnection.h @@ -149,24 +149,24 @@ public: /// @name Event Handling /// @{ - virtual void onTimedOut(); - virtual void onConnectTimedOut(); - virtual void onDisconnect(const char *reason); - virtual void onConnectionRejected(const char *reason); - virtual void onConnectionEstablished(bool isInitiator); - virtual void handleStartupError(const char *errorString); + void onTimedOut() override; + void onConnectTimedOut() override; + void onDisconnect(const char *reason) override; + void onConnectionRejected(const char *reason) override; + void onConnectionEstablished(bool isInitiator) override; + void handleStartupError(const char *errorString) override; /// @} /// @name Packet I/O /// @{ - virtual void writeConnectRequest(BitStream *stream); - virtual bool readConnectRequest(BitStream *stream, const char **errorString); - virtual void writeConnectAccept(BitStream *stream); - virtual bool readConnectAccept(BitStream *stream, const char **errorString); + void writeConnectRequest(BitStream *stream) override; + bool readConnectRequest(BitStream *stream, const char **errorString) override; + void writeConnectAccept(BitStream *stream) override; + bool readConnectAccept(BitStream *stream, const char **errorString) override; /// @} - bool canRemoteCreate(); + bool canRemoteCreate() override; void setVisibleGhostDistance(F32 dist); F32 getVisibleGhostDistance(); @@ -188,7 +188,7 @@ protected: S32 cameraFov; GamePacketNotify(); }; - PacketNotify *allocNotify(); + PacketNotify *allocNotify() override; bool mControlForceMismatch; @@ -223,28 +223,28 @@ protected: /// @name Packet I/O /// @{ - void readPacket (BitStream *bstream); - void writePacket (BitStream *bstream, PacketNotify *note); - void packetReceived (PacketNotify *note); - void packetDropped (PacketNotify *note); - void connectionError (const char *errorString); + void readPacket (BitStream *bstream) override; + void writePacket (BitStream *bstream, PacketNotify *note) override; + void packetReceived (PacketNotify *note) override; + void packetDropped (PacketNotify *note) override; + void connectionError (const char *errorString) override; - void writeDemoStartBlock (ResizeBitStream *stream); - bool readDemoStartBlock (BitStream *stream); - void handleRecordedBlock (U32 type, U32 size, void *data); + void writeDemoStartBlock (ResizeBitStream *stream) override; + bool readDemoStartBlock (BitStream *stream) override; + void handleRecordedBlock (U32 type, U32 size, void *data) override; /// @} - void ghostWriteExtra(NetObject *,BitStream *); - void ghostReadExtra(NetObject *,BitStream *, bool newGhost); - void ghostPreRead(NetObject *, bool newGhost); + void ghostWriteExtra(NetObject *,BitStream *) override; + void ghostReadExtra(NetObject *,BitStream *, bool newGhost) override; + void ghostPreRead(NetObject *, bool newGhost) override; - virtual void onEndGhosting(); + void onEndGhosting() override; public: DECLARE_CONOBJECT(GameConnection); - void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount); + void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount) override; void preloadDataBlock(SimDataBlock *block); - void fileDownloadSegmentComplete(); + void fileDownloadSegmentComplete() override; void preloadNextDataBlock(bool hadNew); static void consoleInit(); @@ -253,8 +253,8 @@ public: GameConnection(); ~GameConnection(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; static GameConnection *getConnectionToServer() { @@ -362,8 +362,8 @@ public: bool isFirstPerson() const { return mCameraPos == 0; } bool isAIControlled() { return mAIControlled; } - void doneScopingScene(); - void demoPlaybackComplete(); + void doneScopingScene() override; + void demoPlaybackComplete() override; void setMissionCRC(U32 crc) { mMissionCRC = crc; } U32 getMissionCRC() { return(mMissionCRC); } @@ -399,7 +399,7 @@ private: bool mChangedSelectedObj; U32 mPreSelectTimestamp; protected: - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; public: void setRolloverObj(SceneObject*); SceneObject* getRolloverObj() { return mRolloverObj; } diff --git a/Engine/source/T3D/gameBase/gameConnectionEvents.h b/Engine/source/T3D/gameBase/gameConnectionEvents.h index 195c5b00f..c301ff29a 100644 --- a/Engine/source/T3D/gameBase/gameConnectionEvents.h +++ b/Engine/source/T3D/gameBase/gameConnectionEvents.h @@ -45,7 +45,7 @@ class QuitEvent : public SimEvent { - void process(SimObject *object) + void process(SimObject *object) override { Platform::postQuitMessage(0); } @@ -91,11 +91,11 @@ class SimDataBlockEvent : public NetEvent SimDataBlockEvent(SimDataBlock* obj = NULL, U32 index = 0, U32 total = 0, U32 missionSequence = 0); ~SimDataBlockEvent(); - void pack(NetConnection *, BitStream *bstream); - void write(NetConnection *, BitStream *bstream); - void unpack(NetConnection *cptr, BitStream *bstream); - void process(NetConnection*); - void notifyDelivered(NetConnection *, bool); + void pack(NetConnection *, BitStream *bstream) override; + void write(NetConnection *, BitStream *bstream) override; + void unpack(NetConnection *cptr, BitStream *bstream) override; + void process(NetConnection*) override; + void notifyDelivered(NetConnection *, bool) override; #ifdef TORQUE_DEBUG_NET const char *getDebugName(); @@ -115,10 +115,10 @@ public: typedef NetEvent Parent; SimSoundAssetEvent(StringTableEntry assetId = StringTable->EmptyString(), const MatrixF* mat = NULL); - void pack(NetConnection*, BitStream* bstream); - void write(NetConnection*, BitStream* bstream); - void unpack(NetConnection*, BitStream* bstream); - void process(NetConnection*); + void pack(NetConnection*, BitStream* bstream) override; + void write(NetConnection*, BitStream* bstream) override; + void unpack(NetConnection*, BitStream* bstream) override; + void process(NetConnection*) override; DECLARE_CONOBJECT(SimSoundAssetEvent); }; @@ -130,10 +130,10 @@ class Sim2DAudioEvent: public NetEvent public: typedef NetEvent Parent; Sim2DAudioEvent(SFXProfile *profile=NULL); - void pack(NetConnection *, BitStream *bstream); - void write(NetConnection *, BitStream *bstream); - void unpack(NetConnection *, BitStream *bstream); - void process(NetConnection *); + void pack(NetConnection *, BitStream *bstream) override; + void write(NetConnection *, BitStream *bstream) override; + void unpack(NetConnection *, BitStream *bstream) override; + void process(NetConnection *) override; DECLARE_CONOBJECT(Sim2DAudioEvent); }; @@ -146,10 +146,10 @@ class Sim3DAudioEvent: public NetEvent public: typedef NetEvent Parent; Sim3DAudioEvent(SFXProfile *profile=NULL,const MatrixF* mat=NULL); - void pack(NetConnection *, BitStream *bstream); - void write(NetConnection *, BitStream *bstream); - void unpack(NetConnection *, BitStream *bstream); - void process(NetConnection *); + void pack(NetConnection *, BitStream *bstream) override; + void write(NetConnection *, BitStream *bstream) override; + void unpack(NetConnection *, BitStream *bstream) override; + void process(NetConnection *) override; DECLARE_CONOBJECT(Sim3DAudioEvent); }; @@ -166,13 +166,13 @@ class SetMissionCRCEvent : public NetEvent typedef NetEvent Parent; SetMissionCRCEvent(U32 crc = 0xffffffff) { mCrc = crc; } - void pack(NetConnection *, BitStream * bstream) + void pack(NetConnection *, BitStream * bstream) override { bstream->write(mCrc); } - void write(NetConnection * con, BitStream * bstream) + void write(NetConnection * con, BitStream * bstream) override { pack(con, bstream); } - void unpack(NetConnection *, BitStream * bstream) + void unpack(NetConnection *, BitStream * bstream) override { bstream->read(&mCrc); } - void process(NetConnection * con) + void process(NetConnection * con) override { static_cast(con)->setMissionCRC(mCrc); } DECLARE_CONOBJECT(SetMissionCRCEvent); diff --git a/Engine/source/T3D/gameBase/gameProcess.h b/Engine/source/T3D/gameBase/gameProcess.h index d4ca2e023..bc4cda113 100644 --- a/Engine/source/T3D/gameBase/gameProcess.h +++ b/Engine/source/T3D/gameBase/gameProcess.h @@ -45,7 +45,7 @@ public: ClientProcessList(); // ProcessList - void addObject( ProcessObject *pobj ); + void addObject( ProcessObject *pobj ) override; /// Called after a correction packet is received from the server. /// If the control object was corrected it will now play back any moves @@ -57,7 +57,7 @@ public: protected: // ProcessList - void onPreTickObject( ProcessObject *pobj ); + void onPreTickObject( ProcessObject *pobj ) override; /// Returns true if backlogged. bool doBacklogged( SimTime timeDelta ); @@ -77,15 +77,15 @@ public: ServerProcessList(); // ProcessList - void addObject( ProcessObject *pobj ); + void addObject( ProcessObject *pobj ) override; static ServerProcessList* get() { return smServerProcessList; } protected: // ProcessList - void onPreTickObject( ProcessObject *pobj ); - void advanceObjects(); + void onPreTickObject( ProcessObject *pobj ) override; + void advanceObjects() override; protected: diff --git a/Engine/source/T3D/gameBase/std/stdGameProcess.h b/Engine/source/T3D/gameBase/std/stdGameProcess.h index 96a548db9..cc7fae344 100644 --- a/Engine/source/T3D/gameBase/std/stdGameProcess.h +++ b/Engine/source/T3D/gameBase/std/stdGameProcess.h @@ -42,19 +42,19 @@ class StdClientProcessList : public ClientProcessList protected: // ProcessList - void onTickObject(ProcessObject *); - void advanceObjects(); - void onAdvanceObjects(); + void onTickObject(ProcessObject *) override; + void advanceObjects() override; + void onAdvanceObjects() override; public: StdClientProcessList(); // ProcessList - bool advanceTime( SimTime timeDelta ); + bool advanceTime( SimTime timeDelta ) override; // ClientProcessList - void clientCatchup( GameConnection *conn ); + void clientCatchup( GameConnection *conn ) override; static void init(); static void shutdown(); @@ -67,9 +67,9 @@ class StdServerProcessList : public ServerProcessList protected: // ProcessList - void onPreTickObject( ProcessObject *pobj ); - void onTickObject( ProcessObject *pobj ); - void advanceObjects(); + void onPreTickObject( ProcessObject *pobj ) override; + void onTickObject( ProcessObject *pobj ) override; + void advanceObjects() override; public: diff --git a/Engine/source/T3D/gameBase/std/stdMoveList.h b/Engine/source/T3D/gameBase/std/stdMoveList.h index b07c5664d..fc1d3c87a 100644 --- a/Engine/source/T3D/gameBase/std/stdMoveList.h +++ b/Engine/source/T3D/gameBase/std/stdMoveList.h @@ -35,17 +35,17 @@ public: StdMoveList(); - void clientWriteMovePacket(BitStream *); - void clientReadMovePacket(BitStream *); + void clientWriteMovePacket(BitStream *) override; + void clientReadMovePacket(BitStream *) override; - void serverWriteMovePacket(BitStream *); - void serverReadMovePacket(BitStream *); + void serverWriteMovePacket(BitStream *) override; + void serverReadMovePacket(BitStream *) override; - U32 getMoves(Move**,U32* numMoves); - void clearMoves(U32 count); + U32 getMoves(Move**,U32* numMoves) override; + void clearMoves(U32 count) override; - void advanceMove(); - void onAdvanceObjects() {} + void advanceMove() override; + void onAdvanceObjects() override {} protected: diff --git a/Engine/source/T3D/gameTSCtrl.h b/Engine/source/T3D/gameTSCtrl.h index 5b7360129..f3c3c7d08 100644 --- a/Engine/source/T3D/gameTSCtrl.h +++ b/Engine/source/T3D/gameTSCtrl.h @@ -47,22 +47,22 @@ public: DECLARE_CONOBJECT(GameTSCtrl); DECLARE_DESCRIPTION( "A control that renders a 3D view from the current control object." ); - bool processCameraQuery(CameraQuery *query); - void renderWorld(const RectI &updateRect); + bool processCameraQuery(CameraQuery *query) override; + void renderWorld(const RectI &updateRect) override; // GuiControl - virtual void onMouseDown(const GuiEvent &evt); - virtual void onRightMouseDown(const GuiEvent &evt); - virtual void onMiddleMouseDown(const GuiEvent &evt); + void onMouseDown(const GuiEvent &evt) override; + void onRightMouseDown(const GuiEvent &evt) override; + void onMiddleMouseDown(const GuiEvent &evt) override; - virtual void onMouseUp(const GuiEvent &evt); - virtual void onRightMouseUp(const GuiEvent &evt); - virtual void onMiddleMouseUp(const GuiEvent &evt); + void onMouseUp(const GuiEvent &evt) override; + void onRightMouseUp(const GuiEvent &evt) override; + void onMiddleMouseUp(const GuiEvent &evt) override; - void onMouseMove(const GuiEvent &evt); - void onRender(Point2I offset, const RectI &updateRect); + void onMouseMove(const GuiEvent &evt) override; + void onRender(Point2I offset, const RectI &updateRect) override; - virtual bool onAdd(); + bool onAdd() override; }; #endif diff --git a/Engine/source/T3D/groundPlane.h b/Engine/source/T3D/groundPlane.h index 4b9ded740..e05a8132e 100644 --- a/Engine/source/T3D/groundPlane.h +++ b/Engine/source/T3D/groundPlane.h @@ -65,21 +65,21 @@ public: GroundPlane(); virtual ~GroundPlane(); - virtual bool onAdd(); - virtual void onRemove(); - virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ); - virtual void unpackUpdate( NetConnection* connection, BitStream* stream ); - virtual void prepRenderImage( SceneRenderState* state ); - virtual bool castRay( const Point3F& start, const Point3F& end, RayInfo* info ); - virtual void buildConvex( const Box3F& box, Convex* convex ); - virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ); - virtual void inspectPostApply(); - virtual void setTransform( const MatrixF &mat ); - virtual void setScale( const Point3F& scale ); + bool onAdd() override; + void onRemove() override; + U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override; + void unpackUpdate( NetConnection* connection, BitStream* stream ) override; + void prepRenderImage( SceneRenderState* state ) override; + bool castRay( const Point3F& start, const Point3F& end, RayInfo* info ) override; + void buildConvex( const Box3F& box, Convex* convex ) override; + bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override; + void inspectPostApply() override; + void setTransform( const MatrixF &mat ) override; + void setScale( const Point3F& scale ) override; static void initPersistFields(); - virtual void getUtilizedAssets(Vector* usedAssetsList); + void getUtilizedAssets(Vector* usedAssetsList) override; protected: diff --git a/Engine/source/T3D/guiMaterialPreview.h b/Engine/source/T3D/guiMaterialPreview.h index c51005a8a..2bf702019 100644 --- a/Engine/source/T3D/guiMaterialPreview.h +++ b/Engine/source/T3D/guiMaterialPreview.h @@ -77,21 +77,21 @@ protected: LightInfo* mFakeSun; public: - bool onWake(); + bool onWake() override; - void onMouseEnter(const GuiEvent &event); - void onMouseLeave(const GuiEvent &event); - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onRightMouseDown(const GuiEvent &event); - void onRightMouseUp(const GuiEvent &event); - void onRightMouseDragged(const GuiEvent &event); - bool onMouseWheelUp(const GuiEvent &event); - bool onMouseWheelDown(const GuiEvent &event); - void onMiddleMouseUp(const GuiEvent &event); - void onMiddleMouseDown(const GuiEvent &event); - void onMiddleMouseDragged(const GuiEvent &event); + void onMouseEnter(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onRightMouseDown(const GuiEvent &event) override; + void onRightMouseUp(const GuiEvent &event) override; + void onRightMouseDragged(const GuiEvent &event) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; + void onMiddleMouseUp(const GuiEvent &event) override; + void onMiddleMouseDown(const GuiEvent &event) override; + void onMiddleMouseDragged(const GuiEvent &event) override; // For Camera Panning. void setTranslate(S32 modifier, F32 xstep, F32 ystep); @@ -110,8 +110,8 @@ public: void resetViewport(); void setOrbitDistance(F32 distance); - bool processCameraQuery(CameraQuery *query); - void renderWorld(const RectI &updateRect); + bool processCameraQuery(CameraQuery *query) override; + void renderWorld(const RectI &updateRect) override; DECLARE_CONOBJECT(GuiMaterialPreview); DECLARE_CATEGORY( "Gui Editor" ); diff --git a/Engine/source/T3D/guiNoMouseCtrl.cpp b/Engine/source/T3D/guiNoMouseCtrl.cpp index 31987ceb3..6c5fa643f 100644 --- a/Engine/source/T3D/guiNoMouseCtrl.cpp +++ b/Engine/source/T3D/guiNoMouseCtrl.cpp @@ -29,7 +29,7 @@ class GuiNoMouseCtrl : public GuiControl public: // GuiControl - bool pointInControl(const Point2I &) { return(false); } + bool pointInControl(const Point2I &) override { return(false); } DECLARE_CONOBJECT(GuiNoMouseCtrl); DECLARE_CATEGORY( "Gui Other" ); }; diff --git a/Engine/source/T3D/guiObjectView.cpp b/Engine/source/T3D/guiObjectView.cpp index be35cd7e2..b22d68a29 100644 --- a/Engine/source/T3D/guiObjectView.cpp +++ b/Engine/source/T3D/guiObjectView.cpp @@ -99,9 +99,9 @@ GuiObjectView::GuiObjectView() mCameraRotation( 0.0f, 0.0f, 0.0f ), mOrbitDist( 5.0f ), mCameraSpeed( 0.01f ), + mMountedModelInstance( NULL ), mMountNode( -1 ), mMountNodeName( "mount0" ), - mMountedModelInstance( NULL ), mAnimationSeq( -1 ), mRunThread( NULL ), mLastRenderTime( 0 ), diff --git a/Engine/source/T3D/guiObjectView.h b/Engine/source/T3D/guiObjectView.h index faeb06531..887e32a41 100644 --- a/Engine/source/T3D/guiObjectView.h +++ b/Engine/source/T3D/guiObjectView.h @@ -175,7 +175,7 @@ class GuiObjectView : public GuiTSCtrl void _initMount(); /// - void onStaticModified( StringTableEntry slotName, const char* newValue ); + void onStaticModified( StringTableEntry slotName, const char* newValue ) override; public: @@ -267,19 +267,19 @@ class GuiObjectView : public GuiTSCtrl /// @} // GuiTsCtrl. - bool onWake(); + bool onWake() override; - void onMouseEnter( const GuiEvent& event ); - void onMouseLeave( const GuiEvent& event ); - void onMouseDown( const GuiEvent& event ); - void onMouseUp( const GuiEvent& event ); - void onMouseDragged( const GuiEvent& event ); - void onRightMouseDown( const GuiEvent& event ); - void onRightMouseUp( const GuiEvent& event ); - void onRightMouseDragged( const GuiEvent& event ); + void onMouseEnter( const GuiEvent& event ) override; + void onMouseLeave( const GuiEvent& event ) override; + void onMouseDown( const GuiEvent& event ) override; + void onMouseUp( const GuiEvent& event ) override; + void onMouseDragged( const GuiEvent& event ) override; + void onRightMouseDown( const GuiEvent& event ) override; + void onRightMouseUp( const GuiEvent& event ) override; + void onRightMouseDragged( const GuiEvent& event ) override; - bool processCameraQuery( CameraQuery* query ); - void renderWorld( const RectI& updateRect ); + bool processCameraQuery( CameraQuery* query ) override; + void renderWorld( const RectI& updateRect ) override; static void initPersistFields(); diff --git a/Engine/source/T3D/item.h b/Engine/source/T3D/item.h index 611d64738..22536c9eb 100644 --- a/Engine/source/T3D/item.h +++ b/Engine/source/T3D/item.h @@ -60,8 +60,8 @@ struct ItemData: public ShapeBaseData { ItemData(); DECLARE_CONOBJECT(ItemData); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -145,17 +145,17 @@ class Item: public ShapeBase void updateVelocity(const F32 dt); void updatePos(const U32 mask, const F32 dt); void updateWorkingCollisionSet(const U32 mask, const F32 dt); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere); - void buildConvex(const Box3F& box, Convex* convex); - void onDeleteNotify(SimObject*); + bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override; + void buildConvex(const Box3F& box, Convex* convex) override; + void onDeleteNotify(SimObject*) override; static bool _setStatic(void *object, const char *index, const char *data); static bool _setRotate(void *object, const char *index, const char *data); protected: void _updatePhysics(); - void prepRenderImage(SceneRenderState *state); - void advanceTime(F32 dt); + void prepRenderImage(SceneRenderState *state) override; + void advanceTime(F32 dt) override; public: DECLARE_CONOBJECT(Item); @@ -167,25 +167,25 @@ class Item: public ShapeBase static void initPersistFields(); static void consoleInit(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; bool isStatic() { return mStatic; } bool isAtRest() { return mAtRest; } bool isRotating() { return mRotate; } - Point3F getVelocity() const; - void setVelocity(const VectorF& vel); - void applyImpulse(const Point3F& pos,const VectorF& vec); + Point3F getVelocity() const override; + void setVelocity(const VectorF& vel) override; + void applyImpulse(const Point3F& pos,const VectorF& vec) override; void setCollisionTimeout(ShapeBase* obj); ShapeBase* getCollisionObject() { return mCollisionObject; }; - void processTick(const Move *move); - void interpolateTick(F32 delta); - virtual void setTransform(const MatrixF &mat); + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; + void setTransform(const MatrixF &mat) 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; }; typedef Item::LightType ItemLightType; diff --git a/Engine/source/T3D/levelInfo.h b/Engine/source/T3D/levelInfo.h index 542c0d82e..91da71791 100644 --- a/Engine/source/T3D/levelInfo.h +++ b/Engine/source/T3D/levelInfo.h @@ -128,9 +128,9 @@ class LevelInfo : public NetObject /// @name SimObject Inheritance /// @{ - virtual bool onAdd(); - virtual void onRemove(); - virtual void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; static void initPersistFields(); @@ -144,8 +144,8 @@ class LevelInfo : public NetObject UpdateMask = BIT(0) }; - 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; static bool _setLevelAccuTexture(void *object, const char *index, const char *data); void setLevelAccuTexture(StringTableEntry name); /// @} diff --git a/Engine/source/T3D/lightAnimData.h b/Engine/source/T3D/lightAnimData.h index 82c16f9e8..be6314bdd 100644 --- a/Engine/source/T3D/lightAnimData.h +++ b/Engine/source/T3D/lightAnimData.h @@ -98,12 +98,12 @@ public: // SimObject static void initPersistFields(); - virtual void inspectPostApply(); + void inspectPostApply() override; // SimDataBlock - virtual bool preload( bool server, String &errorStr ); - virtual void packData( BitStream *stream ); - virtual void unpackData( BitStream *stream ); + bool preload( bool server, String &errorStr ) override; + void packData( BitStream *stream ) override; + void unpackData( BitStream *stream ) override; /// Animates parameters on the passed Light's LightInfo object. virtual void animate( LightInfo *light, LightAnimState *state ); diff --git a/Engine/source/T3D/lightBase.h b/Engine/source/T3D/lightBase.h index 503292c16..e11a5504b 100644 --- a/Engine/source/T3D/lightBase.h +++ b/Engine/source/T3D/lightBase.h @@ -95,8 +95,8 @@ protected: }; // SimObject. - virtual void _onSelected(); - virtual void _onUnselected(); + void _onSelected() override; + void _onUnselected() override; public: @@ -104,31 +104,31 @@ public: virtual ~LightBase(); // SimObject - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // ConsoleObject - void inspectPostApply(); + void inspectPostApply() override; static void initPersistFields(); DECLARE_CONOBJECT(LightBase); DECLARE_CATEGORY("UNLISTED"); // 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 setTransform( const MatrixF &mat ); - virtual void prepRenderImage( SceneRenderState *state ); + void setTransform( const MatrixF &mat ) override; + void prepRenderImage( SceneRenderState *state ) override; // ITickable - virtual void interpolateTick( F32 delta ); - virtual void processTick(); - virtual void advanceTime( F32 timeDelta ); + void interpolateTick( F32 delta ) override; + void processTick() override; + void advanceTime( F32 timeDelta ) override; /// Toggles the light on and off. void setLightEnabled( bool enabled ); diff --git a/Engine/source/T3D/lightDescription.h b/Engine/source/T3D/lightDescription.h index ab2e1bf3c..e29eaa8b9 100644 --- a/Engine/source/T3D/lightDescription.h +++ b/Engine/source/T3D/lightDescription.h @@ -82,14 +82,14 @@ public: DECLARE_CONOBJECT( LightDescription ); static void initPersistFields(); - virtual void inspectPostApply(); + void inspectPostApply() override; - bool onAdd(); + bool onAdd() override; // SimDataBlock - virtual bool preload( bool server, String &errorStr ); - virtual void packData( BitStream *stream ); - virtual void unpackData( BitStream *stream ); + bool preload( bool server, String &errorStr ) override; + void packData( BitStream *stream ) override; + void unpackData( BitStream *stream ) override; //void animateLight( LightState *state ); void submitLight( LightState *state, const MatrixF &xfm, LightManager *lm, SimObject *object ); diff --git a/Engine/source/T3D/lightFlareData.h b/Engine/source/T3D/lightFlareData.h index b2a87520c..5239bf3c1 100644 --- a/Engine/source/T3D/lightFlareData.h +++ b/Engine/source/T3D/lightFlareData.h @@ -87,12 +87,12 @@ public: DECLARE_CONOBJECT( LightFlareData ); static void initPersistFields(); - virtual void inspectPostApply(); + void inspectPostApply() override; // SimDataBlock - virtual bool preload( bool server, String &errorStr ); - virtual void packData( BitStream *stream ); - virtual void unpackData( BitStream *stream ); + bool preload( bool server, String &errorStr ) override; + void packData( BitStream *stream ) override; + void unpackData( BitStream *stream ) override; /// Submits render instances for corona and flare effects. void prepRender( SceneRenderState *state, LightFlareState *flareState ); diff --git a/Engine/source/T3D/lighting/boxEnvironmentProbe.h b/Engine/source/T3D/lighting/boxEnvironmentProbe.h index 3d825caa1..10509aa1e 100644 --- a/Engine/source/T3D/lighting/boxEnvironmentProbe.h +++ b/Engine/source/T3D/lighting/boxEnvironmentProbe.h @@ -82,18 +82,18 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate(NetConnection *conn, BitStream *stream); + void unpackUpdate(NetConnection *conn, BitStream *stream) override; //-------------------------------------------------------------------------- // Object Rendering @@ -103,7 +103,7 @@ public: // minimizing texture, state, and shader switching by grouping objects that // use the same Materials. //-------------------------------------------------------------------------- - virtual void updateProbeParams(); + void updateProbeParams() override; // This is the function that allows this object to submit itself for rendering //void prepRenderImage(SceneRenderState *state); diff --git a/Engine/source/T3D/lighting/reflectionProbe.h b/Engine/source/T3D/lighting/reflectionProbe.h index 9bc59e11c..1107efd0e 100644 --- a/Engine/source/T3D/lighting/reflectionProbe.h +++ b/Engine/source/T3D/lighting/reflectionProbe.h @@ -287,7 +287,7 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; static bool _setEnabled(void *object, const char *index, const char *data); static bool _doBake(void *object, const char *index, const char *data); @@ -296,29 +296,29 @@ public: static bool _setReflectionMode(void *object, const char *index, const char *data); // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; /// /// This is called when the object is deleted. It allows us to do special-case cleanup actions /// In probes' case, it's used to delete baked cubemap files /// - virtual void handleDeleteAction(); + void handleDeleteAction() override; // Override this so that we can dirty the network flag when it is called - virtual void setTransform(const MatrixF &mat); - virtual const MatrixF& getTransform() const; - virtual void setScale(const VectorF &scale); - virtual const VectorF& getScale() const; + void setTransform(const MatrixF &mat) override; + const MatrixF& getTransform() const override; + void setScale(const VectorF &scale) override; + const VectorF& getScale() const override; - virtual bool writeField(StringTableEntry fieldname, const char *value); + bool writeField(StringTableEntry fieldname, const char *value) override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate(NetConnection *conn, BitStream *stream); + void unpackUpdate(NetConnection *conn, BitStream *stream) override; //-------------------------------------------------------------------------- // Object Rendering @@ -353,7 +353,7 @@ public: void processStaticCubemap(); // This is the function that allows this object to submit itself for rendering - void prepRenderImage(SceneRenderState *state); + void prepRenderImage(SceneRenderState *state) override; void _onRenderViz(ObjectRenderInst *ri, SceneRenderState *state, diff --git a/Engine/source/T3D/lighting/skylight.h b/Engine/source/T3D/lighting/skylight.h index 2503b1dff..75e6d2b82 100644 --- a/Engine/source/T3D/lighting/skylight.h +++ b/Engine/source/T3D/lighting/skylight.h @@ -81,18 +81,18 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate(NetConnection *conn, BitStream *stream); + void unpackUpdate(NetConnection *conn, BitStream *stream) override; //-------------------------------------------------------------------------- // Object Rendering @@ -102,10 +102,10 @@ public: // minimizing texture, state, and shader switching by grouping objects that // use the same Materials. //-------------------------------------------------------------------------- - virtual void updateProbeParams(); + void updateProbeParams() override; // This is the function that allows this object to submit itself for rendering - void prepRenderImage(SceneRenderState *state); + void prepRenderImage(SceneRenderState *state) override; void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat); static SimObjectPtr smSkylightProbe; diff --git a/Engine/source/T3D/lighting/sphereEnvironmentProbe.h b/Engine/source/T3D/lighting/sphereEnvironmentProbe.h index 154d48747..611d121d2 100644 --- a/Engine/source/T3D/lighting/sphereEnvironmentProbe.h +++ b/Engine/source/T3D/lighting/sphereEnvironmentProbe.h @@ -77,18 +77,18 @@ public: // Allows the object to update its editable settings // from the server object to the client - virtual void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate(NetConnection *conn, BitStream *stream); + void unpackUpdate(NetConnection *conn, BitStream *stream) override; //-------------------------------------------------------------------------- // Object Rendering @@ -98,7 +98,7 @@ public: // minimizing texture, state, and shader switching by grouping objects that // use the same Materials. //-------------------------------------------------------------------------- - virtual void updateProbeParams(); + void updateProbeParams() override; void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat); }; diff --git a/Engine/source/T3D/missionArea.h b/Engine/source/T3D/missionArea.h index 6d1f81b19..12df6b967 100644 --- a/Engine/source/T3D/missionArea.h +++ b/Engine/source/T3D/missionArea.h @@ -54,10 +54,10 @@ class MissionArea : public NetObject /// @name SimObject Inheritance /// @{ - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - void inspectPostApply(); + void inspectPostApply() override; static void initPersistFields(); /// @} @@ -68,8 +68,8 @@ class MissionArea : public NetObject UpdateMask = BIT(0) }; - 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; /// @} DECLARE_CONOBJECT(MissionArea); diff --git a/Engine/source/T3D/missionMarker.h b/Engine/source/T3D/missionMarker.h index db72eff64..b1d3731c0 100644 --- a/Engine/source/T3D/missionMarker.h +++ b/Engine/source/T3D/missionMarker.h @@ -67,22 +67,22 @@ class MissionMarker : public ShapeBase MissionMarker(); // GameBase - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; // SceneObject - void setTransform(const MatrixF &mat); + void setTransform(const MatrixF &mat) override; // SimObject - bool onAdd(); - void onRemove(); - void onEditorEnable(); - void onEditorDisable(); + bool onAdd() override; + void onRemove() override; + void onEditorEnable() override; + void onEditorDisable() override; - 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; DECLARE_CONOBJECT(MissionMarker); DECLARE_CATEGORY("Markers"); @@ -110,15 +110,15 @@ class WayPoint : public MissionMarker WayPoint(); // ShapeBase: only ever added to scene if in the editor - void setHidden(bool hidden); + void setHidden(bool hidden) override; // SimObject - bool onAdd(); - void inspectPostApply(); + bool onAdd() override; + 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; // field data StringTableEntry mName; @@ -141,8 +141,8 @@ class SpawnSphere : public MissionMarker SpawnSphere(); // SimObject - bool onAdd(); - void inspectPostApply(); + bool onAdd() override; + void inspectPostApply() override; // NetObject enum SpawnSphereMasks @@ -151,12 +151,12 @@ class SpawnSphere : public MissionMarker NextFreeMask = Parent::NextFreeMask << 1 }; - 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 - void advanceTime( F32 timeDelta ); - void processTick( const Move *move ); + void advanceTime( F32 timeDelta ) override; + void processTick( const Move *move ) override; // Spawn info String mSpawnClass; @@ -202,15 +202,15 @@ class CameraBookmark : public MissionMarker CameraBookmark(); // SimObject - virtual bool onAdd(); - virtual void onRemove(); - virtual void onGroupAdd(); - virtual void onGroupRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void onGroupAdd() override; + void onGroupRemove() override; + 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; // field data StringTableEntry mName; diff --git a/Engine/source/T3D/notesObject.h b/Engine/source/T3D/notesObject.h index ace55804f..db32fd4de 100644 --- a/Engine/source/T3D/notesObject.h +++ b/Engine/source/T3D/notesObject.h @@ -78,24 +78,24 @@ public: // Set up any fields that we want to be editable (like position) static void initPersistFields(); - void inspectPostApply(); + void inspectPostApply() override; // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Override this so that we can dirty the network flag when it is called - void setTransform(const MatrixF& mat); + void setTransform(const MatrixF& mat) override; // This function handles sending the relevant data from the server // object to the client object - U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream); + U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream) override; // This function handles receiving relevant data from the server // object and applying it to the client object - void unpackUpdate(NetConnection* conn, BitStream* stream); + void unpackUpdate(NetConnection* conn, BitStream* stream) override; // This is the function that allows this object to submit itself for rendering - void prepRenderImage(SceneRenderState* state); + void prepRenderImage(SceneRenderState* state) override; void _render(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat); diff --git a/Engine/source/T3D/occlusionVolume.h b/Engine/source/T3D/occlusionVolume.h index 4c1d6f75d..8976ec1b7 100644 --- a/Engine/source/T3D/occlusionVolume.h +++ b/Engine/source/T3D/occlusionVolume.h @@ -55,7 +55,7 @@ class OcclusionVolume : public ScenePolyhedralSpace SilhouetteExtractorType mSilhouetteExtractor; // SceneSpace. - virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ); + void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override; public: @@ -66,13 +66,13 @@ class OcclusionVolume : public ScenePolyhedralSpace DECLARE_DESCRIPTION( "A visibility blocking volume." ); DECLARE_CATEGORY("Volume"); - virtual bool onAdd(); + bool onAdd() override; static void consoleInit(); // SceneObject. - virtual void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ); - virtual void setTransform( const MatrixF& mat ); + void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ) override; + void setTransform( const MatrixF& mat ) override; }; #endif // !_OCCLUSIONVOLUME_H_ diff --git a/Engine/source/T3D/pathCamera.h b/Engine/source/T3D/pathCamera.h index 91060796f..f9ce8ab66 100644 --- a/Engine/source/T3D/pathCamera.h +++ b/Engine/source/T3D/pathCamera.h @@ -40,8 +40,8 @@ struct PathCameraData: public ShapeBaseData { DECLARE_CONOBJECT(PathCameraData); static void consoleInit(); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -101,20 +101,20 @@ public: static void initPersistFields(); static void consoleInit(); - void onEditorEnable(); - void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; void onNode(S32 node); - void processTick(const Move*); - void interpolateTick(F32 dt); - void getCameraTransform(F32* pos,MatrixF* mat); + void processTick(const Move*) override; + void interpolateTick(F32 dt) override; + void getCameraTransform(F32* pos,MatrixF* mat) override; - U32 packUpdate(NetConnection *, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *, BitStream *stream); + U32 packUpdate(NetConnection *, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *, BitStream *stream) override; void reset(F32 speed = 1); void pushFront(CameraSpline::Knot *knot); diff --git a/Engine/source/T3D/pathShape.h b/Engine/source/T3D/pathShape.h index 9748ff04d..d9522632b 100644 --- a/Engine/source/T3D/pathShape.h +++ b/Engine/source/T3D/pathShape.h @@ -26,10 +26,10 @@ struct PathShapeData: public StaticShapeData { static void consoleInit(); DECLARE_CONOBJECT(PathShapeData); - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -88,16 +88,16 @@ public: static void initPersistFields(); static void consoleInit(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; void onNode(S32 node); - void processTick(const Move*); - void interpolateTick(F32 dt); + void processTick(const Move*) override; + void interpolateTick(F32 dt) override; - U32 packUpdate(NetConnection *, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *, BitStream *stream); + U32 packUpdate(NetConnection *, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *, BitStream *stream) override; void reset(F32 speed = 1); void pushFront(CameraSpline::Knot *knot); diff --git a/Engine/source/T3D/physicalZone.h b/Engine/source/T3D/physicalZone.h index 33aec9ad4..5aa7385d9 100644 --- a/Engine/source/T3D/physicalZone.h +++ b/Engine/source/T3D/physicalZone.h @@ -69,7 +69,7 @@ class PhysicalZone : public SceneObject bool mActive; Convex* mConvexList; - void buildConvex(const Box3F& box, Convex* convex); + void buildConvex(const Box3F& box, Convex* convex) override; public: PhysicalZone(); @@ -80,17 +80,17 @@ class PhysicalZone : public SceneObject DECLARE_CATEGORY("Volume"); static void consoleInit(); static void initPersistFields(); - bool onAdd(); - void onRemove(); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + 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; // SceneObject - void setTransform(const MatrixF &mat); - void prepRenderImage( SceneRenderState* state ); + void setTransform(const MatrixF &mat) override; + void prepRenderImage( SceneRenderState* state ) override; inline F32 getVelocityMod() const { return mVelocityMod; } inline F32 getGravityMod() const { return mGravityMod; } @@ -122,7 +122,7 @@ protected: public: enum ForceType { VECTOR, SPHERICAL, CYLINDRICAL }; enum { FORCE_TYPE_BITS = 2 }; - virtual void onStaticModified(const char* slotName, const char*newValue = NULL); + void onStaticModified(const char* slotName, const char*newValue = NULL) override; bool isExcludedObject(SceneObject*) const; void registerExcludedObject(SceneObject*); void unregisterExcludedObject(SceneObject*); diff --git a/Engine/source/T3D/physics/physicsDebris.h b/Engine/source/T3D/physics/physicsDebris.h index 917307339..2626300e9 100644 --- a/Engine/source/T3D/physics/physicsDebris.h +++ b/Engine/source/T3D/physics/physicsDebris.h @@ -91,11 +91,11 @@ public: PhysicsDebrisData(); - bool onAdd(); - bool preload( bool server, String &errorStr ); + bool onAdd() override; + bool preload( bool server, String &errorStr ) override; static void initPersistFields(); - void packData( BitStream *stream ); - void unpackData( BitStream *stream ); + void packData( BitStream *stream ) override; + void unpackData( BitStream *stream ) override; void onShapeChanged() {} @@ -132,23 +132,23 @@ public: DECLARE_CATEGORY("UNLISTED"); static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - void applyImpulse( const Point3F &pos, const VectorF &vec ); - void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ); + void applyImpulse( const Point3F &pos, const VectorF &vec ) override; + void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override; protected: /// The global object lifetime scalar. static F32 smLifetimeScale; - void processTick( const Move *move ); - void advanceTime( F32 dt ); - void interpolateTick( F32 delta ); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + void processTick( const Move *move ) override; + void advanceTime( F32 dt ) override; + void interpolateTick( F32 delta ) override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; void prepBatchRender( SceneRenderState *state ); void _deleteFragments(); diff --git a/Engine/source/T3D/physics/physicsEvents.h b/Engine/source/T3D/physics/physicsEvents.h index 3f4ac2d14..9f8af4780 100644 --- a/Engine/source/T3D/physics/physicsEvents.h +++ b/Engine/source/T3D/physics/physicsEvents.h @@ -59,10 +59,10 @@ public: RadialImpulseEvent( const Point3F &pos, F32 radius, F32 magnitude ); ~RadialImpulseEvent(); - virtual void pack( NetConnection* /*ps*/, BitStream *bstream ); - virtual void write( NetConnection*, BitStream *bstream ); - virtual void unpack( NetConnection *ps, BitStream *bstream ); - virtual void process(NetConnection *); + void pack( NetConnection* /*ps*/, BitStream *bstream ) override; + void write( NetConnection*, BitStream *bstream ) override; + void unpack( NetConnection *ps, BitStream *bstream ) override; + void process(NetConnection *) override; static void impulse( SceneContainer *con, const Point3F &position, F32 radius, F32 magnitude ); diff --git a/Engine/source/T3D/physics/physicsForce.h b/Engine/source/T3D/physics/physicsForce.h index c48425d46..41195c53a 100644 --- a/Engine/source/T3D/physics/physicsForce.h +++ b/Engine/source/T3D/physics/physicsForce.h @@ -51,15 +51,15 @@ public: DECLARE_CATEGORY("UNLISTED"); // SimObject static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // SceneObject - void onMount( SceneObject *obj, S32 node ); - void onUnmount( SceneObject *obj, S32 node ); + void onMount( SceneObject *obj, S32 node ) override; + void onUnmount( SceneObject *obj, S32 node ) override; // ProcessObject - void processTick( const Move *move ); + void processTick( const Move *move ) override; /// void attach( const Point3F &start, const Point3F &direction, F32 maxDist ); diff --git a/Engine/source/T3D/physics/physicsShape.h b/Engine/source/T3D/physics/physicsShape.h index 989409262..144580c31 100644 --- a/Engine/source/T3D/physics/physicsShape.h +++ b/Engine/source/T3D/physics/physicsShape.h @@ -64,13 +64,13 @@ public: DECLARE_CONOBJECT(PhysicsShapeData); static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // GameBaseData - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool preload(bool server, String &errorBuffer ); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool preload(bool server, String &errorBuffer ) override; public: @@ -237,28 +237,28 @@ public: // SimObject static void consoleInit(); static void initPersistFields(); - void inspectPostApply(); - bool onAdd(); - void onRemove(); + void inspectPostApply() override; + bool onAdd() override; + void onRemove() override; // SceneObject - void prepRenderImage( SceneRenderState *state ); - void setTransform( const MatrixF &mat ); - F32 getMass() const; - Point3F getVelocity() const { return mState.linVelocity; } - void applyImpulse( const Point3F &pos, const VectorF &vec ); - void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ); + void prepRenderImage( SceneRenderState *state ) override; + void setTransform( const MatrixF &mat ) override; + F32 getMass() const override; + Point3F getVelocity() const override { return mState.linVelocity; } + void applyImpulse( const Point3F &pos, const VectorF &vec ) override; + void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override; void applyTorque( const Point3F &torque ); void applyForce( const Point3F &force ); - void setScale(const VectorF & scale); + void setScale(const VectorF & scale) override; // GameBase - bool onNewDataBlock( GameBaseData *dptr, bool reload ); - void interpolateTick( F32 delta ); - void processTick( const Move *move ); - void advanceTime( F32 timeDelta ); - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *conn, BitStream *stream ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void interpolateTick( F32 delta ) override; + void processTick( const Move *move ) override; + void advanceTime( F32 timeDelta ) override; + U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override; + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; bool isDestroyed() const { return mDestroyed; } void destroy(); diff --git a/Engine/source/T3D/player.h b/Engine/source/T3D/player.h index 6a2bb0248..b80b3f0e5 100644 --- a/Engine/source/T3D/player.h +++ b/Engine/source/T3D/player.h @@ -357,14 +357,14 @@ struct PlayerData: public ShapeBaseData { // DECLARE_CONOBJECT(PlayerData); PlayerData(); - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; void getGroundInfo(TSShapeInstance*,TSThread*,ActionAnimation*); bool isTableSequence(S32 seq); bool isJumpAction(U32 action); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; /// @name Callbacks /// @{ @@ -599,7 +599,7 @@ protected: #endif protected: - virtual void reSkin(); + void reSkin() override; void setState(ActionState state, U32 ticks=0); void updateState(); @@ -640,8 +640,8 @@ protected: /// @name Mounted objects /// @{ - virtual void onUnmount( SceneObject *obj, S32 node ); - virtual void unmount(); + void onUnmount( SceneObject *obj, S32 node ) override; + void unmount() override; /// @} void setPosition(const Point3F& pos,const Point3F& viewRot); @@ -653,19 +653,19 @@ protected: S32 findPrefixSequence(String* prefixPaths, const String& baseSeq); S32 convertActionToImagePrefix(U32 action); - virtual void onImage(U32 imageSlot, bool unmount); - virtual void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState); - virtual void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue); - virtual const char* getImageAnimPrefix(U32 imageSlot, S32 imageShapeIndex); - virtual void onImageAnimThreadChange(U32 imageSlot, S32 imageShapeIndex, ShapeBaseImageData::StateData* lastState, const char* anim, F32 pos, F32 timeScale, bool reset=false); - virtual void onImageAnimThreadUpdate(U32 imageSlot, S32 imageShapeIndex, F32 dt); + void onImage(U32 imageSlot, bool unmount) override; + void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState) override; + void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue) override; + const char* getImageAnimPrefix(U32 imageSlot, S32 imageShapeIndex) override; + void onImageAnimThreadChange(U32 imageSlot, S32 imageShapeIndex, ShapeBaseImageData::StateData* lastState, const char* anim, F32 pos, F32 timeScale, bool reset=false) override; + void onImageAnimThreadUpdate(U32 imageSlot, S32 imageShapeIndex, F32 dt) override; - virtual void updateDamageLevel(); - virtual void updateDamageState(); + void updateDamageLevel() override; + void updateDamageState() override; /// Set which client is controlling this player - void setControllingClient(GameConnection* client); + void setControllingClient(GameConnection* client) override; - void calcClassRenderData(); + void calcClassRenderData() override; /// Play sound for foot contact. /// @@ -707,23 +707,23 @@ public: /// @name Transforms /// @{ - void setTransform(const MatrixF &mat); - void getEyeTransform(MatrixF* mat); - void getEyeBaseTransform(MatrixF* mat, bool includeBank); - void getRenderEyeTransform(MatrixF* mat); - void getRenderEyeBaseTransform(MatrixF* mat, bool includeBank); - void getCameraParameters(F32 *min, F32 *max, Point3F *offset, MatrixF *rot); - void getMuzzleTransform(U32 imageSlot,MatrixF* mat); - void getRenderMuzzleTransform(U32 imageSlot,MatrixF* mat); + void setTransform(const MatrixF &mat) override; + void getEyeTransform(MatrixF* mat) override; + void getEyeBaseTransform(MatrixF* mat, bool includeBank) override; + void getRenderEyeTransform(MatrixF* mat) override; + void getRenderEyeBaseTransform(MatrixF* mat, bool includeBank) override; + void getCameraParameters(F32 *min, F32 *max, Point3F *offset, MatrixF *rot) override; + void getMuzzleTransform(U32 imageSlot,MatrixF* mat) override; + void getRenderMuzzleTransform(U32 imageSlot,MatrixF* mat) override; - virtual void getMuzzleVector(U32 imageSlot,VectorF* vec); + void getMuzzleVector(U32 imageSlot,VectorF* vec) override; /// @} F32 getSpeed() const; - Point3F getVelocity() const; - void setVelocity(const VectorF& vel); + Point3F getVelocity() const override; + void setVelocity(const VectorF& vel) override; /// Apply an impulse at the given point, with magnitude/direction of vec - void applyImpulse(const Point3F& pos,const VectorF& vec); + void applyImpulse(const Point3F& pos,const VectorF& vec) override; /// Get the rotation of the player const Point3F& getRotation() { return mRot; } /// Get the rotation of the head of the player @@ -749,19 +749,19 @@ public: void getMuzzlePointAI( U32 imageSlot, Point3F *point ); F32 getMaxForwardVelocity() const { return (mDataBlock != NULL ? mDataBlock->maxForwardSpeed : 0); } - virtual bool isDisplacable() const; - virtual Point3F getMomentum() const; - virtual void setMomentum(const Point3F &momentum); - virtual bool displaceObject(const Point3F& displaceVector); + bool isDisplacable() const override; + Point3F getMomentum() const override; + void setMomentum(const Point3F &momentum) override; + bool displaceObject(const Point3F& displaceVector) override; virtual bool getAIMove(Move*); bool checkDismountPosition(const MatrixF& oldPos, const MatrixF& newPos); ///< Is it safe to dismount here? // - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); - void onScaleChanged(); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void onScaleChanged() override; Box3F mScaledBox; // Animation @@ -771,28 +771,28 @@ public: bool setArmThread(const char* sequence); // Object control - void setControlObject(ShapeBase *obj); - ShapeBase* getControlObject(); + void setControlObject(ShapeBase *obj) override; + ShapeBase* getControlObject() override; // void updateWorkingCollisionSet(); - virtual void processTick(const Move *move); - void interpolateTick(F32 delta); - void advanceTime(F32 dt); - bool castRay(const Point3F &start, const Point3F &end, RayInfo* info); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere); - void buildConvex(const Box3F& box, Convex* convex); + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; + void advanceTime(F32 dt) override; + bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override; + bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override; + void buildConvex(const Box3F& box, Convex* convex) override; bool isControlObject(); - void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *); - void writePacketData(GameConnection *conn, BitStream *stream); - void readPacketData (GameConnection *conn, BitStream *stream); - U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); + void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *) override; + void writePacketData(GameConnection *conn, BitStream *stream) override; + void readPacketData (GameConnection *conn, BitStream *stream) override; + U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; - virtual void prepRenderImage( SceneRenderState* state ); + void prepRenderImage( SceneRenderState* state ) override; virtual void renderConvex( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ); - virtual void renderMountedImage( U32 imageSlot, TSRenderState &rstate, SceneRenderState *state ); + void renderMountedImage( U32 imageSlot, TSRenderState &rstate, SceneRenderState *state ) override; private: static void afx_consoleInit(); void afx_init(); @@ -802,15 +802,15 @@ private: static bool sCorpsesHiddenFromRayCast; public: - virtual void restoreAnimation(U32 tag); - virtual U32 getAnimationID(const char* name); - virtual U32 playAnimationByID(U32 anim_id, F32 pos, F32 rate, F32 trans, bool hold, bool wait, bool is_death_anim); - virtual F32 getAnimationDurationByID(U32 anim_id); - virtual bool isBlendAnimation(const char* name); - virtual const char* getLastClipName(U32 clip_tag); - virtual void unlockAnimation(U32 tag, bool force=false); - virtual U32 lockAnimation(); - virtual bool isAnimationLocked() const { return ((anim_clip_flags & BLOCK_USER_CONTROL) != 0); } + void restoreAnimation(U32 tag) override; + U32 getAnimationID(const char* name) override; + U32 playAnimationByID(U32 anim_id, F32 pos, F32 rate, F32 trans, bool hold, bool wait, bool is_death_anim) override; + F32 getAnimationDurationByID(U32 anim_id) override; + bool isBlendAnimation(const char* name) override; + const char* getLastClipName(U32 clip_tag) override; + void unlockAnimation(U32 tag, bool force=false) override; + U32 lockAnimation() override; + bool isAnimationLocked() const override { return ((anim_clip_flags & BLOCK_USER_CONTROL) != 0); } protected: bool overrideLookAnimation; diff --git a/Engine/source/T3D/pointLight.h b/Engine/source/T3D/pointLight.h index ad1f60bb9..5287bd285 100644 --- a/Engine/source/T3D/pointLight.h +++ b/Engine/source/T3D/pointLight.h @@ -37,8 +37,8 @@ protected: F32 mRadius; // LightBase - void _conformLights(); - void _renderViz( SceneRenderState *state ); + void _conformLights() override; + void _renderViz( SceneRenderState *state ) override; public: @@ -51,11 +51,11 @@ public: static void initPersistFields(); // SceneObject - virtual void setScale( const VectorF &scale ); + void setScale( const VectorF &scale ) 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; }; #endif // _POINTLIGHT_H_ diff --git a/Engine/source/T3D/portal.h b/Engine/source/T3D/portal.h index 7a13b1348..0d4aaadb8 100644 --- a/Engine/source/T3D/portal.h +++ b/Engine/source/T3D/portal.h @@ -132,9 +132,9 @@ class Portal : public Zone bool _generateCullingVolume( SceneTraversalState* state, SceneCullingVolume& outVolume ) const; // SceneSpace. - virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ); - virtual ColorI _getDefaultEditorSolidColor() const { return ColorI( 0, 255, 0, 45 ); } - virtual ColorI _getDefaultEditorWireframeColor() const + void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override; + ColorI _getDefaultEditorSolidColor() const override { return ColorI( 0, 255, 0, 45 ); } + ColorI _getDefaultEditorWireframeColor() const override { switch( mClassification ) { @@ -145,11 +145,11 @@ class Portal : public Zone } // SceneObject. - virtual void onSceneRemove(); + void onSceneRemove() override; // SceneZoneSpace. - virtual void _traverseConnectedZoneSpaces( SceneTraversalState* state ); - virtual void _disconnectAllZoneSpaces(); + void _traverseConnectedZoneSpaces( SceneTraversalState* state ) override; + void _disconnectAllZoneSpaces() override; public: @@ -190,20 +190,20 @@ class Portal : public Zone static void initPersistFields(); static void consoleInit(); - virtual bool writeField( StringTableEntry fieldName, const char* value ); - virtual String describeSelf() const; + bool writeField( StringTableEntry fieldName, const char* value ) override; + String describeSelf() const 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 setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; // SceneZoneSpace. - virtual void traverseZones( SceneTraversalState* state, U32 startZoneId ); - virtual void connectZoneSpace( SceneZoneSpace* zoneSpace ); - virtual void disconnectZoneSpace( SceneZoneSpace* zoneSpace ); + void traverseZones( SceneTraversalState* state, U32 startZoneId ) override; + void connectZoneSpace( SceneZoneSpace* zoneSpace ) override; + void disconnectZoneSpace( SceneZoneSpace* zoneSpace ) override; private: diff --git a/Engine/source/T3D/prefab.h b/Engine/source/T3D/prefab.h index 6e8cc9a7b..70914237b 100644 --- a/Engine/source/T3D/prefab.h +++ b/Engine/source/T3D/prefab.h @@ -65,19 +65,19 @@ public: StringTableEntry getTypeHint() const override; // SimObject - virtual bool onAdd(); - virtual void onRemove(); - virtual void onEditorEnable(); - virtual void onEditorDisable(); - virtual void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void onEditorEnable() override; + void onEditorDisable() override; + 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; // SceneObject - virtual void setTransform( const MatrixF &mat ); - virtual void setScale(const VectorF & scale); + void setTransform( const MatrixF &mat ) override; + void setScale(const VectorF & scale) override; // Prefab @@ -100,11 +100,11 @@ public: /// which is added to the Scene and returned to the caller. SimGroup* explode(); - 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; - bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &); + bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &) override; - virtual void getUtilizedAssets(Vector* usedAssetsList); + void getUtilizedAssets(Vector* usedAssetsList) override; S32 getChildGroup() { if (mChildGroup.isValid()) @@ -169,8 +169,8 @@ public: ExplodePrefabUndoAction( Prefab *prefab ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; protected: diff --git a/Engine/source/T3D/projectile.h b/Engine/source/T3D/projectile.h index 8e8f9542a..671c3f98f 100644 --- a/Engine/source/T3D/projectile.h +++ b/Engine/source/T3D/projectile.h @@ -68,7 +68,7 @@ class ProjectileData : public GameBaseData typedef GameBaseData Parent; protected: - bool onAdd(); + bool onAdd() override; public: DECLARE_SHAPEASSET(ProjectileData, ProjectileShape, onShapeChanged); @@ -134,9 +134,9 @@ public: ProjectileData(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorStr); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorStr) override; static bool setLifetime( void *object, const char *index, const char *data ); static bool setArmingDelay( void *object, const char *index, const char *data ); @@ -152,7 +152,7 @@ public: DECLARE_CALLBACK( void, onCollision, ( Projectile* proj, SceneObject* col, F32 fade, Point3F pos, Point3F normal ) ); public: ProjectileData(const ProjectileData&, bool = false); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } void onShapeChanged() {} }; @@ -190,26 +190,26 @@ public: DECLARE_CATEGORY("UNLISTED"); // SimObject - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); // NetObject - F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips); - U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); + F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips) override; + U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; // SceneObject - Point3F getVelocity() const { return mCurrVelocity; } - void processTick( const Move *move ); - void advanceTime( F32 dt ); - void interpolateTick( F32 delta ); + Point3F getVelocity() const override { return mCurrVelocity; } + void processTick( const Move *move ) override; + void advanceTime( F32 dt ) override; + void interpolateTick( F32 delta ) override; // GameBase - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; // Rendering - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; void prepBatchRender( SceneRenderState *state ); /// Updates velocity and position, and performs collision testing. @@ -269,8 +269,8 @@ protected: TSThread* mMaintainThread; // 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; } LightInfo *mLight; LightState mLightState; diff --git a/Engine/source/T3D/proximityMine.h b/Engine/source/T3D/proximityMine.h index 2c748317c..e505689af 100644 --- a/Engine/source/T3D/proximityMine.h +++ b/Engine/source/T3D/proximityMine.h @@ -62,9 +62,9 @@ public: ProximityMineData(); DECLARE_CONOBJECT( ProximityMineData ); static void initPersistFields(); - bool preload( bool server, String& errorStr ); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); + bool preload( bool server, String& errorStr ) override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; }; //---------------------------------------------------------------------------- @@ -99,7 +99,7 @@ protected: void setDeployedPos( const Point3F& pos, const Point3F& normal ); - void prepRenderImage( SceneRenderState* state ); + void prepRenderImage( SceneRenderState* state ) override; void renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ); public: @@ -110,18 +110,18 @@ public: static void consoleInit(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock( GameBaseData* dptr, bool reload ); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock( GameBaseData* dptr, bool reload ) override; - virtual void setTransform( const MatrixF& mat ); - void processTick( const Move* move ); + void setTransform( const MatrixF& mat ) override; + void processTick( const Move* move ) override; void explode(); - void advanceTime( F32 dt ); + void advanceTime( F32 dt ) 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; }; #endif // _PROXIMITYMINE_H_ diff --git a/Engine/source/T3D/rigidShape.h b/Engine/source/T3D/rigidShape.h index 90d960162..95ce0a361 100644 --- a/Engine/source/T3D/rigidShape.h +++ b/Engine/source/T3D/rigidShape.h @@ -46,7 +46,7 @@ class RigidShapeData : public ShapeBaseData typedef ShapeBaseData Parent; protected: - bool onAdd(); + bool onAdd() override; //-------------------------------------- Console set variables public: @@ -134,9 +134,9 @@ class RigidShapeData : public ShapeBaseData ~RigidShapeData(); static void initPersistFields(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorStr); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorStr) override; DECLARE_CONOBJECT(RigidShapeData); @@ -213,7 +213,7 @@ class RigidShape: public ShapeBase S32 mWorkingQueryBoxCountDown; // - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; void updatePos(F32 dt); bool updateCollision(F32 dt); bool resolveCollision(Rigid& ns,CollisionList& cList, F32 dt); @@ -223,13 +223,13 @@ class RigidShape: public ShapeBase void setPosition(const Point3F& pos,const QuatF& rot); void setRenderPosition(const Point3F& pos,const QuatF& rot); - void setTransform(const MatrixF& mat); + void setTransform(const MatrixF& mat) override; // virtual bool collideBody(const MatrixF& mat,Collision* info) = 0; void updateMove(const Move* move); - void writePacketData(GameConnection * conn, BitStream *stream); - void readPacketData (GameConnection * conn, BitStream *stream); + void writePacketData(GameConnection * conn, BitStream *stream) override; + void readPacketData (GameConnection * conn, BitStream *stream) override; void updateLiftoffDust( F32 dt ); @@ -254,28 +254,28 @@ public: static void consoleInit(); static void initPersistFields(); - void processTick(const Move *move); - bool onAdd(); - void onRemove(); + void processTick(const Move *move) override; + bool onAdd() override; + void onRemove() override; void _createPhysics(); /// Interpolates between move ticks @see processTick /// @param dt Change in time between the last call and this call to the function - void interpolateTick(F32 dt); - void advanceTime(F32 dt); + void interpolateTick(F32 dt) override; + void advanceTime(F32 dt) override; /// Disables collisions for this shape - void disableCollision(); + void disableCollision() override; /// Enables collisions for this shape - void enableCollision(); + void enableCollision() override; /// Returns the velocity of the shape - Point3F getVelocity() const; + Point3F getVelocity() const override; - void setEnergyLevel(F32 energy); + void setEnergyLevel(F32 energy) override; - void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ); + void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override; // xgalaxy cool hacks void reset(); @@ -293,18 +293,18 @@ public: /// Applies an impulse force /// @param r Point on the object to apply impulse to, r is relative to Center of Mass /// @param impulse Impulse vector to apply. - void applyImpulse(const Point3F &r, const Point3F &impulse); + void applyImpulse(const Point3F &r, const Point3F &impulse) override; /// Forces the client to jump to the RigidShape's transform rather /// then warp to it. void forceClientTransform(); - void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot); - void getCameraTransform(F32* pos, MatrixF* mat); + void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot) override; + void getCameraTransform(F32* pos, MatrixF* mat) 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; DECLARE_CONOBJECT(RigidShape); DECLARE_CATEGORY("Object \t Destructable"); diff --git a/Engine/source/T3D/sfx/sfx3DWorld.h b/Engine/source/T3D/sfx/sfx3DWorld.h index 66b3e1dd1..6e765b565 100644 --- a/Engine/source/T3D/sfx/sfx3DWorld.h +++ b/Engine/source/T3D/sfx/sfx3DWorld.h @@ -95,7 +95,7 @@ class SFX3DWorld : public SceneTracker FreeListChunker< SFX3DObject > mChunker; // SceneTracker. - virtual bool _isTrackableObject( SceneObject* object ) const; + bool _isTrackableObject( SceneObject* object ) const override; public: @@ -119,9 +119,9 @@ class SFX3DWorld : public SceneTracker void debugDump(); // SceneTracker. - virtual void registerObject( SceneObject* object ); - virtual void unregisterObject( SceneObject* object ); - virtual void updateObject( SceneObjectLink* object ); + void registerObject( SceneObject* object ) override; + void unregisterObject( SceneObject* object ) override; + void updateObject( SceneObjectLink* object ) override; }; diff --git a/Engine/source/T3D/sfx/sfxEmitter.h b/Engine/source/T3D/sfx/sfxEmitter.h index f21ef168d..e4e05a386 100644 --- a/Engine/source/T3D/sfx/sfxEmitter.h +++ b/Engine/source/T3D/sfx/sfxEmitter.h @@ -53,8 +53,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeSoundControls); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; //RDTODO: make 3D sound emitters yield their source when being culled @@ -244,16 +244,16 @@ class SFXEmitter : public SceneObject void stop(); // SimObject - bool onAdd(); - void onRemove(); - void onStaticModified( const char *slotName, const char *newValue = NULL ); - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *conn, BitStream *stream ); - void setTransform( const MatrixF &mat ); - void setScale( const VectorF &scale ); - bool containsPoint( const Point3F& point ) { return false; } - void prepRenderImage( SceneRenderState* state ); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void onStaticModified( const char *slotName, const char *newValue = NULL ) override; + U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override; + void unpackUpdate( NetConnection *conn, BitStream *stream ) override; + void setTransform( const MatrixF &mat ) override; + void setScale( const VectorF &scale ) override; + bool containsPoint( const Point3F& point ) override { return false; } + void prepRenderImage( SceneRenderState* state ) override; + void inspectPostApply() override; static void initPersistFields(); static void consoleInit(); diff --git a/Engine/source/T3D/sfx/sfxSpace.h b/Engine/source/T3D/sfx/sfxSpace.h index 73f3a3bc2..35f0f7f52 100644 --- a/Engine/source/T3D/sfx/sfxSpace.h +++ b/Engine/source/T3D/sfx/sfxSpace.h @@ -50,7 +50,7 @@ class SFXSpace : public SceneAmbientSoundObject< ScenePolyhedralObject< SceneSpa protected: // SceneSpace. - virtual ColorI _getDefaultEditorSolidColor() const { return ColorI( 244, 135, 18, 45 ); } + ColorI _getDefaultEditorSolidColor() const override { return ColorI( 244, 135, 18, 45 ); } public: diff --git a/Engine/source/T3D/shapeBase.h b/Engine/source/T3D/shapeBase.h index 8ba0c9023..706f54b72 100644 --- a/Engine/source/T3D/shapeBase.h +++ b/Engine/source/T3D/shapeBase.h @@ -117,7 +117,7 @@ class ShapeBaseConvex : public Convex Box3F box; public: - ShapeBaseConvex() :pShapeBase(NULL), transform(NULL), hullId(0), nodeTransform(0) { mType = ShapeBaseConvexType; } + ShapeBaseConvex() :pShapeBase(NULL), nodeTransform(0), transform(NULL), hullId(0) { mType = ShapeBaseConvexType; } ShapeBaseConvex(const ShapeBaseConvex& cv) { mObject = cv.mObject; pShapeBase = cv.pShapeBase; @@ -128,12 +128,12 @@ class ShapeBaseConvex : public Convex } void findNodeTransform(); - const MatrixF& getTransform() const; - Box3F getBoundingBox() const; - Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const; - Point3F support(const VectorF& v) 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& v) const override; + void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override; + void getPolyList(AbstractPolyList* list) override; }; //-------------------------------------------------------------------------- @@ -494,14 +494,14 @@ struct ShapeBaseImageData: public GameBaseData { DECLARE_CONOBJECT(ShapeBaseImageData); ShapeBaseImageData(); ~ShapeBaseImageData(); - bool onAdd(); - bool preload(bool server, String &errorStr); + bool onAdd() override; + bool preload(bool server, String &errorStr) override; S32 lookupState(const char* name); ///< Get a state by name. static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - void inspectPostApply(); + void inspectPostApply() override; void handleStateSoundTrack(const U32& stateId); @@ -644,7 +644,7 @@ public: /// @} - virtual bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; void computeAccelerator(U32 i); S32 findMountPoint(U32 n); @@ -655,8 +655,8 @@ public: ShapeBaseData(); ~ShapeBaseData(); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; /// @} /// @name Callbacks @@ -969,7 +969,7 @@ protected: void queueCollision( SceneObject *object, const VectorF &vec); /// @see SceneObject - virtual void onCollision( SceneObject *object, const VectorF &vec ); + void onCollision( SceneObject *object, const VectorF &vec ) override; /// @} protected: @@ -1126,7 +1126,7 @@ protected: /// @name Events /// @{ - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; virtual void onImage(U32 imageSlot, bool unmount); virtual void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState); virtual void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue); @@ -1197,11 +1197,11 @@ public: /// @name Initialization /// @{ - bool onAdd(); - void onRemove(); - void onSceneRemove(); + bool onAdd() override; + void onRemove() override; + void onSceneRemove() override; static void consoleInit(); - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; /// @} @@ -1407,10 +1407,10 @@ public: /// @name Mounted objects /// @{ - virtual void onMount( SceneObject *obj, S32 node ); - virtual void onUnmount( SceneObject *obj,S32 node ); - virtual void getMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat ); - virtual void getRenderMountTransform( F32 delta, S32 index, const MatrixF &xfm, MatrixF *outMat ); + void onMount( SceneObject *obj, S32 node ) override; + void onUnmount( SceneObject *obj,S32 node ) override; + void getMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat ) override; + void getRenderMountTransform( F32 delta, S32 index, const MatrixF &xfm, MatrixF *outMat ) override; /// @} /// Returns where the AI should be to repair this object @@ -1613,11 +1613,11 @@ public: /// @todo Find out what pos does /// @param pos TODO: Find out what this does /// @param mat Camera transform (out) - virtual void getCameraTransform(F32* pos,MatrixF* mat); + void getCameraTransform(F32* pos,MatrixF* mat) override; /// Gets the view transform for a particular eye, taking into account the current absolute /// orient and position values of the display device. - virtual void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ); + void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ) override; /// Gets the index of a node inside a mounted image given the name /// @param imageSlot Image slot @@ -1703,7 +1703,7 @@ public: /// @{ /// Returns the level of screenflash that should be used - virtual F32 getDamageFlash() const; + F32 getDamageFlash() const override; /// Sets the flash level /// @param amt Level of flash @@ -1711,7 +1711,7 @@ public: /// White out is the flash-grenade blindness effect /// This returns the level of flash to create - virtual F32 getWhiteOut() const; + F32 getWhiteOut() const override; /// Set the level of flash blindness virtual void setWhiteOut(const F32); @@ -1722,12 +1722,12 @@ public: /// Sets the velocity of this object /// @param vel Velocity vector - virtual void setVelocity(const VectorF& vel); + void setVelocity(const VectorF& vel) override; /// Applies an impulse force to this object /// @param pos Position where impulse came from in world space /// @param vec Velocity vector (Impulse force F = m * v) - virtual void applyImpulse(const Point3F& pos,const VectorF& vec); + void applyImpulse(const Point3F& pos,const VectorF& vec) override; /// @} @@ -1735,17 +1735,17 @@ public: /// @{ /// Returns the object controlling this object - ShapeBase* getControllingObject() { return mControllingObject; } + ShapeBase* getControllingObject() override { return mControllingObject; } /// Sets the controlling object /// @param obj New controlling object virtual void setControllingObject(ShapeBase* obj); /// - virtual void setControllingClient( GameConnection* connection ); + void setControllingClient( GameConnection* connection ) override; /// Returns the object this is controlling - virtual ShapeBase* getControlObject(); + ShapeBase* getControlObject() override; /// sets the object this is controlling /// @param obj New controlled object @@ -1758,35 +1758,35 @@ public: bool isFirstPerson() const; /// Returns true if the camera uses this objects eye point (defined by modeler) - bool useObjsEyePoint() const; + bool useObjsEyePoint() const override; /// Returns true if this object can only be used as a first person camera - bool onlyFirstPerson() const; + bool onlyFirstPerson() const override; /// Returns the vertical field of view in degrees for /// this object if used as a camera. - virtual F32 getCameraFov() { return mCameraFov; } + F32 getCameraFov() override { return mCameraFov; } /// Returns the default vertical field of view in degrees /// if this object is used as a camera. - virtual F32 getDefaultCameraFov() { return mDataBlock->cameraDefaultFov; } + F32 getDefaultCameraFov() override { return mDataBlock->cameraDefaultFov; } /// Sets the vertical field of view in degrees for this /// object if used as a camera. /// @param yfov The vertical FOV in degrees to test. - virtual void setCameraFov(F32 fov); + void setCameraFov(F32 fov) override; /// Returns true if the vertical FOV in degrees is within /// allowable parameters of the datablock. /// @param yfov The vertical FOV in degrees to test. /// @see ShapeBaseData::cameraMinFov /// @see ShapeBaseData::cameraMaxFov - virtual bool isValidCameraFov(F32 fov); + bool isValidCameraFov(F32 fov) override; /// @} - void processTick(const Move *move); - void advanceTime(F32 dt); + void processTick(const Move *move) override; + void advanceTime(F32 dt) override; /// @name Rendering /// @{ @@ -1795,7 +1795,7 @@ public: TSShape const* getShape(); /// @see SceneObject - virtual void prepRenderImage( SceneRenderState* state ); + void prepRenderImage( SceneRenderState* state ) override; /// Used from ShapeBase::_prepRenderImage() to submit render /// instances for the main shape or its mounted elements. @@ -1809,12 +1809,12 @@ public: /// @} /// Control object scoping - void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *camInfo); + void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *camInfo) override; - bool castRay(const Point3F &start, const Point3F &end, RayInfo* info); - bool castRayRendered(const Point3F &start, const Point3F &end, RayInfo* info); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere); - void buildConvex(const Box3F& box, Convex* convex); + bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override; + bool castRayRendered(const Point3F &start, const Point3F &end, RayInfo* info) override; + bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere) override; + void buildConvex(const Box3F& box, Convex* convex) override; /// @name Rendering /// @{ @@ -1829,7 +1829,7 @@ public: /// it is removed entirely from collisions, it is not ghosted and is /// essentially "non existant" as far as simulation is concerned. /// @param hidden True if object is to be hidden - virtual void setHidden(bool hidden); + void setHidden(bool hidden) override; /// Returns true if this object can be damaged bool isInvincible(); @@ -1846,8 +1846,8 @@ public: //void registerLights(LightManager * lightManager, bool lightingScene); // ISceneLight - virtual void submitLights( LightManager *lm, bool staticLighting ); - virtual LightInfo* getLight() { return NULL; } + void submitLights( LightManager *lm, bool staticLighting ) override; + LightInfo* getLight() override { return NULL; } /// @} @@ -1861,20 +1861,20 @@ public: /// Returns the height of the liquid on this object F32 getLiquidHeight() { return mLiquidHeight; } - virtual WaterObject* getCurrentWaterObject(); + WaterObject* getCurrentWaterObject() override; void setCurrentWaterObject( WaterObject *obj ); - void setTransform(const MatrixF & mat); - virtual F32 getMass() const { return mMass; } + void setTransform(const MatrixF & mat) override; + F32 getMass() const override { return mMass; } /// @name Network /// @{ - F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips); - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); - void writePacketData(GameConnection *conn, BitStream *stream); - void readPacketData(GameConnection *conn, BitStream *stream); + F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips) override; + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; + void writePacketData(GameConnection *conn, BitStream *stream) override; + void readPacketData(GameConnection *conn, BitStream *stream) override; /// @} @@ -1933,7 +1933,7 @@ public: virtual U32 lockAnimation() { return 0; } virtual bool isAnimationLocked() const { return false; } - virtual void setSelectionFlags(U8 flags); + void setSelectionFlags(U8 flags) override; }; diff --git a/Engine/source/T3D/spotLight.h b/Engine/source/T3D/spotLight.h index 20e6426f6..c5a8f998e 100644 --- a/Engine/source/T3D/spotLight.h +++ b/Engine/source/T3D/spotLight.h @@ -41,8 +41,8 @@ protected: F32 mOuterConeAngle; // LightBase - void _conformLights(); - void _renderViz( SceneRenderState *state ); + void _conformLights() override; + void _renderViz( SceneRenderState *state ) override; public: @@ -55,11 +55,11 @@ public: static void initPersistFields(); // SceneObject - virtual void setScale( const VectorF &scale ); + void setScale( const VectorF &scale ) 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; }; #endif // _SPOTLIGHT_H_ diff --git a/Engine/source/T3D/staticShape.h b/Engine/source/T3D/staticShape.h index a97375847..4976758dd 100644 --- a/Engine/source/T3D/staticShape.h +++ b/Engine/source/T3D/staticShape.h @@ -48,11 +48,11 @@ struct StaticShapeData: public ShapeBaseData { // DECLARE_CONOBJECT(StaticShapeData); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; public: StaticShapeData(const StaticShapeData&, bool = false); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } }; @@ -65,7 +65,7 @@ class StaticShape: public ShapeBase StaticShapeData* mDataBlock; bool mPowered; - void onUnmount(SceneObject* obj,S32 node); + void onUnmount(SceneObject* obj,S32 node) override; protected: enum MaskBits { @@ -80,16 +80,16 @@ public: StaticShape(); ~StaticShape(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData *dptr, bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData *dptr, bool reload) override; - void processTick(const Move *move); - void interpolateTick(F32 delta); - void setTransform(const MatrixF &mat); + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; + void setTransform(const MatrixF &mat) 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; // power void setPowered(bool power) {mPowered = power;} diff --git a/Engine/source/T3D/trigger.h b/Engine/source/T3D/trigger.h index a661c32bd..7cd00dd34 100644 --- a/Engine/source/T3D/trigger.h +++ b/Engine/source/T3D/trigger.h @@ -58,10 +58,10 @@ struct TriggerData: public GameBaseData { DECLARE_CALLBACK( void, onTickTrigger, ( Trigger* trigger ) ); DECLARE_CALLBACK( void, onLeaveTrigger, ( Trigger* trigger, GameBase* obj ) ); - bool onAdd(); + bool onAdd() override; static void initPersistFields(); - virtual void packData (BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData (BitStream* stream) override; + void unpackData(BitStream* stream) override; }; class Trigger : public GameBase @@ -94,7 +94,7 @@ class Trigger : public GameBase static const U32 CMD_SIZE = 1024; - void onUnmount(SceneObject* obj,S32 node); + void onUnmount(SceneObject* obj,S32 node) override; protected: @@ -113,10 +113,10 @@ class Trigger : public GameBase bool testTrippable(); bool testCondition(); bool evalCmD(String*); - void processTick(const Move *move); - void interpolateTick(F32 delta); + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; - void buildConvex(const Box3F& box, Convex* convex); + void buildConvex(const Box3F& box, Convex* convex) override; static bool setEnterCmd(void *object, const char *index, const char *data); static bool setLeaveCmd(void *object, const char *index, const char *data); @@ -135,21 +135,21 @@ class Trigger : public GameBase static void consoleInit(); static void initPersistFields(); void testObjects(); - bool onAdd(); - void onRemove(); - void onDeleteNotify(SimObject*); - void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify(SimObject*) override; + 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; // SceneObject - void setTransform(const MatrixF &mat); - void prepRenderImage( SceneRenderState* state ); + void setTransform(const MatrixF &mat) override; + void prepRenderImage( SceneRenderState* state ) override; // GameBase - bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; // Trigger void setTriggerPolyhedron(const Polyhedron&); @@ -161,7 +161,7 @@ class Trigger : public GameBase void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ); - bool castRay(const Point3F &start, const Point3F &end, RayInfo* info); + bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override; }; inline U32 Trigger::getNumTriggeringObjects() const diff --git a/Engine/source/T3D/tsStatic.h b/Engine/source/T3D/tsStatic.h index fb870b88a..d5c783c0b 100644 --- a/Engine/source/T3D/tsStatic.h +++ b/Engine/source/T3D/tsStatic.h @@ -87,16 +87,16 @@ public: public: // Returns the bounding box in world coordinates - Box3F getBoundingBox() const; - Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const; + Box3F getBoundingBox() const override; + Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override; - void getFeatures(const MatrixF& mat, const VectorF& n, ConvexFeature* cf); + void getFeatures(const MatrixF& mat, const VectorF& n, ConvexFeature* cf) override; // This returns a list of convex faces to collide against - void getPolyList(AbstractPolyList* list); + void getPolyList(AbstractPolyList* list) override; // This returns the furthest point from the input vector - Point3F support(const VectorF& v) const; + Point3F support(const VectorF& v) const override; }; @@ -152,16 +152,16 @@ protected: Vector mChangingMaterials; Vector mMaterials; - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Collision void prepCollision(); - bool castRay(const Point3F& start, const Point3F& end, RayInfo* info); - bool castRayRendered(const Point3F& start, const Point3F& end, RayInfo* info); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere); - bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F& box, const SphereF&); - void buildConvex(const Box3F& box, Convex* convex); + bool castRay(const Point3F& start, const Point3F& end, RayInfo* info) override; + bool castRayRendered(const Point3F& start, const Point3F& end, RayInfo* info) override; + bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere) override; + bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F& box, const SphereF&) override; + void buildConvex(const Box3F& box, Convex* convex) override; bool _createShape(); @@ -173,11 +173,11 @@ protected: void onShapeChanged(); // ProcessObject - virtual void processTick(const Move* move); - virtual void interpolateTick(F32 delta); - virtual void advanceTime(F32 dt); + void processTick(const Move* move) override; + void interpolateTick(F32 delta) override; + void advanceTime(F32 dt) override; - virtual void onDynamicModified(const char* slotName, const char* newValue); + void onDynamicModified(const char* slotName, const char* newValue) override; /// Start or stop processing ticks depending on our state. void _updateShouldTick(); @@ -249,16 +249,16 @@ public: void reSkin(); // 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; // SceneObject - void setTransform(const MatrixF& mat); - void onScaleChanged(); - void prepRenderImage(SceneRenderState* state); - void inspectPostApply(); - virtual void onMount(SceneObject* obj, S32 node); - virtual void onUnmount(SceneObject* obj, S32 node); + void setTransform(const MatrixF& mat) override; + void onScaleChanged() override; + void prepRenderImage(SceneRenderState* state) override; + void inspectPostApply() override; + void onMount(SceneObject* obj, S32 node) override; + void onUnmount(SceneObject* obj, S32 node) override; /// The type of mesh data use for collision queries. MeshType getCollisionType() const { return mCollisionType; } @@ -274,7 +274,7 @@ public: const Vector& getLOSDetails() const { return mLOSDetails; } bool hasAnim() { return mAmbientThread != NULL; } #ifdef TORQUE_TOOLS - virtual void onInspect(GuiInspector*); + void onInspect(GuiInspector*) override; #endif void updateMaterials(); @@ -282,10 +282,10 @@ public: bool hasNode(const char* nodeName); void getNodeTransform(const char *nodeName, const MatrixF &xfm, MatrixF *outMat); - virtual void getUtilizedAssets(Vector* usedAssetsList); + void getUtilizedAssets(Vector* usedAssetsList) override; private: - virtual void onStaticModified(const char* slotName, const char* newValue = NULL); + void onStaticModified(const char* slotName, const char* newValue = NULL) override; protected: Vector mDecalDetails; Vector* mDecalDetailsPtr; @@ -309,7 +309,7 @@ public: Point2F mGradientRange; private: void set_special_typing(); - virtual void setSelectionFlags(U8 flags); + void setSelectionFlags(U8 flags) override; }; typedef TSStatic::MeshType TSMeshType; diff --git a/Engine/source/T3D/turret/aiTurretShape.h b/Engine/source/T3D/turret/aiTurretShape.h index 138389691..ef26984c5 100644 --- a/Engine/source/T3D/turret/aiTurretShape.h +++ b/Engine/source/T3D/turret/aiTurretShape.h @@ -140,11 +140,11 @@ public: static void initPersistFields(); - virtual bool onAdd(); - virtual bool preload(bool server, String &errorStr); + bool onAdd() override; + bool preload(bool server, String &errorStr) override; - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; S32 lookupState(const char* name); ///< Get a state by name. }; @@ -271,9 +271,9 @@ public: static void initPersistFields(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData *dptr, bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData *dptr, bool reload) override; void addToIgnoreList(ShapeBase* obj); void removeFromIgnoreList(ShapeBase* obj); @@ -305,7 +305,7 @@ public: void setAllGunsFiring(bool fire); void setGunSlotFiring(S32 slot, bool fire); - virtual void setTransform(const MatrixF &mat); + void setTransform(const MatrixF &mat) override; void getScanTransform(MatrixF& mat); void getAimTransform(MatrixF& mat); @@ -316,13 +316,13 @@ public: void recenterTurret(); - virtual void processTick(const Move *move); - virtual void advanceTime(F32 dt); + void processTick(const Move *move) override; + void advanceTime(F32 dt) override; - 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; - void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ); + void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override; DECLARE_CONOBJECT(AITurretShape); }; diff --git a/Engine/source/T3D/turret/turretShape.h b/Engine/source/T3D/turret/turretShape.h index 13f354495..b31024e07 100644 --- a/Engine/source/T3D/turret/turretShape.h +++ b/Engine/source/T3D/turret/turretShape.h @@ -88,10 +88,10 @@ public: static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; DECLARE_CALLBACK( void, onMountObject, ( SceneObject* turret, SceneObject* obj, S32 node ) ); DECLARE_CALLBACK( void, onUnmountObject, ( SceneObject* turret, SceneObject* obj ) ); @@ -150,7 +150,7 @@ protected: void _applyLimits(Point3F& rot); bool _outsideLimits(Point3F& rot); ///< Return true if any angle is outside of the limits - void onUnmount(SceneObject* obj,S32 node); + void onUnmount(SceneObject* obj,S32 node) override; // Script level control bool allowManualRotation; @@ -158,9 +158,9 @@ protected: void updateAnimation(F32 dt); - virtual void onImage(U32 imageSlot, bool unmount); - virtual void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState); - virtual void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue); + void onImage(U32 imageSlot, bool unmount) override; + void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState) override; + void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue) override; public: @@ -169,18 +169,18 @@ public: static void initPersistFields(); - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData *dptr, bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData *dptr, bool reload) override; const char* getStateName(); - virtual void updateDamageLevel(); + void updateDamageLevel() override; - virtual void processTick(const Move *move); - virtual void interpolateTick(F32 dt); - virtual void advanceTime(F32 dt); + void processTick(const Move *move) override; + void interpolateTick(F32 dt) override; + void advanceTime(F32 dt) override; - virtual void setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; virtual bool getAllowManualRotation() { return allowManualRotation; } virtual void setAllowManualRotation(bool allow) { setMaskBits(TurretUpdateMask); allowManualRotation = allow; } @@ -197,28 +197,28 @@ public: bool doRespawn() { return mRespawn; }; - virtual void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity ); - virtual void unmountObject( SceneObject *obj ); + void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity ) override; + void unmountObject( SceneObject *obj ) override; - virtual void getCameraParameters(F32 *min,F32* max,Point3F* offset,MatrixF* rot); - virtual void getCameraTransform(F32* pos,MatrixF* mat); + void getCameraParameters(F32 *min,F32* max,Point3F* offset,MatrixF* rot) override; + void getCameraTransform(F32* pos,MatrixF* mat) override; - virtual void writePacketData( GameConnection* conn, BitStream* stream ); - virtual void readPacketData( GameConnection* conn, BitStream* stream ); - virtual U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - virtual void unpackUpdate(NetConnection *conn, BitStream *stream); + void writePacketData( GameConnection* conn, BitStream* stream ) override; + void readPacketData( GameConnection* conn, BitStream* stream ) override; + U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; virtual void getWeaponMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat ); virtual void getRenderWeaponMountTransform( F32 delta, S32 index, const MatrixF &xfm, MatrixF *outMat ); - virtual void getImageTransform(U32 imageSlot,MatrixF* mat); - virtual void getRenderImageTransform(U32 imageSlot,MatrixF* mat,bool noEyeOffset=false); + void getImageTransform(U32 imageSlot,MatrixF* mat) override; + void getRenderImageTransform(U32 imageSlot,MatrixF* mat,bool noEyeOffset=false) override; - virtual void getImageTransform(U32 imageSlot,S32 node, MatrixF* mat); - virtual void getRenderImageTransform(U32 imageSlot,S32 node, MatrixF* mat); + void getImageTransform(U32 imageSlot,S32 node, MatrixF* mat) override; + void getRenderImageTransform(U32 imageSlot,S32 node, MatrixF* mat) override; - virtual void prepRenderImage( SceneRenderState* state ); - virtual void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ); + void prepRenderImage( SceneRenderState* state ) override; + void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override; DECLARE_CONOBJECT(TurretShape); }; diff --git a/Engine/source/T3D/vehicles/flyingVehicle.h b/Engine/source/T3D/vehicles/flyingVehicle.h index 96beed99a..141515e83 100644 --- a/Engine/source/T3D/vehicles/flyingVehicle.h +++ b/Engine/source/T3D/vehicles/flyingVehicle.h @@ -107,9 +107,9 @@ struct FlyingVehicleData: public VehicleData { FlyingVehicleData(); DECLARE_CONOBJECT(FlyingVehicleData); static void initPersistFields(); - bool preload(bool server, String &errorStr); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + bool preload(bool server, String &errorStr) override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -166,9 +166,9 @@ class FlyingVehicle: public Vehicle SimObjectPtr mJetEmitter[FlyingVehicleData::MaxJetNodes]; // - bool onNewDataBlock(GameBaseData* dptr,bool reload); - void updateMove(const Move *move); - void updateForces(F32); + bool onNewDataBlock(GameBaseData* dptr,bool reload) override; + void updateMove(const Move *move) override; + void updateForces(F32) override; // bool collideBody(const MatrixF& mat,Collision* info); F32 getHeight(); @@ -177,7 +177,7 @@ class FlyingVehicle: public Vehicle void updateEngineSound(F32 level); void updateEmitter(bool active,F32 dt,ParticleEmitterData *emitter,S32 idx,S32 count); - U32 getCollisionMask(); + U32 getCollisionMask() override; public: DECLARE_CONOBJECT(FlyingVehicle); DECLARE_CATEGORY("Actor \t Controllable"); @@ -186,15 +186,15 @@ class FlyingVehicle: public Vehicle FlyingVehicle(); ~FlyingVehicle(); - bool onAdd(); - void onRemove(); - void interpolateTick(F32 dt); - void advanceTime(F32 dt); + bool onAdd() override; + void onRemove() override; + void interpolateTick(F32 dt) override; + void advanceTime(F32 dt) override; - void writePacketData(GameConnection *conn, BitStream *stream); - void readPacketData(GameConnection *conn, BitStream *stream); - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); + void writePacketData(GameConnection *conn, BitStream *stream) override; + void readPacketData(GameConnection *conn, BitStream *stream) override; + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; void useCreateHeight(bool val); }; diff --git a/Engine/source/T3D/vehicles/guiSpeedometer.cpp b/Engine/source/T3D/vehicles/guiSpeedometer.cpp index a145f8b8d..e8adae6cc 100644 --- a/Engine/source/T3D/vehicles/guiSpeedometer.cpp +++ b/Engine/source/T3D/vehicles/guiSpeedometer.cpp @@ -51,7 +51,7 @@ class GuiSpeedometerHud : public GuiBitmapCtrl public: GuiSpeedometerHud(); - void onRender( Point2I, const RectI &); + void onRender( Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiSpeedometerHud ); DECLARE_CATEGORY( "Gui Game" ); diff --git a/Engine/source/T3D/vehicles/hoverVehicle.h b/Engine/source/T3D/vehicles/hoverVehicle.h index a39cefdc6..7a3dc9941 100644 --- a/Engine/source/T3D/vehicles/hoverVehicle.h +++ b/Engine/source/T3D/vehicles/hoverVehicle.h @@ -36,7 +36,7 @@ class HoverVehicleData : public VehicleData typedef VehicleData Parent; protected: - bool onAdd(); + bool onAdd() override; //-------------------------------------- Console set variables public: @@ -112,9 +112,9 @@ class HoverVehicleData : public VehicleData HoverVehicleData(); ~HoverVehicleData(); - void packData(BitStream*); - void unpackData(BitStream*); - bool preload(bool server, String &errorStr); + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool preload(bool server, String &errorStr) override; DECLARE_CONOBJECT(HoverVehicleData); static void initPersistFields(); @@ -131,18 +131,18 @@ class HoverVehicle : public Vehicle SimObjectPtr mDustTrailEmitter; protected: - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData *dptr,bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData *dptr,bool reload) override; void updateDustTrail( F32 dt ); // Vehicle overrides protected: - void updateMove(const Move *move); + void updateMove(const Move *move) override; // Physics protected: - void updateForces(F32); + void updateForces(F32) override; F32 getBaseStabilizerLength() const; bool mFloating; @@ -188,7 +188,7 @@ class HoverVehicle : public Vehicle static JetActivation sJetActivation[NumThrustDirections]; SimObjectPtr mJetEmitter[HoverVehicleData::MaxJetNodes]; - U32 getCollisionMask(); + U32 getCollisionMask() override; void updateJet(F32 dt); void updateEmitter(bool active,F32 dt,ParticleEmitterData *emitter,S32 idx,S32 count); public: @@ -197,14 +197,14 @@ class HoverVehicle : public Vehicle // Time/Move Management public: - void advanceTime(F32 dt); + void advanceTime(F32 dt) override; DECLARE_CONOBJECT(HoverVehicle); DECLARE_CATEGORY("Actor \t Controllable"); // static void initPersistFields(); - 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; }; #endif // _H_HOVERVEHICLE diff --git a/Engine/source/T3D/vehicles/vehicle.h b/Engine/source/T3D/vehicles/vehicle.h index 6fc31d43b..402a3109a 100644 --- a/Engine/source/T3D/vehicles/vehicle.h +++ b/Engine/source/T3D/vehicles/vehicle.h @@ -73,10 +73,10 @@ struct VehicleData : public RigidShapeData // VehicleData(); - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; DECLARE_CONOBJECT(VehicleData); }; @@ -104,7 +104,7 @@ class Vehicle : public RigidShape SimObjectPtr mDamageEmitterList[VehicleData::VC_NUM_DAMAGE_EMITTERS]; // - virtual bool onNewDataBlock( GameBaseData *dptr, bool reload ); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; void updatePos(F32 dt); static void findCallback(SceneObject* obj,void * key); @@ -112,11 +112,11 @@ class Vehicle : public RigidShape virtual void updateMove(const Move* move); virtual void updateForces(F32 dt); - void writePacketData(GameConnection * conn, BitStream *stream); - void readPacketData (GameConnection * conn, BitStream *stream); - U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); - void setControllingClient(GameConnection* connection); + void writePacketData(GameConnection * conn, BitStream *stream) override; + void readPacketData (GameConnection * conn, BitStream *stream) override; + U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; + void setControllingClient(GameConnection* connection) override; void updateLiftoffDust( F32 dt ); void updateDamageSmoke( F32 dt ); @@ -142,26 +142,26 @@ public: Vehicle(); static void consoleInit(); static void initPersistFields(); - void processTick(const Move *move); - bool onAdd(); - void onRemove(); + void processTick(const Move *move) override; + bool onAdd() override; + void onRemove() override; /// Interpolates between move ticks @see processTick /// @param dt Change in time between the last call and this call to the function - void advanceTime(F32 dt); + void advanceTime(F32 dt) override; - void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ); + void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override; ///@name Rigid body methods ///@{ - void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot); - void getCameraTransform(F32* pos, MatrixF* mat); + void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot) override; + void getCameraTransform(F32* pos, MatrixF* mat) override; ///@} /// @name Mounted objects /// @{ - virtual void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity ); + void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity ) override; /// @} DECLARE_CONOBJECT(Vehicle); diff --git a/Engine/source/T3D/vehicles/vehicleBlocker.h b/Engine/source/T3D/vehicles/vehicleBlocker.h index 12441b044..85d881a19 100644 --- a/Engine/source/T3D/vehicles/vehicleBlocker.h +++ b/Engine/source/T3D/vehicles/vehicleBlocker.h @@ -37,11 +37,11 @@ class VehicleBlocker : public SceneObject friend class VehicleBlockerConvex; protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Collision - void buildConvex(const Box3F& box, Convex* convex); + void buildConvex(const Box3F& box, Convex* convex) override; protected: Convex* mConvexList; @@ -55,8 +55,8 @@ class VehicleBlocker : public SceneObject DECLARE_CATEGORY("Volume"); static void initPersistFields(); - 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; }; #endif // _H_VEHICLEBLOCKER diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.h b/Engine/source/T3D/vehicles/wheeledVehicle.h index 1c9e9bff3..61ddce65f 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.h +++ b/Engine/source/T3D/vehicles/wheeledVehicle.h @@ -70,9 +70,9 @@ struct WheeledVehicleTire: public SimDataBlock WheeledVehicleTire(); DECLARE_CONOBJECT(WheeledVehicleTire); static void initPersistFields(); - bool preload(bool, String &errorStr); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + bool preload(bool, String &errorStr) override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; void onShapeChanged() {} }; @@ -93,8 +93,8 @@ struct WheeledVehicleSpring: public SimDataBlock WheeledVehicleSpring(); DECLARE_CONOBJECT(WheeledVehicleSpring); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -146,10 +146,10 @@ struct WheeledVehicleData: public VehicleData WheeledVehicleData(); DECLARE_CONOBJECT(WheeledVehicleData); static void initPersistFields(); - bool preload(bool, String &errorStr); + bool preload(bool, String &errorStr) override; bool mirrorWheel(Wheel* we); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -207,12 +207,12 @@ class WheeledVehicle: public Vehicle TSThread* mSteeringThread; // - bool onNewDataBlock( GameBaseData *dptr, bool reload ); - void processTick(const Move *move); - void updateMove(const Move *move); - void updateForces(F32 dt); + bool onNewDataBlock( GameBaseData *dptr, bool reload ) override; + void processTick(const Move *move) override; + void updateMove(const Move *move) override; + void updateForces(F32 dt) override; void extendWheels(bool clientHack = false); - void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ); + void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override; // Client sounds & particles void updateWheelThreads(); @@ -221,7 +221,7 @@ class WheeledVehicle: public Vehicle void updateSquealSound(F32 level); void updateJetSound(); - virtual U32 getCollisionMask(); + U32 getCollisionMask() override; public: DECLARE_CONOBJECT(WheeledVehicle); @@ -231,10 +231,10 @@ public: WheeledVehicle(); ~WheeledVehicle(); - bool onAdd(); - void onRemove(); - void advanceTime(F32 dt); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere); + bool onAdd() override; + void onRemove() override; + void advanceTime(F32 dt) override; + bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override; S32 getWheelCount(); Wheel *getWheel(U32 index) {return &mWheel[index];} @@ -245,10 +245,10 @@ public: void getWheelInstAndTransform( U32 wheel, TSShapeInstance** inst, MatrixF* xfrm ) const; - void writePacketData(GameConnection * conn, BitStream *stream); - void readPacketData(GameConnection * conn, BitStream *stream); - U32 packUpdate(NetConnection * conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection * conn, BitStream *stream); + void writePacketData(GameConnection * conn, BitStream *stream) override; + void readPacketData(GameConnection * conn, BitStream *stream) override; + U32 packUpdate(NetConnection * conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection * conn, BitStream *stream) override; }; diff --git a/Engine/source/T3D/zone.h b/Engine/source/T3D/zone.h index 090764aea..313923149 100644 --- a/Engine/source/T3D/zone.h +++ b/Engine/source/T3D/zone.h @@ -55,7 +55,7 @@ class Zone : public SceneAmbientSoundObject< ScenePolyhedralZone > protected: // SceneVolume. - virtual ColorI _getDefaultEditorSolidColor() const { return ColorI( 255, 0, 0, 45 ); } + ColorI _getDefaultEditorSolidColor() const override { return ColorI( 255, 0, 0, 45 ); } public: diff --git a/Engine/source/afx/afxCamera.h b/Engine/source/afx/afxCamera.h index 78e4bcb98..992a2a1b2 100644 --- a/Engine/source/afx/afxCamera.h +++ b/Engine/source/afx/afxCamera.h @@ -52,8 +52,8 @@ struct afxCameraData: public ShapeBaseData { // DECLARE_CONOBJECT(afxCameraData); static void initPersistFields(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; }; @@ -140,7 +140,7 @@ public: void setThirdPersonSnapClient(); const char* getMode(); - bool isCamera() const { return true; } + bool isCamera() const override { return true; } DECLARE_CONOBJECT(afxCamera); DECLARE_CATEGORY("UNLISTED"); @@ -151,35 +151,35 @@ private: // 3POV SECTION bool test_blocked_line(const Point3F& start, const Point3F& end); public: // STD OVERRIDES SECTION - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify(SimObject *obj); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify(SimObject *obj) override; - virtual void advanceTime(F32 dt); - virtual void processTick(const Move* move); - virtual void interpolateTick(F32 delta); + void advanceTime(F32 dt) override; + void processTick(const Move* move) override; + void interpolateTick(F32 delta) override; - virtual void writePacketData(GameConnection *conn, BitStream *stream); - virtual void readPacketData(GameConnection *conn, BitStream *stream); - virtual U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); - virtual void unpackUpdate(NetConnection *conn, BitStream *stream); + void writePacketData(GameConnection *conn, BitStream *stream) override; + void readPacketData(GameConnection *conn, BitStream *stream) override; + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; - virtual void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*); - virtual void getCameraTransform(F32* pos,MatrixF* mat); - virtual void setTransform(const MatrixF& mat); + void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*) override; + void getCameraTransform(F32* pos,MatrixF* mat) override; + void setTransform(const MatrixF& mat) override; - virtual void onEditorEnable(); - virtual void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; - virtual F32 getCameraFov(); - virtual F32 getDefaultCameraFov(); - virtual bool isValidCameraFov(F32 fov); - virtual void setCameraFov(F32 fov); + F32 getCameraFov() override; + F32 getDefaultCameraFov() override; + bool isValidCameraFov(F32 fov) override; + void setCameraFov(F32 fov) override; - virtual F32 getDamageFlash() const; - virtual F32 getWhiteOut() const; + F32 getDamageFlash() const override; + F32 getWhiteOut() const override; - virtual void setControllingClient( GameConnection* connection ); + void setControllingClient( GameConnection* connection ) override; }; diff --git a/Engine/source/afx/afxChoreographer.h b/Engine/source/afx/afxChoreographer.h index 70a301350..2442feef7 100644 --- a/Engine/source/afx/afxChoreographer.h +++ b/Engine/source/afx/afxChoreographer.h @@ -49,10 +49,10 @@ public: /*C*/ afxChoreographerData(); /*C*/ afxChoreographerData(const afxChoreographerData&, bool = false); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; static void initPersistFields(); @@ -137,12 +137,12 @@ public: static void initPersistFields(); - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify(SimObject*); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify(SimObject*) override; + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; virtual void sync_with_clients() { } @@ -196,7 +196,7 @@ public: //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// // missile watcher callbacks public: - virtual void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) { } + void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override { } DECLARE_CONOBJECT(afxChoreographer); DECLARE_CATEGORY("UNLISTED"); diff --git a/Engine/source/afx/afxConstraint.h b/Engine/source/afx/afxConstraint.h index a17ed3b29..aa7b94559 100644 --- a/Engine/source/afx/afxConstraint.h +++ b/Engine/source/afx/afxConstraint.h @@ -278,14 +278,14 @@ public: virtual ~afxPointConstraint(); virtual void set(Point3F point, Point3F vector); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual SceneObject* getSceneObject() { return 0; } - virtual void restoreObject(SceneObject*) { } - virtual U16 getScopeId() { return 0; } - virtual U32 getTriggers() { return 0; } + SceneObject* getSceneObject() override { return 0; } + void restoreObject(SceneObject*) override { } + U16 getScopeId() override { return 0; } + U32 getTriggers() override { return 0; } - virtual void unset() { set(Point3F::Zero, Point3F(0,0,1)); } + void unset() override { set(Point3F::Zero, Point3F(0,0,1)); } }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -305,14 +305,14 @@ public: virtual ~afxTransformConstraint(); virtual void set(const MatrixF& xfm); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual SceneObject* getSceneObject() { return 0; } - virtual void restoreObject(SceneObject*) { } - virtual U16 getScopeId() { return 0; } - virtual U32 getTriggers() { return 0; } + SceneObject* getSceneObject() override { return 0; } + void restoreObject(SceneObject*) override { } + U16 getScopeId() override { return 0; } + U32 getTriggers() override { return 0; } - virtual void unset() { set(MatrixF::Identity); } + void unset() override { set(MatrixF::Identity); } }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -341,27 +341,27 @@ public: virtual ~afxShapeConstraint(); virtual void set(ShapeBase* shape); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim); - virtual void resetAnimation(U32 tag); - virtual U32 lockAnimation(); - virtual void unlockAnimation(U32 tag); - virtual F32 getAnimClipDuration(const char* clip); + U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override; + void resetAnimation(U32 tag) override; + U32 lockAnimation() override; + void unlockAnimation(U32 tag) override; + F32 getAnimClipDuration(const char* clip) override; void remapAnimation(U32 tag, ShapeBase* other_shape); - virtual S32 getDamageState(); + S32 getDamageState() override; - virtual SceneObject* getSceneObject() { return mShape; } - virtual void restoreObject(SceneObject*); - virtual U16 getScopeId() { return mScope_id; } - virtual U32 getTriggers(); + SceneObject* getSceneObject() override { return mShape; } + void restoreObject(SceneObject*) override; + U16 getScopeId() override { return mScope_id; } + U32 getTriggers() override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; - virtual void unset() { set(0); } + void unset() override { set(0); } }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -380,14 +380,14 @@ public: /*C*/ afxShapeNodeConstraint(afxConstraintMgr*); /*C*/ afxShapeNodeConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node); - virtual void set(ShapeBase* shape); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); - virtual void restoreObject(SceneObject*); + void set(ShapeBase* shape) override; + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; + void restoreObject(SceneObject*) override; S32 getNodeID() const { return mShape_node_ID; } - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -415,17 +415,17 @@ public: virtual ~afxObjectConstraint(); virtual void set(SceneObject* obj); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual SceneObject* getSceneObject() { return mObj; } - virtual void restoreObject(SceneObject*); - virtual U16 getScopeId() { return mScope_id; } - virtual U32 getTriggers(); + SceneObject* getSceneObject() override { return mObj; } + void restoreObject(SceneObject*) override; + U16 getScopeId() override { return mScope_id; } + U32 getTriggers() override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; - virtual void unset() { set(0); } + void unset() override { set(0); } }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -452,23 +452,23 @@ public: /*C*/ afxEffectConstraint(afxConstraintMgr*, StringTableEntry effect_name); virtual ~afxEffectConstraint(); - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); - virtual bool getAltitudes(F32& terrain_alt, F32& interior_alt); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; + bool getAltitudes(F32& terrain_alt, F32& interior_alt) override; virtual void set(afxEffectWrapper* effect); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) { } + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override { } - virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim); - virtual void resetAnimation(U32 tag); - virtual F32 getAnimClipDuration(const char* clip); + U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override; + void resetAnimation(U32 tag) override; + F32 getAnimClipDuration(const char* clip) override; - virtual SceneObject* getSceneObject() { return 0; } - virtual void restoreObject(SceneObject*) { } - virtual U16 getScopeId() { return 0; } - virtual U32 getTriggers(); + SceneObject* getSceneObject() override { return 0; } + void restoreObject(SceneObject*) override { } + U16 getScopeId() override { return 0; } + U32 getTriggers() override; - virtual void unset() { set(0); } + void unset() override { set(0); } }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -487,10 +487,10 @@ public: /*C*/ afxEffectNodeConstraint(afxConstraintMgr*); /*C*/ afxEffectNodeConstraint(afxConstraintMgr*, StringTableEntry name, StringTableEntry node); - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; - virtual void set(afxEffectWrapper* effect); + void set(afxEffectWrapper* effect) override; S32 getNodeID() const { return mEffect_node_ID; } }; @@ -532,14 +532,14 @@ class afxSampleXfmBuffer : public afxSampleBuffer protected: MatrixF* mXfm_buffer; - virtual void recSample(U32 idx, void* data); + void recSample(U32 idx, void* data) override; public: /*C*/ afxSampleXfmBuffer(); virtual ~afxSampleXfmBuffer(); - virtual void configHistory(F32 hist_len, U8 sample_rate); - virtual void getSample(F32 lag, void* data, bool& oob); + void configHistory(F32 hist_len, U8 sample_rate) override; + void getSample(F32 lag, void* data, bool& oob) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -558,11 +558,11 @@ public: /*C*/ afxPointHistConstraint(afxConstraintMgr*); virtual ~afxPointHistConstraint(); - virtual void set(Point3F point, Point3F vector); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set(Point3F point, Point3F vector) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -581,11 +581,11 @@ public: /*C*/ afxTransformHistConstraint(afxConstraintMgr*); virtual ~afxTransformHistConstraint(); - virtual void set(const MatrixF& xfm); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set(const MatrixF& xfm) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -605,14 +605,14 @@ public: /*C*/ afxShapeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name); virtual ~afxShapeHistConstraint(); - virtual void set(ShapeBase* shape); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set(ShapeBase* shape) override; + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -632,14 +632,14 @@ public: /*C*/ afxShapeNodeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node); virtual ~afxShapeNodeHistConstraint(); - virtual void set(ShapeBase* shape); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set(ShapeBase* shape) override; + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -661,14 +661,14 @@ public: afxObjectHistConstraint(afxConstraintMgr*, StringTableEntry arb_name); virtual ~afxObjectHistConstraint(); - virtual void set(SceneObject* obj); - virtual void set_scope_id(U16 scope_id); - virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos); + void set(SceneObject* obj) override; + void set_scope_id(U16 scope_id) override; + void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override; - virtual bool getPosition(Point3F& pos, F32 hist=0.0f); - virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); + bool getPosition(Point3F& pos, F32 hist=0.0f) override; + bool getTransform(MatrixF& xfm, F32 hist=0.0f) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/afxEffectGroup.h b/Engine/source/afx/afxEffectGroup.h index 87a99522e..125cb7889 100644 --- a/Engine/source/afx/afxEffectGroup.h +++ b/Engine/source/afx/afxEffectGroup.h @@ -60,7 +60,7 @@ class afxEffectGroupData : public afxEffectBaseData U32 id; public: egValidator(U32 id) { this->id = id; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; bool do_id_convert; @@ -82,16 +82,16 @@ public: /*C*/ afxEffectGroupData(); /*C*/ afxEffectGroupData(const afxEffectGroupData&, bool = false); - virtual void reloadReset(); + void reloadReset() override; - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void gather_cons_defs(Vector& defs); + void gather_cons_defs(Vector& defs) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/afxEffectWrapper.h b/Engine/source/afx/afxEffectWrapper.h index b12678795..9d14f96ef 100644 --- a/Engine/source/afx/afxEffectWrapper.h +++ b/Engine/source/afx/afxEffectWrapper.h @@ -175,7 +175,7 @@ public: void parse_cons_specs(); void parse_vis_keys(); - void gather_cons_defs(Vector& defs); + void gather_cons_defs(Vector& defs) override; void pack_mods(BitStream*, afxXM_BaseData* mods[], bool packed); void unpack_mods(BitStream*, afxXM_BaseData* mods[]); @@ -184,13 +184,13 @@ public: /*C*/ afxEffectWrapperData(const afxEffectWrapperData&, bool = false); /*D*/ ~afxEffectWrapperData(); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void onPerformSubstitutions(); + void onPerformSubstitutions() override; bool requiresStop(const afxEffectTimingData& timing) { return effect_desc->requiresStop(this, timing); } bool runsOnServer() { return effect_desc->runsOnServer(this); } @@ -201,7 +201,7 @@ public: F32 afterStopTime() { return ewd_timing.fade_out_time; } - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp index 6c9a36299..0fd053a7f 100644 --- a/Engine/source/afx/afxEffectron.cpp +++ b/Engine/source/afx/afxEffectron.cpp @@ -56,7 +56,7 @@ void afxEffectronData::ewValidator::validateType(SimObject* object, void* typePt class EffectronFinishStartupEvent : public SimEvent { public: - void process(SimObject* obj) + void process(SimObject* obj) override { afxEffectron* eff = dynamic_cast(obj); if (eff) diff --git a/Engine/source/afx/afxEffectron.h b/Engine/source/afx/afxEffectron.h index bb66c988b..ec0921652 100644 --- a/Engine/source/afx/afxEffectron.h +++ b/Engine/source/afx/afxEffectron.h @@ -46,7 +46,7 @@ class afxEffectronData : public afxChoreographerData U32 id; public: ewValidator(U32 id) { this->id = id; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; bool do_id_convert; @@ -67,17 +67,17 @@ public: /*C*/ afxEffectronData(); /*C*/ afxEffectronData(const afxEffectronData&, bool = false); - virtual void reloadReset(); + void reloadReset() override; - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; void gatherConstraintDefs(Vector&); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -127,7 +127,7 @@ public: class ObjectDeleteEvent : public SimEvent { public: - void process(SimObject *obj) { if (obj) obj->deleteObject(); } + void process(SimObject *obj) override { if (obj) obj->deleteObject(); } }; private: @@ -164,16 +164,16 @@ public: /*D*/ ~afxEffectron(); // STANDARD OVERLOADED METHODS // - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void processTick(const Move*); - virtual void advanceTime(F32 dt); - virtual bool onAdd(); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void processTick(const Move*) override; + void advanceTime(F32 dt) override; + bool onAdd() override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; - virtual void inflictDamage(const char * label, const char* flavor, SimObjectId target, - F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp); - virtual void sync_with_clients(); + void inflictDamage(const char * label, const char* flavor, SimObjectId target, + F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override; + void sync_with_clients() override; void finish_startup(); DECLARE_CONOBJECT(afxEffectron); diff --git a/Engine/source/afx/afxMagicMissile.cpp b/Engine/source/afx/afxMagicMissile.cpp index 73cbfefc0..e797c2dc1 100644 --- a/Engine/source/afx/afxMagicMissile.cpp +++ b/Engine/source/afx/afxMagicMissile.cpp @@ -67,7 +67,7 @@ class ObjectDeleteEvent : public SimEvent { public: - void process(SimObject *object) + void process(SimObject *object) override { object->deleteObject(); } diff --git a/Engine/source/afx/afxMagicMissile.h b/Engine/source/afx/afxMagicMissile.h index 957066a4b..e3f6ee755 100644 --- a/Engine/source/afx/afxMagicMissile.h +++ b/Engine/source/afx/afxMagicMissile.h @@ -61,7 +61,7 @@ class afxMagicMissileData : public GameBaseData typedef GameBaseData Parent; protected: - bool onAdd(); + bool onAdd() override; public: enum { MaxLifetimeTicks = 4095 }; @@ -210,10 +210,10 @@ public: /*C*/ afxMagicMissileData(); /*D*/ ~afxMagicMissileData(); - void packData(BitStream*); - void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; static void initPersistFields(); @@ -223,7 +223,7 @@ public: /*C*/ afxMagicMissileData(const afxMagicMissileData&, bool = false); afxMagicMissileData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } void gather_cons_defs(Vector& defs); }; @@ -290,8 +290,8 @@ protected: */ // 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; } LightInfo *mLight; LightState mLightState; @@ -319,19 +319,19 @@ protected: U32 mCollideHitType; */ - bool onAdd(); - void onRemove(); - bool onNewDataBlock(GameBaseData *dptr, bool reload); + bool onAdd() override; + void onRemove() override; + bool onNewDataBlock(GameBaseData *dptr, bool reload) override; // Rendering - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; void prepBatchRender( SceneRenderState *state); - void processTick(const Move *move); + void processTick(const Move *move) override; /* void advanceTime(F32 dt); */ - void interpolateTick(F32 delta); + void interpolateTick(F32 delta) override; /* /// What to do once this projectile collides with something @@ -355,8 +355,8 @@ protected: // These are stolen from the player class .. bool pointInWater(const Point3F &point); - 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; afxChoreographer* choreographer; @@ -396,7 +396,7 @@ public: /*C*/ afxMagicMissile(); /*C*/ afxMagicMissile(bool on_server, bool on_client); /*D*/ ~afxMagicMissile(); - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; DECLARE_CONOBJECT(afxMagicMissile); DECLARE_CATEGORY("UNLISTED"); diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp index 8d0822b51..5cb5be2eb 100644 --- a/Engine/source/afx/afxMagicSpell.cpp +++ b/Engine/source/afx/afxMagicSpell.cpp @@ -77,7 +77,7 @@ void afxMagicSpellData::ewValidator::validateType(SimObject* object, void* typeP class SpellFinishStartupEvent : public SimEvent { public: - void process(SimObject* obj) + void process(SimObject* obj) override { afxMagicSpell* spell = dynamic_cast(obj); if (spell) @@ -574,10 +574,10 @@ class CastingPhrase_C : public afxPhrase F32 mCastbar_progress; public: /*C*/ CastingPhrase_C(ShapeBase* caster, bool notify_castbar); - virtual void start(F32 startstamp, F32 timestamp); - virtual void update(F32 dt, F32 timestamp); - virtual void stop(F32 timestamp); - virtual void interrupt(F32 timestamp); + void start(F32 startstamp, F32 timestamp) override; + void update(F32 dt, F32 timestamp) override; + void stop(F32 timestamp) override; + void interrupt(F32 timestamp) override; }; CastingPhrase_C::CastingPhrase_C(ShapeBase* c, bool notify) diff --git a/Engine/source/afx/afxMagicSpell.h b/Engine/source/afx/afxMagicSpell.h index c97886802..a978303e0 100644 --- a/Engine/source/afx/afxMagicSpell.h +++ b/Engine/source/afx/afxMagicSpell.h @@ -65,7 +65,7 @@ class afxMagicSpellData : public afxChoreographerData, public afxMagicSpellDefs U32 id; public: ewValidator(U32 id) { this->id = id; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; bool mDo_id_convert; @@ -106,18 +106,18 @@ public: /*C*/ afxMagicSpellData(); /*C*/ afxMagicSpellData(const afxMagicSpellData&, bool = false); - virtual void reloadReset(); + void reloadReset() override; - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); - virtual bool writeField(StringTableEntry fieldname, const char* value); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool writeField(StringTableEntry fieldname, const char* value) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; void gatherConstraintDefs(Vector&); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -208,7 +208,7 @@ public: class ObjectDeleteEvent : public SimEvent { public: - void process(SimObject *obj) { if (obj) obj->deleteObject(); } + void process(SimObject *obj) override { if (obj) obj->deleteObject(); } }; private: @@ -272,9 +272,9 @@ private: bool is_impact_in_water(SceneObject* obj, const Point3F& p); protected: - virtual bool remap_builtin_constraint(SceneObject*, const char* cons_name); // CONSTRAINT REMAPPING - virtual void pack_constraint_info(NetConnection* conn, BitStream* stream); - virtual void unpack_constraint_info(NetConnection* conn, BitStream* stream); + bool remap_builtin_constraint(SceneObject*, const char* cons_name) override; // CONSTRAINT REMAPPING + void pack_constraint_info(NetConnection* conn, BitStream* stream) override; + void unpack_constraint_info(NetConnection* conn, BitStream* stream) override; private: afxMagicMissile* mMissile; @@ -292,11 +292,11 @@ private: void launch_missile_c(); public: - virtual void impactNotify(const Point3F& p, const Point3F& n, SceneObject*); - virtual void executeScriptEvent(const char* method, afxConstraint*, - const MatrixF& pos, const char* data); - virtual void inflictDamage(const char * label, const char* flavor, SimObjectId target, - F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp); + void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override; + void executeScriptEvent(const char* method, afxConstraint*, + const MatrixF& pos, const char* data) override; + void inflictDamage(const char * label, const char* flavor, SimObjectId target, + F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override; public: /*C*/ afxMagicSpell(); @@ -304,16 +304,16 @@ public: /*D*/ ~afxMagicSpell(); // STANDARD OVERLOADED METHODS // - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void processTick(const Move*); - virtual void advanceTime(F32 dt); - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify(SimObject*); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void processTick(const Move*) override; + void advanceTime(F32 dt) override; + bool onAdd() override; + void onRemove() override; + void onDeleteNotify(SimObject*) override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; - virtual void sync_with_clients(); + void sync_with_clients() override; void finish_startup(); static void initPersistFields(); @@ -361,7 +361,7 @@ public: afxMagicMissile* getMissile() const { return mMissile; } SceneObject* getImpactedObject() const { return mImpacted_obj; } - virtual void restoreObject(SceneObject*); + void restoreObject(SceneObject*) override; bool activationCallInit(bool postponed=false); void activate(); diff --git a/Engine/source/afx/afxRenderHighlightMgr.h b/Engine/source/afx/afxRenderHighlightMgr.h index 406997f90..2be151543 100644 --- a/Engine/source/afx/afxRenderHighlightMgr.h +++ b/Engine/source/afx/afxRenderHighlightMgr.h @@ -60,8 +60,8 @@ public: bool isSelectionEnabled(); // RenderBinManager - virtual void addElement( RenderInst *inst ); - virtual void render( SceneRenderState *state ); + void addElement( RenderInst *inst ) override; + void render( SceneRenderState *state ) override; // ConsoleObject DECLARE_CONOBJECT( afxRenderHighlightMgr ); diff --git a/Engine/source/afx/afxResidueMgr.h b/Engine/source/afx/afxResidueMgr.h index a4066828a..e591a15e6 100644 --- a/Engine/source/afx/afxResidueMgr.h +++ b/Engine/source/afx/afxResidueMgr.h @@ -153,7 +153,7 @@ public: /*D*/ ~afxResidueMgr(); void cleanup(); - virtual void onDeleteNotify(SimObject *obj); + void onDeleteNotify(SimObject *obj) override; public: void residueAdvanceTime(); diff --git a/Engine/source/afx/afxSelectron.cpp b/Engine/source/afx/afxSelectron.cpp index 1aa182f6c..ccaf680e4 100644 --- a/Engine/source/afx/afxSelectron.cpp +++ b/Engine/source/afx/afxSelectron.cpp @@ -66,7 +66,7 @@ void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePt class SelectronFinishStartupEvent : public SimEvent { public: - void process(SimObject* obj) + void process(SimObject* obj) override { afxSelectron* selectron = dynamic_cast(obj); if (selectron) diff --git a/Engine/source/afx/afxSelectron.h b/Engine/source/afx/afxSelectron.h index deca54fdf..780322282 100644 --- a/Engine/source/afx/afxSelectron.h +++ b/Engine/source/afx/afxSelectron.h @@ -57,7 +57,7 @@ class afxSelectronData : public afxChoreographerData, public afxSelectronDefs U32 id; public: ewValidator(U32 id) { this->id = id; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; bool do_id_convert; @@ -90,18 +90,18 @@ public: /*C*/ afxSelectronData(const afxSelectronData&, bool = false); /*D*/ ~afxSelectronData(); - virtual void reloadReset(); + void reloadReset() override; - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; bool matches(U32 mask, U8 style); void gatherConstraintDefs(Vector&); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -163,7 +163,7 @@ public: class ObjectDeleteEvent : public SimEvent { public: - void process(SimObject *obj) { if (obj) obj->deleteObject(); } + void process(SimObject *obj) override { if (obj) obj->deleteObject(); } }; private: @@ -206,15 +206,15 @@ public: /*D*/ ~afxSelectron(); // STANDARD OVERLOADED METHODS // - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void processTick(const Move*); - virtual void advanceTime(F32 dt); - virtual bool onAdd(); - virtual void onRemove(); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void processTick(const Move*) override; + void advanceTime(F32 dt) override; + bool onAdd() override; + void onRemove() override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; - virtual void sync_with_clients(); + void sync_with_clients() override; void finish_startup(); DECLARE_CONOBJECT(afxSelectron); diff --git a/Engine/source/afx/afxSpellBook.h b/Engine/source/afx/afxSpellBook.h index e6bf8d580..ed487c5a0 100644 --- a/Engine/source/afx/afxSpellBook.h +++ b/Engine/source/afx/afxSpellBook.h @@ -57,10 +57,10 @@ public: public: /*C*/ afxSpellBookData(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; bool verifyPageSlot(S32 page, S32 slot); S32 getPageSlotIndex(S32 page, S32 slot); @@ -104,15 +104,15 @@ public: /*C*/ afxSpellBook(); /*D*/ ~afxSpellBook(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void processTick(const Move*); - virtual void advanceTime(F32 dt); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void processTick(const Move*) override; + void advanceTime(F32 dt) override; - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; static void initPersistFields(); diff --git a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h index 5e8deafb9..6ca962a71 100644 --- a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h @@ -71,13 +71,13 @@ public: /*D*/ ~afxZodiacGroundPlaneRenderer(); // RenderBinManager - virtual void sort(){} // don't sort them - virtual void clear(); + void sort() override{} // don't sort them + void clear() override; void initShader(); void addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const GroundPlane*, F32 camDist); - virtual void render(SceneRenderState* state); + void render(SceneRenderState* state) override; static afxZodiacGroundPlaneRenderer* getMaster(); diff --git a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h index 8fd5e10f7..030887cc0 100644 --- a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h @@ -72,13 +72,13 @@ public: /*D*/ ~afxZodiacMeshRoadRenderer(); // RenderBinManager - virtual void sort(){} // don't sort them - virtual void clear(); + void sort() override{} // don't sort them + void clear() override; void initShader(); void addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const MeshRoad*, F32 camDist); - virtual void render(SceneRenderState*); + void render(SceneRenderState*) override; static afxZodiacMeshRoadRenderer* getMaster(); diff --git a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h index b28fba9c1..357dc34d8 100644 --- a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h @@ -72,13 +72,13 @@ public: /*D*/ ~afxZodiacPolysoupRenderer(); // RenderBinManager - virtual void sort(){} // don't sort them - virtual void clear(); + void sort() override{} // don't sort them + void clear() override; void initShader(); void addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const TSStatic*, F32 camDist); - virtual void render(SceneRenderState*); + void render(SceneRenderState*) override; static afxZodiacPolysoupRenderer* getMaster(); diff --git a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h index 1f0f804a5..e32acdf55 100644 --- a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h @@ -72,13 +72,13 @@ public: /*D*/ ~afxZodiacTerrainRenderer(); // RenderBinManager - virtual void sort(){} // don't sort them - virtual void clear(); + void sort() override{} // don't sort them + void clear() override; void initShader(); void addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const TerrainBlock*, const TerrCell*, const MatrixF& mRenderObjToWorld, F32 camDist); - virtual void render(SceneRenderState*); + void render(SceneRenderState*) override; static afxZodiacTerrainRenderer* getMaster(); diff --git a/Engine/source/afx/arcaneFX.cpp b/Engine/source/afx/arcaneFX.cpp index dccaca6c9..db3dd43a7 100644 --- a/Engine/source/afx/arcaneFX.cpp +++ b/Engine/source/afx/arcaneFX.cpp @@ -69,11 +69,11 @@ public: ClientZoneInEvent() { mGuaranteeType = Guaranteed; } ~ClientZoneInEvent() { } - virtual void pack(NetConnection*, BitStream*bstream) { } - virtual void write(NetConnection*, BitStream *bstream) { } - virtual void unpack(NetConnection* /*ps*/, BitStream *bstream) { } + void pack(NetConnection*, BitStream*bstream) override { } + void write(NetConnection*, BitStream *bstream) override { } + void unpack(NetConnection* /*ps*/, BitStream *bstream) override { } - virtual void process(NetConnection* conn) + void process(NetConnection* conn) override { GameConnection* game_conn = dynamic_cast(conn); if (game_conn && !game_conn->isZonedIn()) diff --git a/Engine/source/afx/ce/afxAnimClip.h b/Engine/source/afx/ce/afxAnimClip.h index 19bd3ccfa..c7f39fff3 100644 --- a/Engine/source/afx/ce/afxAnimClip.h +++ b/Engine/source/afx/ce/afxAnimClip.h @@ -61,14 +61,14 @@ public: /*C*/ afxAnimClipData(); /*C*/ afxAnimClipData(const afxAnimClipData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); - virtual bool writeField(StringTableEntry fieldname, const char* value); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; + bool writeField(StringTableEntry fieldname, const char* value) override; - virtual void onStaticModified(const char* slotName, const char* newValue = NULL); + void onStaticModified(const char* slotName, const char* newValue = NULL) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxAnimLock.h b/Engine/source/afx/ce/afxAnimLock.h index 8aa9cf348..63d75b2d1 100644 --- a/Engine/source/afx/ce/afxAnimLock.h +++ b/Engine/source/afx/ce/afxAnimLock.h @@ -33,9 +33,9 @@ class afxAnimLockData : public GameBaseData public: /*C*/ afxAnimLockData(); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxAreaDamage.h b/Engine/source/afx/ce/afxAreaDamage.h index dd8a2b30a..2274b2b19 100644 --- a/Engine/source/afx/ce/afxAreaDamage.h +++ b/Engine/source/afx/ce/afxAreaDamage.h @@ -45,11 +45,11 @@ public: /*C*/ afxAreaDamageData(); /*C*/ afxAreaDamageData(const afxAreaDamageData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxAudioBank.h b/Engine/source/afx/ce/afxAudioBank.h index 1f1fa42e8..67d2e8bfb 100644 --- a/Engine/source/afx/ce/afxAudioBank.h +++ b/Engine/source/afx/ce/afxAudioBank.h @@ -48,15 +48,15 @@ public: static void initPersistFields(); - virtual bool onAdd(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + bool onAdd() override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; afxAudioBank* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } DECLARE_CONOBJECT(afxAudioBank); }; diff --git a/Engine/source/afx/ce/afxBillboard.h b/Engine/source/afx/ce/afxBillboard.h index da382ac20..8918e2f26 100644 --- a/Engine/source/afx/ce/afxBillboard.h +++ b/Engine/source/afx/ce/afxBillboard.h @@ -62,12 +62,12 @@ public: /*C*/ afxBillboardData(); /*C*/ afxBillboardData(const afxBillboardData&, bool = false); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -103,15 +103,15 @@ public: /*C*/ afxBillboard(); /*D*/ ~afxBillboard(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual bool onAdd(); - virtual void onRemove(); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + bool onAdd() override; + void onRemove() override; void setFadeAmount(F32 amt) { fade_amt = amt; } void setSortPriority(S8 priority) { sort_priority = priority; } void setVisibility(bool flag) { is_visible = flag; } - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; void _renderBillboard(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*); diff --git a/Engine/source/afx/ce/afxCameraPuppet.h b/Engine/source/afx/ce/afxCameraPuppet.h index da9f4eb7a..f44424079 100644 --- a/Engine/source/afx/ce/afxCameraPuppet.h +++ b/Engine/source/afx/ce/afxCameraPuppet.h @@ -40,17 +40,17 @@ public: U8 networking; - virtual void gather_cons_defs(Vector& defs); + void gather_cons_defs(Vector& defs) override; public: /*C*/ afxCameraPuppetData(); /*C*/ afxCameraPuppetData(const afxCameraPuppetData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxCameraShake.h b/Engine/source/afx/ce/afxCameraShake.h index 32d4393ca..b0aa63370 100644 --- a/Engine/source/afx/ce/afxCameraShake.h +++ b/Engine/source/afx/ce/afxCameraShake.h @@ -40,11 +40,11 @@ public: /*C*/ afxCameraShakeData(); /*C*/ afxCameraShakeData(const afxCameraShakeData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxCollisionEvent.h b/Engine/source/afx/ce/afxCollisionEvent.h index 29cb7b5a6..ee7b7d475 100644 --- a/Engine/source/afx/ce/afxCollisionEvent.h +++ b/Engine/source/afx/ce/afxCollisionEvent.h @@ -43,10 +43,10 @@ public: /*C*/ afxCollisionEventData(); /*C*/ afxCollisionEventData(const afxCollisionEventData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxConsoleMessage.h b/Engine/source/afx/ce/afxConsoleMessage.h index e91705a00..ad95d5918 100644 --- a/Engine/source/afx/ce/afxConsoleMessage.h +++ b/Engine/source/afx/ce/afxConsoleMessage.h @@ -37,11 +37,11 @@ public: /*C*/ afxConsoleMessageData(); /*C*/ afxConsoleMessageData(const afxConsoleMessageData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxDamage.h b/Engine/source/afx/ce/afxDamage.h index 40249ef6b..d42fd772d 100644 --- a/Engine/source/afx/ce/afxDamage.h +++ b/Engine/source/afx/ce/afxDamage.h @@ -46,11 +46,11 @@ public: /*C*/ afxDamageData(); /*C*/ afxDamageData(const afxDamageData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxFootSwitch.h b/Engine/source/afx/ce/afxFootSwitch.h index c15f4299a..f1c8484ad 100644 --- a/Engine/source/afx/ce/afxFootSwitch.h +++ b/Engine/source/afx/ce/afxFootSwitch.h @@ -40,10 +40,10 @@ public: /*C*/ afxFootSwitchData(); /*C*/ afxFootSwitchData(const afxFootSwitchData&, bool = false); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxGuiController.h b/Engine/source/afx/ce/afxGuiController.h index 744ddb7f3..1c1cf8ffa 100644 --- a/Engine/source/afx/ce/afxGuiController.h +++ b/Engine/source/afx/ce/afxGuiController.h @@ -41,11 +41,11 @@ public: /*C*/ afxGuiControllerData(); /*C*/ afxGuiControllerData(const afxGuiControllerData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxGuiText.h b/Engine/source/afx/ce/afxGuiText.h index a8f06af9d..f4e29676f 100644 --- a/Engine/source/afx/ce/afxGuiText.h +++ b/Engine/source/afx/ce/afxGuiText.h @@ -40,11 +40,11 @@ public: /*C*/ afxGuiTextData(); /*C*/ afxGuiTextData(const afxGuiTextData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxLightBase_T3D.h b/Engine/source/afx/ce/afxLightBase_T3D.h index 0913c8b10..3f101b1d7 100644 --- a/Engine/source/afx/ce/afxLightBase_T3D.h +++ b/Engine/source/afx/ce/afxLightBase_T3D.h @@ -56,11 +56,11 @@ public: /*C*/ afxT3DLightBaseData(); /*C*/ afxT3DLightBaseData(const afxT3DLightBaseData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxMachineGun.h b/Engine/source/afx/ce/afxMachineGun.h index 7a8612a48..925e8b8fc 100644 --- a/Engine/source/afx/ce/afxMachineGun.h +++ b/Engine/source/afx/ce/afxMachineGun.h @@ -42,11 +42,11 @@ public: /*C*/ afxMachineGunData(); /*C*/ afxMachineGunData(const afxMachineGunData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxModel.h b/Engine/source/afx/ce/afxModel.h index ec972a439..521409735 100644 --- a/Engine/source/afx/ce/afxModel.h +++ b/Engine/source/afx/ce/afxModel.h @@ -85,12 +85,12 @@ public: /*C*/ afxModelData(const afxModelData&, bool = false); /*D*/ ~afxModelData(); - bool preload(bool server, String &errorStr); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + bool preload(bool server, String &errorStr) override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -130,22 +130,22 @@ private: protected: Vector mCollisionDetails; Vector mLOSDetails; - bool castRay(const Point3F &start, const Point3F &end, RayInfo* info); + bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override; - virtual void advanceTime(F32 dt); + void advanceTime(F32 dt) override; - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; void renderObject(SceneRenderState*); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; public: /*C*/ afxModel(); /*D*/ ~afxModel(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; void setFadeAmount(F32 amt) { fade_amt = amt; } void setSequenceRateFactor(F32 factor); diff --git a/Engine/source/afx/ce/afxMooring.h b/Engine/source/afx/ce/afxMooring.h index 266331b21..34b3b7eff 100644 --- a/Engine/source/afx/ce/afxMooring.h +++ b/Engine/source/afx/ce/afxMooring.h @@ -43,11 +43,11 @@ public: /*C*/ afxMooringData(); /*C*/ afxMooringData(const afxMooringData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -82,15 +82,15 @@ public: /*C*/ afxMooring(U32 networking, U32 chor_id, StringTableEntry cons_name); /*D*/ ~afxMooring(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void advanceTime(F32 dt); - virtual bool onAdd(); - virtual void onRemove(); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); - virtual void setTransform(const MatrixF&); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void advanceTime(F32 dt) override; + bool onAdd() override; + void onRemove() override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; + void setTransform(const MatrixF&) override; - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; DECLARE_CONOBJECT(afxMooring); DECLARE_CATEGORY("UNLISTED"); diff --git a/Engine/source/afx/ce/afxParticleEmitter.h b/Engine/source/afx/ce/afxParticleEmitter.h index 69fb79c91..25b377ad0 100644 --- a/Engine/source/afx/ce/afxParticleEmitter.h +++ b/Engine/source/afx/ce/afxParticleEmitter.h @@ -56,13 +56,13 @@ public: /*C*/ afxParticleEmitterData(); /*C*/ afxParticleEmitterData(const afxParticleEmitterData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -80,13 +80,13 @@ public: /*C*/ afxParticleEmitterVectorData(); /*C*/ afxParticleEmitterVectorData(const afxParticleEmitterVectorData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -108,13 +108,13 @@ public: /*C*/ afxParticleEmitterConeData(); /*C*/ afxParticleEmitterConeData(const afxParticleEmitterConeData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -150,14 +150,14 @@ public: /*C*/ afxParticleEmitterPathData(); /*C*/ afxParticleEmitterPathData(const afxParticleEmitterPathData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -182,13 +182,13 @@ public: /*C*/ afxParticleEmitterDiscData(); /*C*/ afxParticleEmitterDiscData(const afxParticleEmitterDiscData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -225,7 +225,7 @@ protected: void afx_emitParticles(const Point3F& start, const Point3F& end, const Point3F& velocity, const U32 numMilliseconds); void preCompute(const MatrixF& mat); - virtual void sub_particleUpdate(Particle*); + void sub_particleUpdate(Particle*) override; virtual void sub_preCompute(const MatrixF& mat)=0; virtual void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx)=0; @@ -233,13 +233,13 @@ public: /*C*/ afxParticleEmitter(); /*D*/ ~afxParticleEmitter(); - virtual void emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds); + void emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds) override; afxParticleEmitterData* getDataBlock(){ return mDataBlock; } void setAFXOwner(const SimObject* owner) { afx_owner = owner; } - bool onNewDataBlock(GameBaseData* dptr, bool reload); - bool onAdd(); - void onRemove(); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + bool onAdd() override; + void onRemove() override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -256,11 +256,11 @@ public: /*C*/ afxParticleEmitterVector(); /*D*/ ~afxParticleEmitterVector(); - bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; protected: - void sub_preCompute(const MatrixF& mat); - void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt); + void sub_preCompute(const MatrixF& mat) override; + void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -278,11 +278,11 @@ public: /*C*/ afxParticleEmitterCone(); /*D*/ ~afxParticleEmitterCone(); - bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; protected: - void sub_preCompute(const MatrixF& mat); - void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); + void sub_preCompute(const MatrixF& mat) override; + void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -309,13 +309,13 @@ public: /*C*/ afxParticleEmitterPath(); /*D*/ ~afxParticleEmitterPath(); - bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; protected: - bool onAdd(); - void onRemove(); - void sub_preCompute(const MatrixF& mat); - void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); + bool onAdd() override; + void onRemove() override; + void sub_preCompute(const MatrixF& mat) override; + void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -333,11 +333,11 @@ public: /*C*/ afxParticleEmitterDisc(); /*D*/ ~afxParticleEmitterDisc(); - bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; protected: - void sub_preCompute(const MatrixF& mat); - void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); + void sub_preCompute(const MatrixF& mat) override; + void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ce/afxPhraseEffect.h b/Engine/source/afx/ce/afxPhraseEffect.h index 827ac9ca9..5fd4c6ab6 100644 --- a/Engine/source/afx/ce/afxPhraseEffect.h +++ b/Engine/source/afx/ce/afxPhraseEffect.h @@ -42,7 +42,7 @@ class afxPhraseEffectData : public GameBaseData, public afxEffectDefs, public af U32 id; public: ewValidator(U32 id) { this->id = id; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; bool do_id_convert; @@ -88,17 +88,17 @@ public: /*C*/ afxPhraseEffectData(); /*C*/ afxPhraseEffectData(const afxPhraseEffectData&, bool = false); - virtual void reloadReset(); + void reloadReset() override; - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void gather_cons_defs(Vector& defs); + void gather_cons_defs(Vector& defs) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxPhysicalZone.h b/Engine/source/afx/ce/afxPhysicalZone.h index 02012c5a0..19165c9d0 100644 --- a/Engine/source/afx/ce/afxPhysicalZone.h +++ b/Engine/source/afx/ce/afxPhysicalZone.h @@ -49,10 +49,10 @@ public: /*C*/ afxPhysicalZoneData(); /*C*/ afxPhysicalZoneData(const afxPhysicalZoneData&, bool = false); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxPlayerMovement.h b/Engine/source/afx/ce/afxPlayerMovement.h index 13920d85f..512542b6f 100644 --- a/Engine/source/afx/ce/afxPlayerMovement.h +++ b/Engine/source/afx/ce/afxPlayerMovement.h @@ -51,13 +51,13 @@ public: /*C*/ afxPlayerMovementData(); /*C*/ afxPlayerMovementData(const afxPlayerMovementData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; bool hasMovementOverride(); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxPlayerPuppet.h b/Engine/source/afx/ce/afxPlayerPuppet.h index d8d96727a..f3cabe4aa 100644 --- a/Engine/source/afx/ce/afxPlayerPuppet.h +++ b/Engine/source/afx/ce/afxPlayerPuppet.h @@ -40,17 +40,17 @@ public: U8 networking; - virtual void gather_cons_defs(Vector& defs); + void gather_cons_defs(Vector& defs) override; public: /*C*/ afxPlayerPuppetData(); /*C*/ afxPlayerPuppetData(const afxPlayerPuppetData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxPointLight_T3D.h b/Engine/source/afx/ce/afxPointLight_T3D.h index de5215aa8..bccd5abbe 100644 --- a/Engine/source/afx/ce/afxPointLight_T3D.h +++ b/Engine/source/afx/ce/afxPointLight_T3D.h @@ -39,11 +39,11 @@ public: /*C*/ afxT3DPointLightData(); /*C*/ afxT3DPointLightData(const afxT3DPointLightData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxProjectile.cpp b/Engine/source/afx/ce/afxProjectile.cpp index e95cf88f9..de98a870a 100644 --- a/Engine/source/afx/ce/afxProjectile.cpp +++ b/Engine/source/afx/ce/afxProjectile.cpp @@ -351,7 +351,7 @@ void afxProjectile::unpackUpdate(NetConnection * conn, BitStream * stream) class afxProjectileDeleteEvent : public SimEvent { public: - void process(SimObject *object) + void process(SimObject *object) override { object->deleteObject(); } diff --git a/Engine/source/afx/ce/afxProjectile.h b/Engine/source/afx/ce/afxProjectile.h index d3bbff312..19da1548f 100644 --- a/Engine/source/afx/ce/afxProjectile.h +++ b/Engine/source/afx/ce/afxProjectile.h @@ -63,11 +63,11 @@ public: /*C*/ afxProjectileData(); /*C*/ afxProjectileData(const afxProjectileData&, bool = false); - virtual bool onAdd(); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + bool onAdd() override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -97,15 +97,15 @@ public: void init(Point3F& pos, Point3F& vel, ShapeBase* src_obj); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void processTick(const Move *move); - virtual void interpolateTick(F32 delta); - virtual void advanceTime(F32 dt); - virtual bool onAdd(); - virtual void onRemove(); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); - virtual void explode(const Point3F& p, const Point3F& n, const U32 collideType); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void processTick(const Move *move) override; + void interpolateTick(F32 delta) override; + void advanceTime(F32 dt) override; + bool onAdd() override; + void onRemove() override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; + void explode(const Point3F& p, const Point3F& n, const U32 collideType) override; DECLARE_CONOBJECT(afxProjectile); DECLARE_CATEGORY("UNLISTED"); diff --git a/Engine/source/afx/ce/afxScriptEvent.h b/Engine/source/afx/ce/afxScriptEvent.h index 39a32f79f..b917f0747 100644 --- a/Engine/source/afx/ce/afxScriptEvent.h +++ b/Engine/source/afx/ce/afxScriptEvent.h @@ -41,10 +41,10 @@ public: /*C*/ afxScriptEventData(); /*C*/ afxScriptEventData(const afxScriptEventData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxSpotLight_T3D.h b/Engine/source/afx/ce/afxSpotLight_T3D.h index 9fc5a2f4e..a7102be94 100644 --- a/Engine/source/afx/ce/afxSpotLight_T3D.h +++ b/Engine/source/afx/ce/afxSpotLight_T3D.h @@ -41,11 +41,11 @@ public: /*C*/ afxT3DSpotLightData(); /*C*/ afxT3DSpotLightData(const afxT3DSpotLightData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/ce/afxStaticShape.h b/Engine/source/afx/ce/afxStaticShape.h index fce34d053..3d0e3f2d9 100644 --- a/Engine/source/afx/ce/afxStaticShape.h +++ b/Engine/source/afx/ce/afxStaticShape.h @@ -46,10 +46,10 @@ public: /*C*/ afxStaticShapeData(); /*C*/ afxStaticShapeData(const afxStaticShapeData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -72,7 +72,7 @@ private: StringTableEntry mGhost_cons_name; protected: - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; public: /*C*/ afxStaticShape(); @@ -80,10 +80,10 @@ public: void init(U32 chor_id, StringTableEntry cons_name); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual void advanceTime(F32 dt); - virtual U32 packUpdate(NetConnection*, U32, BitStream*); - virtual void unpackUpdate(NetConnection*, BitStream*); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + void advanceTime(F32 dt) override; + U32 packUpdate(NetConnection*, U32, BitStream*) override; + void unpackUpdate(NetConnection*, BitStream*) override; const char* getShapeFileName() const { return mDataBlock->mShapeAsset->getShapeFileName(); } void setVisibility(bool flag) { mIs_visible = flag; } diff --git a/Engine/source/afx/ce/afxZodiac.h b/Engine/source/afx/ce/afxZodiac.h index 0a5104f7b..a7d14c2f1 100644 --- a/Engine/source/afx/ce/afxZodiac.h +++ b/Engine/source/afx/ce/afxZodiac.h @@ -108,16 +108,16 @@ public: /*C*/ afxZodiacData(); /*C*/ afxZodiacData(const afxZodiacData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void onStaticModified(const char* slotName, const char* newValue = NULL); + void onStaticModified(const char* slotName, const char* newValue = NULL) override; - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } F32 calcRotationAngle(F32 elapsed, F32 rate_factor=1.0f); diff --git a/Engine/source/afx/ce/afxZodiacPlane.h b/Engine/source/afx/ce/afxZodiacPlane.h index bb2b6ed33..13c9879b5 100644 --- a/Engine/source/afx/ce/afxZodiacPlane.h +++ b/Engine/source/afx/ce/afxZodiacPlane.h @@ -84,12 +84,12 @@ public: /*C*/ afxZodiacPlaneData(); /*C*/ afxZodiacPlaneData(const afxZodiacPlaneData&, bool = false); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } F32 calcRotationAngle(F32 elapsed, F32 rate_factor=1.0f); @@ -128,15 +128,15 @@ public: /*C*/ afxZodiacPlane(); /*D*/ ~afxZodiacPlane(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); - virtual bool onAdd(); - virtual void onRemove(); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; + bool onAdd() override; + void onRemove() override; void setRadius(F32 rad) { radius = rad; } void setColor(const LinearColorF& clr) { color = clr; } void setVisibility(bool flag) { is_visible = flag; } - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; void _renderZodiacPlane(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*); diff --git a/Engine/source/afx/ea/afxEA_AnimClip.cpp b/Engine/source/afx/ea/afxEA_AnimClip.cpp index 25f811cb1..2437751e5 100644 --- a/Engine/source/afx/ea/afxEA_AnimClip.cpp +++ b/Engine/source/afx/ea/afxEA_AnimClip.cpp @@ -49,10 +49,10 @@ public: /*C*/ afxEA_AnimClip(); /*C*/ ~afxEA_AnimClip(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -176,13 +176,13 @@ class afxEA_AnimClipDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_AnimClipDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_AnimClip; } + afxEffectWrapper* create() const override { return new afxEA_AnimClip; } }; afxEA_AnimClipDesc afxEA_AnimClipDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_AnimLock.cpp b/Engine/source/afx/ea/afxEA_AnimLock.cpp index 3f6fd5597..1f97dfe3f 100644 --- a/Engine/source/afx/ea/afxEA_AnimLock.cpp +++ b/Engine/source/afx/ea/afxEA_AnimLock.cpp @@ -42,8 +42,8 @@ class afxEA_AnimLock : public afxEffectWrapper public: /*C*/ afxEA_AnimLock(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -84,13 +84,13 @@ class afxEA_AnimLockDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_AnimLockDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_AnimLock; } + afxEffectWrapper* create() const override { return new afxEA_AnimLock; } }; afxEA_AnimLockDesc afxEA_AnimLockDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_AreaDamage.cpp b/Engine/source/afx/ea/afxEA_AreaDamage.cpp index a9a6036fb..8def146d6 100644 --- a/Engine/source/afx/ea/afxEA_AreaDamage.cpp +++ b/Engine/source/afx/ea/afxEA_AreaDamage.cpp @@ -53,12 +53,12 @@ public: /*C*/ afxEA_AreaDamage(); /*C*/ ~afxEA_AreaDamage(); - virtual bool isDone(); + bool isDone() override; - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -246,12 +246,12 @@ class afxEA_AreaDamageDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_AreaDamageDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; } + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_AreaDamage; } + afxEffectWrapper* create() const override { return new afxEA_AreaDamage; } }; afxEA_AreaDamageDesc afxEA_AreaDamageDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_AudioBank.cpp b/Engine/source/afx/ea/afxEA_AudioBank.cpp index 6a52ca345..78b40e266 100644 --- a/Engine/source/afx/ea/afxEA_AudioBank.cpp +++ b/Engine/source/afx/ea/afxEA_AudioBank.cpp @@ -53,10 +53,10 @@ public: /*C*/ afxEA_AudioBank(); /*D*/ ~afxEA_AudioBank(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -153,13 +153,13 @@ class afxEA_SoundBankDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_SoundBankDesc mDesc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } //virtual void prepEffect(afxEffectWrapperData*) const; - virtual afxEffectWrapper* create() const { return new afxEA_AudioBank; } + afxEffectWrapper* create() const override { return new afxEA_AudioBank; } }; afxEA_SoundBankDesc afxEA_SoundBankDesc::mDesc; diff --git a/Engine/source/afx/ea/afxEA_Billboard.cpp b/Engine/source/afx/ea/afxEA_Billboard.cpp index 012b364f9..ab6c36c3d 100644 --- a/Engine/source/afx/ea/afxEA_Billboard.cpp +++ b/Engine/source/afx/ea/afxEA_Billboard.cpp @@ -47,14 +47,14 @@ public: /*C*/ afxEA_Billboard(); /*D*/ ~afxEA_Billboard(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); - virtual void getUpdatedBoxCenter(Point3F& pos); - virtual void getBaseColor(LinearColorF& color) { if (bb_data) color = bb_data->color; } + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; + void getUpdatedBoxCenter(Point3F& pos) override; + void getBaseColor(LinearColorF& color) override { if (bb_data) color = bb_data->color; } }; @@ -174,12 +174,12 @@ class afxEA_BillboardDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_BillboardDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Billboard; } + afxEffectWrapper* create() const override { return new afxEA_Billboard; } }; //~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ea/afxEA_CameraPuppet.cpp b/Engine/source/afx/ea/afxEA_CameraPuppet.cpp index 51a3a3dd9..5ec0e5a70 100644 --- a/Engine/source/afx/ea/afxEA_CameraPuppet.cpp +++ b/Engine/source/afx/ea/afxEA_CameraPuppet.cpp @@ -50,13 +50,13 @@ class afxEA_CameraPuppet : public afxEffectWrapper public: /*C*/ afxEA_CameraPuppet(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual void getUnconstrainedPosition(Point3F& pos); - virtual void getUnconstrainedTransform(MatrixF& xfm); + void getUnconstrainedPosition(Point3F& pos) override; + void getUnconstrainedTransform(MatrixF& xfm) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -164,12 +164,12 @@ class afxEA_CameraPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_CameraPuppetDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const; - virtual bool runsOnClient(const afxEffectWrapperData*) const; + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override; + bool runsOnClient(const afxEffectWrapperData*) const override; - virtual afxEffectWrapper* create() const { return new afxEA_CameraPuppet; } + afxEffectWrapper* create() const override { return new afxEA_CameraPuppet; } }; afxEA_CameraPuppetDesc afxEA_CameraPuppetDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_CameraShake.cpp b/Engine/source/afx/ea/afxEA_CameraShake.cpp index bc57019df..ff85f409e 100644 --- a/Engine/source/afx/ea/afxEA_CameraShake.cpp +++ b/Engine/source/afx/ea/afxEA_CameraShake.cpp @@ -49,10 +49,10 @@ public: /*C*/ afxEA_CameraShake(); /*D*/ ~afxEA_CameraShake(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -172,13 +172,13 @@ class afxEA_CameraShakeDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_CameraShakeDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_CameraShake; } + afxEffectWrapper* create() const override { return new afxEA_CameraShake; } }; afxEA_CameraShakeDesc afxEA_CameraShakeDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_CollisionEvent.cpp b/Engine/source/afx/ea/afxEA_CollisionEvent.cpp index 73b6fa707..fd718ff2f 100644 --- a/Engine/source/afx/ea/afxEA_CollisionEvent.cpp +++ b/Engine/source/afx/ea/afxEA_CollisionEvent.cpp @@ -49,13 +49,13 @@ public: /*C*/ afxEA_CollisionEvent(); /*D*/ ~afxEA_CollisionEvent(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel); - virtual void onDeleteNotify(SimObject*); + void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel) override; + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -201,13 +201,13 @@ class afxEA_CollisionEventDesc : public afxEffectAdapterDesc, public afxEffectDe static afxEA_CollisionEventDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_CollisionEvent; } + afxEffectWrapper* create() const override { return new afxEA_CollisionEvent; } }; afxEA_CollisionEventDesc afxEA_CollisionEventDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp b/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp index 0f80a194a..f7304f592 100644 --- a/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp +++ b/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp @@ -45,11 +45,11 @@ class afxEA_ConsoleMessage : public afxEffectWrapper public: /*C*/ afxEA_ConsoleMessage(); - virtual bool isDone() { return displayed; } + bool isDone() override { return displayed; } - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -109,13 +109,13 @@ class afxEA_ConsoleMessageDesc : public afxEffectAdapterDesc, public afxEffectDe static afxEA_ConsoleMessageDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; } + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_ConsoleMessage; } + afxEffectWrapper* create() const override { return new afxEA_ConsoleMessage; } }; afxEA_ConsoleMessageDesc afxEA_ConsoleMessageDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Damage.cpp b/Engine/source/afx/ea/afxEA_Damage.cpp index a338bfa38..049b5964c 100644 --- a/Engine/source/afx/ea/afxEA_Damage.cpp +++ b/Engine/source/afx/ea/afxEA_Damage.cpp @@ -51,12 +51,12 @@ public: /*C*/ afxEA_Damage(); /*C*/ ~afxEA_Damage(); - virtual bool isDone(); + bool isDone() override; - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -183,12 +183,12 @@ class afxEA_DamageDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_DamageDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; } + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_Damage; } + afxEffectWrapper* create() const override { return new afxEA_Damage; } }; afxEA_DamageDesc afxEA_DamageDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Debris.cpp b/Engine/source/afx/ea/afxEA_Debris.cpp index 678c02726..17a3447e9 100644 --- a/Engine/source/afx/ea/afxEA_Debris.cpp +++ b/Engine/source/afx/ea/afxEA_Debris.cpp @@ -50,14 +50,14 @@ public: /*C*/ afxEA_Debris(); /*D*/ ~afxEA_Debris(); - virtual bool isDone(); + bool isDone() override; - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -176,12 +176,12 @@ class afxEA_DebrisDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_DebrisDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Debris; } + afxEffectWrapper* create() const override { return new afxEA_Debris; } }; afxEA_DebrisDesc afxEA_DebrisDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Explosion.cpp b/Engine/source/afx/ea/afxEA_Explosion.cpp index d8fcd3377..7aeebe837 100644 --- a/Engine/source/afx/ea/afxEA_Explosion.cpp +++ b/Engine/source/afx/ea/afxEA_Explosion.cpp @@ -48,12 +48,12 @@ class afxEA_Explosion : public afxEffectWrapper public: /*C*/ afxEA_Explosion(); - virtual bool isDone() { return exploded; } + bool isDone() override { return exploded; } - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -127,12 +127,12 @@ class afxEA_ExplosionDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ExplosionDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; } + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Explosion; } + afxEffectWrapper* create() const override { return new afxEA_Explosion; } }; afxEA_ExplosionDesc afxEA_ExplosionDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_FootSwitch.cpp b/Engine/source/afx/ea/afxEA_FootSwitch.cpp index e2cfb016b..9d3aa7158 100644 --- a/Engine/source/afx/ea/afxEA_FootSwitch.cpp +++ b/Engine/source/afx/ea/afxEA_FootSwitch.cpp @@ -51,10 +51,10 @@ public: void set_overrides(Player*); void clear_overrides(Player*); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; @@ -156,13 +156,13 @@ class afxEA_FootfallSwitchDesc : public afxEffectAdapterDesc, public afxEffectDe static afxEA_FootfallSwitchDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_FootSwitch; } + afxEffectWrapper* create() const override { return new afxEA_FootSwitch; } }; afxEA_FootfallSwitchDesc afxEA_FootfallSwitchDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_GuiController.cpp b/Engine/source/afx/ea/afxEA_GuiController.cpp index e4fe1251e..31f800251 100644 --- a/Engine/source/afx/ea/afxEA_GuiController.cpp +++ b/Engine/source/afx/ea/afxEA_GuiController.cpp @@ -55,10 +55,10 @@ class afxEA_GuiController : public afxEffectWrapper public: /*C*/ afxEA_GuiController(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -193,12 +193,12 @@ class afxEA_GuiControllerDesc : public afxEffectAdapterDesc, public afxEffectDef static afxEA_GuiControllerDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_GuiController; } + afxEffectWrapper* create() const override { return new afxEA_GuiController; } }; afxEA_GuiControllerDesc afxEA_GuiControllerDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_GuiText.cpp b/Engine/source/afx/ea/afxEA_GuiText.cpp index 41b8e4346..35944b7e1 100644 --- a/Engine/source/afx/ea/afxEA_GuiText.cpp +++ b/Engine/source/afx/ea/afxEA_GuiText.cpp @@ -53,9 +53,9 @@ class afxEA_GuiText : public afxEffectWrapper public: /*C*/ afxEA_GuiText(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -157,12 +157,12 @@ class afxEA_GuiTextDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_GuiTextDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_GuiText; } + afxEffectWrapper* create() const override { return new afxEA_GuiText; } }; afxEA_GuiTextDesc afxEA_GuiTextDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Light.cpp b/Engine/source/afx/ea/afxEA_Light.cpp index fbb3c4c42..54988ca26 100644 --- a/Engine/source/afx/ea/afxEA_Light.cpp +++ b/Engine/source/afx/ea/afxEA_Light.cpp @@ -39,12 +39,12 @@ class afxEA_LightDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_LightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return 0; } + afxEffectWrapper* create() const override { return 0; } }; afxEA_LightDesc afxEA_LightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_MachineGun.cpp b/Engine/source/afx/ea/afxEA_MachineGun.cpp index 32b09c267..bca4c43ad 100644 --- a/Engine/source/afx/ea/afxEA_MachineGun.cpp +++ b/Engine/source/afx/ea/afxEA_MachineGun.cpp @@ -53,10 +53,10 @@ public: /*C*/ afxEA_MachineGun(); /*D*/ ~afxEA_MachineGun(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -184,12 +184,12 @@ class afxEA_MachineGunDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_MachineGunDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_MachineGun; } + afxEffectWrapper* create() const override { return new afxEA_MachineGun; } }; afxEA_MachineGunDesc afxEA_MachineGunDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Model.cpp b/Engine/source/afx/ea/afxEA_Model.cpp index 004acd887..d3980b749 100644 --- a/Engine/source/afx/ea/afxEA_Model.cpp +++ b/Engine/source/afx/ea/afxEA_Model.cpp @@ -50,23 +50,23 @@ public: /*C*/ afxEA_Model(); /*D*/ ~afxEA_Model(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; - virtual void getUpdatedBoxCenter(Point3F& pos); + void getUpdatedBoxCenter(Point3F& pos) override; - virtual TSShape* getTSShape(); - virtual TSShapeInstance* getTSShapeInstance(); - virtual SceneObject* ea_get_scene_object() const; + TSShape* getTSShape() override; + TSShapeInstance* getTSShapeInstance() override; + SceneObject* ea_get_scene_object() const override; virtual U32 ea_get_triggers() const; - virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans); - virtual void resetAnimation(U32 tag); - virtual F32 getAnimClipDuration(const char* clip); + U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans) override; + void resetAnimation(U32 tag) override; + F32 getAnimClipDuration(const char* clip) override; }; @@ -230,12 +230,12 @@ class afxEA_ModelDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ModelDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Model; } + afxEffectWrapper* create() const override { return new afxEA_Model; } }; //~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ea/afxEA_Mooring.cpp b/Engine/source/afx/ea/afxEA_Mooring.cpp index 76982679b..ed1ac8da5 100644 --- a/Engine/source/afx/ea/afxEA_Mooring.cpp +++ b/Engine/source/afx/ea/afxEA_Mooring.cpp @@ -46,11 +46,11 @@ public: /*C*/ afxEA_Mooring(); /*D*/ ~afxEA_Mooring(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void onDeleteNotify(SimObject*); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -153,12 +153,12 @@ class afxEA_MooringDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_MooringDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const; - virtual bool runsOnClient(const afxEffectWrapperData*) const; + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override; + bool runsOnClient(const afxEffectWrapperData*) const override; - virtual afxEffectWrapper* create() const { return new afxEA_Mooring; } + afxEffectWrapper* create() const override { return new afxEA_Mooring; } }; afxEA_MooringDesc afxEA_MooringDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_MultiLight.cpp b/Engine/source/afx/ea/afxEA_MultiLight.cpp index b42a37cd5..ae907453a 100644 --- a/Engine/source/afx/ea/afxEA_MultiLight.cpp +++ b/Engine/source/afx/ea/afxEA_MultiLight.cpp @@ -39,12 +39,12 @@ class afxEA_MultiLightDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_MultiLightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return 0; } + afxEffectWrapper* create() const override { return 0; } }; afxEA_MultiLightDesc afxEA_MultiLightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp b/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp index 18835e1bc..bc18d3898 100644 --- a/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp +++ b/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp @@ -299,12 +299,12 @@ class afxEA_ParticleEmitterDesc : public afxEffectAdapterDesc, public afxEffectD static afxEA_ParticleEmitterDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_ParticleEmitter; } + afxEffectWrapper* create() const override { return new afxEA_ParticleEmitter; } }; afxEA_ParticleEmitterDesc afxEA_ParticleEmitterDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_ParticleEmitter.h b/Engine/source/afx/ea/afxEA_ParticleEmitter.h index cf16f2c98..a0e403a21 100644 --- a/Engine/source/afx/ea/afxEA_ParticleEmitter.h +++ b/Engine/source/afx/ea/afxEA_ParticleEmitter.h @@ -51,14 +51,14 @@ public: /*C*/ afxEA_ParticleEmitter(); /*D*/ ~afxEA_ParticleEmitter(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ea/afxEA_PhraseEffect.cpp b/Engine/source/afx/ea/afxEA_PhraseEffect.cpp index c16f2d468..f3f58df36 100644 --- a/Engine/source/afx/ea/afxEA_PhraseEffect.cpp +++ b/Engine/source/afx/ea/afxEA_PhraseEffect.cpp @@ -61,12 +61,12 @@ public: /*C*/ afxEA_PhraseEffect(); /*D*/ ~afxEA_PhraseEffect(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } }; //~~~~~~~~~~~~~~~~~~~~// @@ -360,12 +360,12 @@ class afxEA_PhraseEffectDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_PhraseEffectDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_PhraseEffect; } + afxEffectWrapper* create() const override { return new afxEA_PhraseEffect; } }; afxEA_PhraseEffectDesc afxEA_PhraseEffectDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_PhysicalZone.cpp b/Engine/source/afx/ea/afxEA_PhysicalZone.cpp index 7dbc8062f..b56d14e66 100644 --- a/Engine/source/afx/ea/afxEA_PhysicalZone.cpp +++ b/Engine/source/afx/ea/afxEA_PhysicalZone.cpp @@ -51,12 +51,12 @@ public: /*C*/ afxEA_PhysicalZone(); /*D*/ ~afxEA_PhysicalZone(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -203,12 +203,12 @@ class afxEA_PhysicalZoneDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_PhysicalZoneDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_PhysicalZone; } + afxEffectWrapper* create() const override { return new afxEA_PhysicalZone; } }; afxEA_PhysicalZoneDesc afxEA_PhysicalZoneDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_PlayerMovement.cpp b/Engine/source/afx/ea/afxEA_PlayerMovement.cpp index a563201cc..e5bc3ed2a 100644 --- a/Engine/source/afx/ea/afxEA_PlayerMovement.cpp +++ b/Engine/source/afx/ea/afxEA_PlayerMovement.cpp @@ -49,10 +49,10 @@ public: /*C*/ afxEA_PlayerMovement(); /*C*/ ~afxEA_PlayerMovement(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -147,12 +147,12 @@ class afxEA_PlayerMovementDesc : public afxEffectAdapterDesc, public afxEffectDe static afxEA_PlayerMovementDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_PlayerMovement; } + afxEffectWrapper* create() const override { return new afxEA_PlayerMovement; } }; afxEA_PlayerMovementDesc afxEA_PlayerMovementDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp b/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp index 822a69b06..186637852 100644 --- a/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp +++ b/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp @@ -48,13 +48,13 @@ class afxEA_PlayerPuppet : public afxEffectWrapper public: /*C*/ afxEA_PlayerPuppet(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual void getUnconstrainedPosition(Point3F& pos); - virtual void getUnconstrainedTransform(MatrixF& xfm); + void getUnconstrainedPosition(Point3F& pos) override; + void getUnconstrainedTransform(MatrixF& xfm) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -149,12 +149,12 @@ class afxEA_PlayerPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_PlayerPuppetDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const; - virtual bool runsOnClient(const afxEffectWrapperData*) const; + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override; + bool runsOnClient(const afxEffectWrapperData*) const override; - virtual afxEffectWrapper* create() const { return new afxEA_PlayerPuppet; } + afxEffectWrapper* create() const override { return new afxEA_PlayerPuppet; } }; afxEA_PlayerPuppetDesc afxEA_PlayerPuppetDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp b/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp index ebbfecc47..ce7c89c95 100644 --- a/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp +++ b/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp @@ -51,15 +51,15 @@ public: /*C*/ afxEA_T3DPointLight(); /*D*/ ~afxEA_T3DPointLight(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); - virtual void getBaseColor(LinearColorF& color); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; + void getBaseColor(LinearColorF& color) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } }; //~~~~~~~~~~~~~~~~~~~~// @@ -123,7 +123,7 @@ public: mLight->setColor(live_color); } - void submitLights(LightManager* lm, bool staticLighting) + void submitLights(LightManager* lm, bool staticLighting) override { if (mAnimState.active && mAnimationData && mFade_amt < 1.0f) { @@ -265,12 +265,12 @@ class afxEA_T3DPointLightDesc : public afxEffectAdapterDesc, public afxEffectDef static afxEA_T3DPointLightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_T3DPointLight; } + afxEffectWrapper* create() const override { return new afxEA_T3DPointLight; } }; afxEA_T3DPointLightDesc afxEA_T3DPointLightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Projectile.cpp b/Engine/source/afx/ea/afxEA_Projectile.cpp index 0f26d79b3..bf402cc50 100644 --- a/Engine/source/afx/ea/afxEA_Projectile.cpp +++ b/Engine/source/afx/ea/afxEA_Projectile.cpp @@ -56,14 +56,14 @@ public: /*C*/ afxEA_Projectile(); /*D*/ ~afxEA_Projectile(); - virtual bool isDone(); + bool isDone() override; - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -268,12 +268,12 @@ class afxEA_ProjectileDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ProjectileDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const; - virtual bool runsOnClient(const afxEffectWrapperData*) const; + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override; + bool runsOnClient(const afxEffectWrapperData*) const override; - virtual afxEffectWrapper* create() const { return new afxEA_Projectile; } + afxEffectWrapper* create() const override { return new afxEA_Projectile; } }; afxEA_ProjectileDesc afxEA_ProjectileDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_ScriptEvent.cpp b/Engine/source/afx/ea/afxEA_ScriptEvent.cpp index a80c1b8d2..e8baac9fd 100644 --- a/Engine/source/afx/ea/afxEA_ScriptEvent.cpp +++ b/Engine/source/afx/ea/afxEA_ScriptEvent.cpp @@ -46,12 +46,12 @@ public: /*C*/ afxEA_ScriptEvent(); /*D*/ ~afxEA_ScriptEvent(); - virtual bool isDone() { return ran_script; } + bool isDone() override { return ran_script; } - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -126,13 +126,13 @@ class afxEA_ScriptEventDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ScriptEventDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } - virtual bool isPositional(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; } + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } + bool isPositional(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_ScriptEvent; } + afxEffectWrapper* create() const override { return new afxEA_ScriptEvent; } }; afxEA_ScriptEventDesc afxEA_ScriptEventDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Sound.cpp b/Engine/source/afx/ea/afxEA_Sound.cpp index 335800d84..6756f38e3 100644 --- a/Engine/source/afx/ea/afxEA_Sound.cpp +++ b/Engine/source/afx/ea/afxEA_Sound.cpp @@ -51,14 +51,14 @@ public: /*C*/ afxEA_Sound(); /*D*/ ~afxEA_Sound(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -153,13 +153,13 @@ class afxEA_SoundDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_SoundDesc mDesc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } - virtual void prepEffect(afxEffectWrapperData*) const; + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } + void prepEffect(afxEffectWrapperData*) const override; - virtual afxEffectWrapper* create() const { return new afxEA_Sound; } + afxEffectWrapper* create() const override { return new afxEA_Sound; } }; afxEA_SoundDesc afxEA_SoundDesc::mDesc; diff --git a/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp b/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp index fac4d4ff0..0cec822a8 100644 --- a/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp +++ b/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp @@ -51,15 +51,15 @@ public: /*C*/ afxEA_T3DSpotLight(); /*D*/ ~afxEA_T3DSpotLight(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); - virtual void getBaseColor(LinearColorF& color); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; + void getBaseColor(LinearColorF& color) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } }; //~~~~~~~~~~~~~~~~~~~~// @@ -128,7 +128,7 @@ public: mLight->setColor(live_color); } - void submitLights(LightManager* lm, bool staticLighting) + void submitLights(LightManager* lm, bool staticLighting) override { if (mAnimState.active && mAnimationData && mFade_amt < 1.0f) { @@ -269,12 +269,12 @@ class afxEA_T3DSpotLightDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_T3DSpotLightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_T3DSpotLight; } + afxEffectWrapper* create() const override { return new afxEA_T3DSpotLight; } }; afxEA_T3DSpotLightDesc afxEA_T3DSpotLightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_StaticShape.cpp b/Engine/source/afx/ea/afxEA_StaticShape.cpp index 20e276335..ef1359f7e 100644 --- a/Engine/source/afx/ea/afxEA_StaticShape.cpp +++ b/Engine/source/afx/ea/afxEA_StaticShape.cpp @@ -48,16 +48,16 @@ public: /*C*/ afxEA_StaticShape(); /*D*/ ~afxEA_StaticShape(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; - virtual void getUpdatedBoxCenter(Point3F& pos); - virtual TSShape* getTSShape(); - virtual TSShapeInstance* getTSShapeInstance(); + void getUpdatedBoxCenter(Point3F& pos) override; + TSShape* getTSShape() override; + TSShapeInstance* getTSShapeInstance() override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -222,12 +222,12 @@ class afxEA_StaticShapeDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_StaticShapeDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return true; } + bool runsOnClient(const afxEffectWrapperData*) const override { return false; } - virtual afxEffectWrapper* create() const { return new afxEA_StaticShape; } + afxEffectWrapper* create() const override { return new afxEA_StaticShape; } }; afxEA_StaticShapeDesc afxEA_StaticShapeDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_TLKLight.cpp b/Engine/source/afx/ea/afxEA_TLKLight.cpp index 6d76f8ac0..4c79a82fa 100644 --- a/Engine/source/afx/ea/afxEA_TLKLight.cpp +++ b/Engine/source/afx/ea/afxEA_TLKLight.cpp @@ -53,12 +53,12 @@ class afxEA_TLKLightDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_TLKLightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return 0; } + afxEffectWrapper* create() const override { return 0; } }; afxEA_TLKLightDesc afxEA_TLKLightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_VolumeLight.cpp b/Engine/source/afx/ea/afxEA_VolumeLight.cpp index 194052f95..c85365a77 100644 --- a/Engine/source/afx/ea/afxEA_VolumeLight.cpp +++ b/Engine/source/afx/ea/afxEA_VolumeLight.cpp @@ -38,12 +38,12 @@ class afxEA_VolumeLightDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_VolumeLightDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return 0; } + afxEffectWrapper* create() const override { return 0; } }; afxEA_VolumeLightDesc afxEA_VolumeLightDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_Zodiac.cpp b/Engine/source/afx/ea/afxEA_Zodiac.cpp index c42a36837..8ce06780d 100644 --- a/Engine/source/afx/ea/afxEA_Zodiac.cpp +++ b/Engine/source/afx/ea/afxEA_Zodiac.cpp @@ -65,14 +65,14 @@ public: /*C*/ afxEA_Zodiac(); /*C*/ ~afxEA_Zodiac(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; - virtual bool ea_is_enabled() { return true; } + bool ea_is_enabled() override { return true; } - virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; } + void getBaseColor(LinearColorF& color) override { color = zode_data->color; } static void initPersistFields(); @@ -412,12 +412,12 @@ class afxEA_ZodiacDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ZodiacDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Zodiac; } + afxEffectWrapper* create() const override { return new afxEA_Zodiac; } }; afxEA_ZodiacDesc afxEA_ZodiacDesc::desc; diff --git a/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp b/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp index 43246f8f1..39296733e 100644 --- a/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp +++ b/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp @@ -58,14 +58,14 @@ public: /*C*/ afxEA_ZodiacPlane(); /*D*/ ~afxEA_ZodiacPlane(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); - virtual void ea_set_scope_status(bool flag); - virtual void onDeleteNotify(SimObject*); - virtual void getUpdatedBoxCenter(Point3F& pos); - virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; } + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; + void ea_set_scope_status(bool flag) override; + void onDeleteNotify(SimObject*) override; + void getUpdatedBoxCenter(Point3F& pos) override; + void getBaseColor(LinearColorF& color) override { color = zode_data->color; } }; F32 afxEA_ZodiacPlane::calc_facing_angle() @@ -319,12 +319,12 @@ class afxEA_ZodiacPlaneDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ZodiacPlaneDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_ZodiacPlane; } + afxEffectWrapper* create() const override { return new afxEA_ZodiacPlane; } }; //~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/forces/afxEA_Force.cpp b/Engine/source/afx/forces/afxEA_Force.cpp index 4f2ac1273..2f9d33cc3 100644 --- a/Engine/source/afx/forces/afxEA_Force.cpp +++ b/Engine/source/afx/forces/afxEA_Force.cpp @@ -47,10 +47,10 @@ public: /*C*/ afxEA_Force(); /*D*/ ~afxEA_Force(); - virtual void ea_set_datablock(SimDataBlock*); - virtual bool ea_start(); - virtual bool ea_update(F32 dt); - virtual void ea_finish(bool was_stopped); + void ea_set_datablock(SimDataBlock*) override; + bool ea_start() override; + bool ea_update(F32 dt) override; + void ea_finish(bool was_stopped) override; }; //~~~~~~~~~~~~~~~~~~~~// @@ -155,12 +155,12 @@ class afxEA_ForceDesc : public afxEffectAdapterDesc, public afxEffectDefs static afxEA_ForceDesc desc; public: - virtual bool testEffectType(const SimDataBlock*) const; - virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; - virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } - virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } + bool testEffectType(const SimDataBlock*) const override; + bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override; + bool runsOnServer(const afxEffectWrapperData*) const override { return false; } + bool runsOnClient(const afxEffectWrapperData*) const override { return true; } - virtual afxEffectWrapper* create() const { return new afxEA_Force; } + afxEffectWrapper* create() const override { return new afxEA_Force; } }; afxEA_ForceDesc afxEA_ForceDesc::desc; diff --git a/Engine/source/afx/forces/afxF_Drag.cpp b/Engine/source/afx/forces/afxF_Drag.cpp index 91fc394ae..b6f6b6879 100644 --- a/Engine/source/afx/forces/afxF_Drag.cpp +++ b/Engine/source/afx/forces/afxF_Drag.cpp @@ -43,9 +43,9 @@ public: /*C*/ afxF_DragData(); /*C*/ afxF_DragData(const afxF_DragData&, bool = false); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); - virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override; static void initPersistFields(); @@ -65,10 +65,10 @@ private: public: /*C*/ afxF_Drag(); - virtual bool onNewDataBlock(afxForceData* dptr, bool reload); + bool onNewDataBlock(afxForceData* dptr, bool reload) override; - virtual void start(); - virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass); + void start() override; + Point3F evaluate(Point3F pos, Point3F v, F32 mass) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -196,8 +196,8 @@ class afxF_DragDesc : public afxForceDesc static afxF_DragDesc desc; public: - virtual bool testForceType(const SimDataBlock*) const; - virtual afxForce* create() const { return new afxF_Drag; } + bool testForceType(const SimDataBlock*) const override; + afxForce* create() const override { return new afxF_Drag; } }; afxF_DragDesc afxF_DragDesc::desc; diff --git a/Engine/source/afx/forces/afxF_Gravity.cpp b/Engine/source/afx/forces/afxF_Gravity.cpp index 946a412de..b7dc5c6a8 100644 --- a/Engine/source/afx/forces/afxF_Gravity.cpp +++ b/Engine/source/afx/forces/afxF_Gravity.cpp @@ -41,9 +41,9 @@ public: /*C*/ afxF_GravityData(); /*C*/ afxF_GravityData(const afxF_GravityData&, bool = false); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); - virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override; static void initPersistFields(); @@ -62,9 +62,9 @@ private: public: /*C*/ afxF_Gravity(); - virtual bool onNewDataBlock(afxForceData* dptr, bool reload); + bool onNewDataBlock(afxForceData* dptr, bool reload) override; - virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass); + Point3F evaluate(Point3F pos, Point3F v, F32 mass) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -158,8 +158,8 @@ class afxF_GravityDesc : public afxForceDesc static afxF_GravityDesc desc; public: - virtual bool testForceType(const SimDataBlock*) const; - virtual afxForce* create() const { return new afxF_Gravity; } + bool testForceType(const SimDataBlock*) const override; + afxForce* create() const override { return new afxF_Gravity; } }; afxF_GravityDesc afxF_GravityDesc::desc; diff --git a/Engine/source/afx/forces/afxForce.h b/Engine/source/afx/forces/afxForce.h index 5050d17d8..0e8960bc7 100644 --- a/Engine/source/afx/forces/afxForce.h +++ b/Engine/source/afx/forces/afxForce.h @@ -42,11 +42,11 @@ public: /*C*/ afxForceData(); /*C*/ afxForceData(const afxForceData&, bool = false); - virtual bool onAdd(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + bool onAdd() override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0)=0; static void initPersistFields(); diff --git a/Engine/source/afx/forces/afxXM_Force.cpp b/Engine/source/afx/forces/afxXM_Force.cpp index eaabd9332..97c3181aa 100644 --- a/Engine/source/afx/forces/afxXM_Force.cpp +++ b/Engine/source/afx/forces/afxXM_Force.cpp @@ -52,16 +52,16 @@ public: /*C*/ afxXM_ForceData(); /*C*/ afxXM_ForceData(const afxXM_ForceData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_ForceData); }; @@ -85,8 +85,8 @@ class afxXM_Force : public afxXM_WeightedBase, public afxEffectDefs public: /*C*/ afxXM_Force(afxXM_ForceData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/rpg/afxRPGMagicSpell.h b/Engine/source/afx/rpg/afxRPGMagicSpell.h index 17e6ac0b4..a4c9fffd4 100644 --- a/Engine/source/afx/rpg/afxRPGMagicSpell.h +++ b/Engine/source/afx/rpg/afxRPGMagicSpell.h @@ -90,9 +90,9 @@ public: char* formatDesc(char* buffer, int len) const; bool requiresTarget() { return (spell_target == TARGET_ENEMY || spell_target == TARGET_CORPSE || spell_target == TARGET_FRIEND); } - virtual bool onAdd(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; static void initPersistFields(); diff --git a/Engine/source/afx/ui/afxEventCatchAll.cpp b/Engine/source/afx/ui/afxEventCatchAll.cpp index 7f3da32b3..91d98249d 100644 --- a/Engine/source/afx/ui/afxEventCatchAll.cpp +++ b/Engine/source/afx/ui/afxEventCatchAll.cpp @@ -34,21 +34,21 @@ class afxEventCatchAll : public GuiControl public: /* C */ afxEventCatchAll() { } - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; - virtual void onMouseUp(const GuiEvent&); - virtual void onMouseDown(const GuiEvent&); - virtual void onMouseMove(const GuiEvent&); - virtual void onMouseDragged(const GuiEvent&); - virtual void onMouseEnter(const GuiEvent&); - virtual void onMouseLeave(const GuiEvent&); + void onMouseUp(const GuiEvent&) override; + void onMouseDown(const GuiEvent&) override; + void onMouseMove(const GuiEvent&) override; + void onMouseDragged(const GuiEvent&) override; + void onMouseEnter(const GuiEvent&) override; + void onMouseLeave(const GuiEvent&) override; - virtual bool onMouseWheelUp(const GuiEvent&); - virtual bool onMouseWheelDown(const GuiEvent&); + bool onMouseWheelUp(const GuiEvent&) override; + bool onMouseWheelDown(const GuiEvent&) override; - virtual void onRightMouseDown(const GuiEvent&); - virtual void onRightMouseUp(const GuiEvent&); - virtual void onRightMouseDragged(const GuiEvent&); + void onRightMouseDown(const GuiEvent&) override; + void onRightMouseUp(const GuiEvent&) override; + void onRightMouseDragged(const GuiEvent&) override; DECLARE_CONOBJECT(afxEventCatchAll); DECLARE_CATEGORY("AFX"); diff --git a/Engine/source/afx/ui/afxGuiSubstitutionField.h b/Engine/source/afx/ui/afxGuiSubstitutionField.h index d26218be9..bcb69ffd3 100644 --- a/Engine/source/afx/ui/afxGuiSubstitutionField.h +++ b/Engine/source/afx/ui/afxGuiSubstitutionField.h @@ -43,21 +43,21 @@ public: DECLARE_CONOBJECT(afxGuiSubstitutionField); DECLARE_CATEGORY("AFX"); - virtual void setData( const char* data, bool callbacks = true ); - virtual const char* getData( U32 inspectObjectIndex = 0 ); - virtual void updateValue(); + void setData( const char* data, bool callbacks = true ) override; + const char* getData( U32 inspectObjectIndex = 0 ) override; + void updateValue() override; virtual void setToolTip( StringTableEntry data ); - virtual bool onAdd(); + bool onAdd() override; - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; - virtual void setValue( const char* newValue ); + void setValue( const char* newValue ) override; protected: - virtual void _executeSelectedCallback(); + void _executeSelectedCallback() override; protected: diff --git a/Engine/source/afx/ui/afxGuiTextHud.h b/Engine/source/afx/ui/afxGuiTextHud.h index 285f74193..5844b61af 100644 --- a/Engine/source/afx/ui/afxGuiTextHud.h +++ b/Engine/source/afx/ui/afxGuiTextHud.h @@ -72,7 +72,7 @@ public: afxGuiTextHud(); // GuiControl - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); static void addTextItem(const Point3F& pos, const char* text, LinearColorF& color, SceneObject* obj=0); diff --git a/Engine/source/afx/ui/afxSpellButton.h b/Engine/source/afx/ui/afxSpellButton.h index d261b461f..5999395b0 100644 --- a/Engine/source/afx/ui/afxSpellButton.h +++ b/Engine/source/afx/ui/afxSpellButton.h @@ -82,15 +82,15 @@ public: afxMagicSpellData* getSpellDataBlock() const; afxRPGMagicSpellData* getSpellRPGDataBlock() const; - virtual bool onAdd(); - virtual bool onWake(); - virtual void onSleep(); - virtual void inspectPostApply(); - virtual void onMouseEnter(const GuiEvent &event); - virtual void onMouseLeave(const GuiEvent &event); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool onAdd() override; + bool onWake() override; + void onSleep() override; + void inspectPostApply() override; + void onMouseEnter(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onRender(Point2I offset, const RectI &updateRect) override; - virtual void onDeleteNotify(SimObject*); + void onDeleteNotify(SimObject*) override; static void initPersistFields(); diff --git a/Engine/source/afx/ui/afxSpellCastBar.cpp b/Engine/source/afx/ui/afxSpellCastBar.cpp index 2b2c29b90..296161a37 100644 --- a/Engine/source/afx/ui/afxSpellCastBar.cpp +++ b/Engine/source/afx/ui/afxSpellCastBar.cpp @@ -50,13 +50,13 @@ class afxSpellCastBar : public GuiControl, public afxProgressBase public: /*C*/ afxSpellCastBar(); - virtual void onRender(Point2I, const RectI&); + void onRender(Point2I, const RectI&) override; void setFraction(F32 frac); F32 getFraction() const { return fraction; } - virtual void setProgress(F32 value) { setFraction(value); } - virtual void onStaticModified(const char* slotName, const char* newValue = NULL); + void setProgress(F32 value) override { setFraction(value); } + void onStaticModified(const char* slotName, const char* newValue = NULL) override; static void initPersistFields(); diff --git a/Engine/source/afx/ui/afxStatusBar.cpp b/Engine/source/afx/ui/afxStatusBar.cpp index fabb0c0b7..624cc6a21 100644 --- a/Engine/source/afx/ui/afxStatusBar.cpp +++ b/Engine/source/afx/ui/afxStatusBar.cpp @@ -49,20 +49,20 @@ class afxStatusBar : public GuiControl, public afxProgressBase public: /*C*/ afxStatusBar(); - virtual void onRender(Point2I, const RectI&); + void onRender(Point2I, const RectI&) override; void setFraction(F32 frac); F32 getFraction() const { return fraction; } - virtual void setProgress(F32 value) { setFraction(value); } + void setProgress(F32 value) override { setFraction(value); } void setShape(ShapeBase* s); void clearShape() { setShape(NULL); } - virtual bool onWake(); - virtual void onSleep(); - virtual void onMouseDown(const GuiEvent &event); - virtual void onDeleteNotify(SimObject*); + bool onWake() override; + void onSleep() override; + void onMouseDown(const GuiEvent &event) override; + void onDeleteNotify(SimObject*) override; static void initPersistFields(); diff --git a/Engine/source/afx/ui/afxStatusBox.h b/Engine/source/afx/ui/afxStatusBox.h index f048cef2f..a10c0c550 100644 --- a/Engine/source/afx/ui/afxStatusBox.h +++ b/Engine/source/afx/ui/afxStatusBox.h @@ -38,8 +38,8 @@ private: public: /*C*/ afxStatusBox(); - virtual void onMouseDown(const GuiEvent &event); - virtual void onSleep(); + void onMouseDown(const GuiEvent &event) override; + void onSleep() override; DECLARE_CONOBJECT(afxStatusBox); DECLARE_CATEGORY("AFX"); diff --git a/Engine/source/afx/ui/afxStatusLabel.h b/Engine/source/afx/ui/afxStatusLabel.h index a81c92d86..b8e37df52 100644 --- a/Engine/source/afx/ui/afxStatusLabel.h +++ b/Engine/source/afx/ui/afxStatusLabel.h @@ -38,7 +38,7 @@ private: public: /*C*/ afxStatusLabel(); - virtual void onMouseDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; DECLARE_CONOBJECT(afxStatusLabel); DECLARE_CATEGORY("AFX"); diff --git a/Engine/source/afx/ui/afxTSCtrl.h b/Engine/source/afx/ui/afxTSCtrl.h index b45322b70..b51672938 100644 --- a/Engine/source/afx/ui/afxTSCtrl.h +++ b/Engine/source/afx/ui/afxTSCtrl.h @@ -55,22 +55,22 @@ private: public: /*C*/ afxTSCtrl(); - virtual bool processCameraQuery(CameraQuery *query); - virtual void renderWorld(const RectI &updateRect); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool processCameraQuery(CameraQuery *query) override; + void renderWorld(const RectI &updateRect) override; + void onRender(Point2I offset, const RectI &updateRect) override; - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; - virtual void onMouseDown(const GuiEvent&); - virtual void onMouseMove(const GuiEvent&); - virtual void onMouseDragged(const GuiEvent&); - virtual void onMouseEnter(const GuiEvent&); - virtual void onMouseLeave(const GuiEvent&); + void onMouseDown(const GuiEvent&) override; + void onMouseMove(const GuiEvent&) override; + void onMouseDragged(const GuiEvent&) override; + void onMouseEnter(const GuiEvent&) override; + void onMouseLeave(const GuiEvent&) override; - virtual bool onMouseWheelUp(const GuiEvent&); - virtual bool onMouseWheelDown(const GuiEvent&); + bool onMouseWheelUp(const GuiEvent&) override; + bool onMouseWheelDown(const GuiEvent&) override; - virtual void onRightMouseDown(const GuiEvent&); + void onRightMouseDown(const GuiEvent&) override; Point3F getMouse3DVec() {return mMouse3DVec;}; Point3F getMouse3DPos() {return mMouse3DPos;}; @@ -83,9 +83,9 @@ public: U8 getTargetingCheckMethod(); void performTargeting(const Point2I& mousePoint, U8 mode); - virtual void interpolateTick( F32 delta ) {}; - virtual void processTick() {}; - virtual void advanceTime( F32 timeDelta ); + void interpolateTick( F32 delta ) override {}; + void processTick() override {}; + void advanceTime( F32 timeDelta ) override; DECLARE_CONOBJECT(afxTSCtrl); DECLARE_CATEGORY("AFX"); diff --git a/Engine/source/afx/util/afxCurveEval.h b/Engine/source/afx/util/afxCurveEval.h index d5c6853b9..9df9cb92d 100644 --- a/Engine/source/afx/util/afxCurveEval.h +++ b/Engine/source/afx/util/afxCurveEval.h @@ -47,15 +47,15 @@ public: class afxHermiteEval : public afxCurveEval { public: - Point2F evaluateCurve(Point2F& v0, Point2F& v1, F32 t); - Point2F evaluateCurve(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t); - Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, F32 t); - Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t); + Point2F evaluateCurve(Point2F& v0, Point2F& v1, F32 t) override; + Point2F evaluateCurve(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t) override; + Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, F32 t) override; + Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t) override; - Point3F evaluateCurve(Point3F& v0, Point3F& v1, F32 t); - Point3F evaluateCurve(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t); - Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, F32 t); - Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t); + Point3F evaluateCurve(Point3F& v0, Point3F& v1, F32 t) override; + Point3F evaluateCurve(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t) override; + Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, F32 t) override; + Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/util/afxParticlePool.h b/Engine/source/afx/util/afxParticlePool.h index e4cfd1408..0bdab03c0 100644 --- a/Engine/source/afx/util/afxParticlePool.h +++ b/Engine/source/afx/util/afxParticlePool.h @@ -47,10 +47,10 @@ public: /*C*/ afxParticlePoolData(const afxParticlePoolData&, bool = false); /*D*/ ~afxParticlePoolData(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + void packData(BitStream*) override; + void unpackData(BitStream*) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); @@ -75,7 +75,7 @@ class afxParticlePool : public GameBase class ObjectDeleteEvent : public SimEvent { public: - void process(SimObject *obj) { if (obj) obj->deleteObject(); } + void process(SimObject *obj) override { if (obj) obj->deleteObject(); } }; struct SortParticlePool @@ -102,14 +102,14 @@ private: GFXVertexBufferHandle mVertBuff2; protected: - virtual void prepRenderImage(SceneRenderState*); + void prepRenderImage(SceneRenderState*) override; void pool_prepBatchRender(RenderPassManager*, const Point3F &camPos, const LinearColorF &ambientColor); void pool_renderObject_Normal(RenderPassManager*, const Point3F &camPos, const LinearColorF &ambientColor); void pool_renderObject_TwoPass(RenderPassManager*, const Point3F &camPos, const LinearColorF &ambientColor); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; void renderBillboardParticle_blend(Particle&, const Point3F* basePnts, const MatrixF& camView, const F32 spinFactor, const F32 blend_factor, ParticleEmitter*); @@ -120,7 +120,7 @@ public: /*C*/ afxParticlePool(); /*D*/ ~afxParticlePool(); - virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); + bool onNewDataBlock(GameBaseData* dptr, bool reload) override; void addParticleEmitter(ParticleEmitter*); void removeParticleEmitter(ParticleEmitter*); diff --git a/Engine/source/afx/util/afxPath.h b/Engine/source/afx/util/afxPath.h index dc931641c..3eefdaea7 100644 --- a/Engine/source/afx/util/afxPath.h +++ b/Engine/source/afx/util/afxPath.h @@ -80,16 +80,16 @@ public: /*C*/ afxPathData(const afxPathData&, bool = false); /*D*/ ~afxPathData(); - virtual bool onAdd(); - virtual void onRemove(); - virtual void packData(BitStream*); - virtual void unpackData(BitStream*); + bool onAdd() override; + void onRemove() override; + void packData(BitStream*) override; + void unpackData(BitStream*) override; - bool preload(bool server, String &errorStr); + bool preload(bool server, String &errorStr) override; - virtual void onStaticModified(const char* slotName, const char* newValue = NULL); - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onStaticModified(const char* slotName, const char* newValue = NULL) override; + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } static void initPersistFields(); diff --git a/Engine/source/afx/xm/afxXM_Aim.cpp b/Engine/source/afx/xm/afxXM_Aim.cpp index 8256ebf0b..f1351638a 100644 --- a/Engine/source/afx/xm/afxXM_Aim.cpp +++ b/Engine/source/afx/xm/afxXM_Aim.cpp @@ -44,14 +44,14 @@ public: /*C*/ afxXM_AimData(); /*C*/ afxXM_AimData(const afxXM_AimData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_AimData); }; @@ -67,7 +67,7 @@ class afxXM_Aim_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_Aim_weighted(afxXM_AimData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -79,7 +79,7 @@ class afxXM_Aim_weighted_z : public afxXM_WeightedBase public: /*C*/ afxXM_Aim_weighted_z(afxXM_AimData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -91,7 +91,7 @@ class afxXM_Aim_fixed : public afxXM_Base public: /*C*/ afxXM_Aim_fixed(afxXM_AimData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -103,7 +103,7 @@ class afxXM_Aim_fixed_z : public afxXM_Base public: /*C*/ afxXM_Aim_fixed_z(afxXM_AimData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_AltitudeConform.cpp b/Engine/source/afx/xm/afxXM_AltitudeConform.cpp index 5c7228cad..cf5c52015 100644 --- a/Engine/source/afx/xm/afxXM_AltitudeConform.cpp +++ b/Engine/source/afx/xm/afxXM_AltitudeConform.cpp @@ -46,11 +46,11 @@ public: /*C*/ afxXM_AltitudeConformData(); /*C*/ afxXM_AltitudeConformData(const afxXM_AltitudeConformData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_AltitudeConformData); }; @@ -70,7 +70,7 @@ class afxXM_AltitudeConform : public afxXM_WeightedBase public: /*C*/ afxXM_AltitudeConform(afxXM_AltitudeConformData*, afxEffectWrapper*, bool on_server); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_BoxAdapt.cpp b/Engine/source/afx/xm/afxXM_BoxAdapt.cpp index d033c144a..e057fab20 100644 --- a/Engine/source/afx/xm/afxXM_BoxAdapt.cpp +++ b/Engine/source/afx/xm/afxXM_BoxAdapt.cpp @@ -45,11 +45,11 @@ public: /*C*/ afxXM_BoxAdaptData(); /*C*/ afxXM_BoxAdaptData(const afxXM_BoxAdaptData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_BoxAdaptData); }; @@ -68,7 +68,7 @@ class afxXM_BoxAdapt : public afxXM_WeightedBase public: /*C*/ afxXM_BoxAdapt(afxXM_BoxAdaptData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_BoxConform.cpp b/Engine/source/afx/xm/afxXM_BoxConform.cpp index 130e4421c..f43a9463a 100644 --- a/Engine/source/afx/xm/afxXM_BoxConform.cpp +++ b/Engine/source/afx/xm/afxXM_BoxConform.cpp @@ -46,11 +46,11 @@ public: /*C*/ afxXM_BoxConformData(); /*C*/ afxXM_BoxConformData(const afxXM_BoxConformData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_BoxConformData); }; @@ -64,7 +64,7 @@ class afxXM_BoxConform : public afxXM_Base public: /*C*/ afxXM_BoxConform(afxXM_BoxConformData*, afxEffectWrapper*, bool on_server); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp b/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp index d7418ba52..dd9e2f54a 100644 --- a/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp +++ b/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp @@ -44,12 +44,12 @@ public: /*C*/ afxXM_BoxHeightOffsetData(); /*C*/ afxXM_BoxHeightOffsetData(const afxXM_BoxHeightOffsetData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); #if defined(AFX_VERSION) - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; #else afxXM_Base* create(afxEffectWrapper* fx); #endif @@ -67,7 +67,7 @@ class afxXM_BoxHeightOffset : public afxXM_Base public: /*C*/ afxXM_BoxHeightOffset(afxXM_BoxHeightOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Freeze.cpp b/Engine/source/afx/xm/afxXM_Freeze.cpp index c7872f94a..0a5841b16 100644 --- a/Engine/source/afx/xm/afxXM_Freeze.cpp +++ b/Engine/source/afx/xm/afxXM_Freeze.cpp @@ -43,14 +43,14 @@ public: /*C*/ afxXM_FreezeData() : mask(POSITION | ORIENTATION | POSITION2), delay(0.0f) { } /*C*/ afxXM_FreezeData(const afxXM_FreezeData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_FreezeData); }; @@ -71,7 +71,7 @@ class afxXM_Freeze : public afxXM_Base public: /*C*/ afxXM_Freeze(afxXM_FreezeData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -89,7 +89,7 @@ class afxXM_Freeze_all_but_scale : public afxXM_Base public: /*C*/ afxXM_Freeze_all_but_scale(afxXM_FreezeData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -105,7 +105,7 @@ class afxXM_Freeze_pos : public afxXM_Base public: /*C*/ afxXM_Freeze_pos(afxXM_FreezeData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -121,7 +121,7 @@ class afxXM_Freeze_pos2 : public afxXM_Base public: /*C*/ afxXM_Freeze_pos2(afxXM_FreezeData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -137,7 +137,7 @@ class afxXM_Freeze_ori : public afxXM_Base public: /*C*/ afxXM_Freeze_ori(afxXM_FreezeData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_GroundConform.cpp b/Engine/source/afx/xm/afxXM_GroundConform.cpp index 79fe44253..e661f70ca 100644 --- a/Engine/source/afx/xm/afxXM_GroundConform.cpp +++ b/Engine/source/afx/xm/afxXM_GroundConform.cpp @@ -45,14 +45,14 @@ public: /*C*/ afxXM_GroundConformData(); /*C*/ afxXM_GroundConformData(const afxXM_GroundConformData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_GroundConformData); }; @@ -67,7 +67,7 @@ class afxXM_GroundConform : public afxXM_WeightedBase public: /*C*/ afxXM_GroundConform(afxXM_GroundConformData*, afxEffectWrapper*, bool on_server); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_HeightSampler.cpp b/Engine/source/afx/xm/afxXM_HeightSampler.cpp index eec80c9e6..76c5a7d74 100644 --- a/Engine/source/afx/xm/afxXM_HeightSampler.cpp +++ b/Engine/source/afx/xm/afxXM_HeightSampler.cpp @@ -42,14 +42,14 @@ public: /*C*/ afxXM_HeightSamplerData(); /*C*/ afxXM_HeightSamplerData(const afxXM_HeightSamplerData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_HeightSamplerData); }; @@ -65,7 +65,7 @@ class afxXM_HeightSampler : public afxXM_WeightedBase public: /*C*/ afxXM_HeightSampler(afxXM_HeightSamplerData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_MountedImageNode.cpp b/Engine/source/afx/xm/afxXM_MountedImageNode.cpp index 9ab4ea029..0a9df62b2 100644 --- a/Engine/source/afx/xm/afxXM_MountedImageNode.cpp +++ b/Engine/source/afx/xm/afxXM_MountedImageNode.cpp @@ -43,15 +43,15 @@ public: /*C*/ afxXM_MountedImageNodeData(); /*C*/ afxXM_MountedImageNodeData(const afxXM_MountedImageNodeData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_MountedImageNodeData); }; @@ -73,8 +73,8 @@ class afxXM_MountedImageNode : public afxXM_Base public: /*C*/ afxXM_MountedImageNode(afxXM_MountedImageNodeData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Offset.cpp b/Engine/source/afx/xm/afxXM_Offset.cpp index 2500c8d9d..b9beec334 100644 --- a/Engine/source/afx/xm/afxXM_Offset.cpp +++ b/Engine/source/afx/xm/afxXM_Offset.cpp @@ -49,14 +49,14 @@ public: /*C*/ afxXM_LocalOffsetData(); /*C*/ afxXM_LocalOffsetData(const afxXM_LocalOffsetData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_LocalOffsetData); }; @@ -71,7 +71,7 @@ class afxXM_LocalOffset_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_LocalOffset_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -87,7 +87,7 @@ class afxXM_LocalOffset_fixed : public afxXM_Base public: /*C*/ afxXM_LocalOffset_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -100,7 +100,7 @@ class afxXM_LocalOffset2_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_LocalOffset2_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -116,7 +116,7 @@ class afxXM_LocalOffset2_fixed : public afxXM_Base public: /*C*/ afxXM_LocalOffset2_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -134,14 +134,14 @@ public: /*C*/ afxXM_WorldOffsetData(); /*C*/ afxXM_WorldOffsetData(const afxXM_WorldOffsetData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_WorldOffsetData); }; @@ -156,7 +156,7 @@ class afxXM_WorldOffset_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_WorldOffset_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -171,7 +171,7 @@ class afxXM_WorldOffset_fixed : public afxXM_Base public: /*C*/ afxXM_WorldOffset_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -184,7 +184,7 @@ class afxXM_WorldOffset2_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_WorldOffset2_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -199,7 +199,7 @@ class afxXM_WorldOffset2_fixed : public afxXM_Base public: /*C*/ afxXM_WorldOffset2_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Oscillate.cpp b/Engine/source/afx/xm/afxXM_Oscillate.cpp index 7a4c89caf..62af9492f 100644 --- a/Engine/source/afx/xm/afxXM_Oscillate.cpp +++ b/Engine/source/afx/xm/afxXM_Oscillate.cpp @@ -51,14 +51,14 @@ public: /*C*/ afxXM_OscillateData(); /*C*/ afxXM_OscillateData(const afxXM_OscillateData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_OscillateData); }; @@ -72,7 +72,7 @@ class afxXM_Oscillate_rot : public afxXM_WeightedBase public: /*C*/ afxXM_Oscillate_rot(afxXM_OscillateData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; class afxXM_Oscillate_scale : public afxXM_WeightedBase @@ -84,7 +84,7 @@ class afxXM_Oscillate_scale : public afxXM_WeightedBase public: /*C*/ afxXM_Oscillate_scale(afxXM_OscillateData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; class afxXM_Oscillate_position : public afxXM_WeightedBase @@ -96,7 +96,7 @@ class afxXM_Oscillate_position : public afxXM_WeightedBase public: /*C*/ afxXM_Oscillate_position(afxXM_OscillateData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; class afxXM_Oscillate_position2 : public afxXM_WeightedBase @@ -108,7 +108,7 @@ class afxXM_Oscillate_position2 : public afxXM_WeightedBase public: /*C*/ afxXM_Oscillate_position2(afxXM_OscillateData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; class afxXM_Oscillate : public afxXM_WeightedBase @@ -120,7 +120,7 @@ class afxXM_Oscillate : public afxXM_WeightedBase public: /*C*/ afxXM_Oscillate(afxXM_OscillateData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp b/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp index 6897023e8..fd08eb953 100644 --- a/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp +++ b/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp @@ -41,11 +41,11 @@ public: public: /*C*/ afxXM_OscillateZodiacColorData(); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_OscillateZodiacColorData); }; @@ -64,8 +64,8 @@ class afxXM_OscillateZodiacColor : public afxXM_WeightedBase public: /*C*/ afxXM_OscillateZodiacColor(afxXM_OscillateZodiacColorData*, afxEffectWrapper*); - virtual void update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2, - Point3F& scale); + void update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2, + Point3F& scale) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_PathConform.cpp b/Engine/source/afx/xm/afxXM_PathConform.cpp index 365f5af92..a322bd56a 100644 --- a/Engine/source/afx/xm/afxXM_PathConform.cpp +++ b/Engine/source/afx/xm/afxXM_PathConform.cpp @@ -55,16 +55,16 @@ public: /*C*/ afxXM_PathConformData(); /*C*/ afxXM_PathConformData(const afxXM_PathConformData&, bool = false); - bool onAdd(); - bool preload(bool server, String &errorStr); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + bool onAdd() override; + bool preload(bool server, String &errorStr) override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_PathConformData); }; @@ -89,8 +89,8 @@ public: /*C*/ afxXM_PathConform(afxXM_PathConformData*, afxEffectWrapper*); /*D*/ ~afxXM_PathConform(); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp b/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp index 5a274f162..6401c7c79 100644 --- a/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp +++ b/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp @@ -45,14 +45,14 @@ public: /*C*/ afxXM_PivotNodeOffsetData(); /*C*/ afxXM_PivotNodeOffsetData(const afxXM_PivotNodeOffsetData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_PivotNodeOffsetData); }; @@ -72,7 +72,7 @@ class afxXM_PivotNodeOffset : public afxXM_Base public: /*C*/ afxXM_PivotNodeOffset(afxXM_PivotNodeOffsetData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_RandomRot.cpp b/Engine/source/afx/xm/afxXM_RandomRot.cpp index 1580e5f16..7ea3217cd 100644 --- a/Engine/source/afx/xm/afxXM_RandomRot.cpp +++ b/Engine/source/afx/xm/afxXM_RandomRot.cpp @@ -49,15 +49,15 @@ public: /*C*/ afxXM_RandomRotData(); /*C*/ afxXM_RandomRotData(const afxXM_RandomRotData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_RandomRotData); }; @@ -71,7 +71,7 @@ class afxXM_RandomRot : public afxXM_Base public: /*C*/ afxXM_RandomRot(afxXM_RandomRotData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Scale.cpp b/Engine/source/afx/xm/afxXM_Scale.cpp index 5d4b7e528..db5528571 100644 --- a/Engine/source/afx/xm/afxXM_Scale.cpp +++ b/Engine/source/afx/xm/afxXM_Scale.cpp @@ -47,14 +47,14 @@ public: /*C*/ afxXM_ScaleData(); /*C*/ afxXM_ScaleData(const afxXM_ScaleData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_ScaleData); }; @@ -70,7 +70,7 @@ class afxXM_Scale_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_Scale_weighted(afxXM_ScaleData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Shockwave.cpp b/Engine/source/afx/xm/afxXM_Shockwave.cpp index b4152c583..27c632df0 100644 --- a/Engine/source/afx/xm/afxXM_Shockwave.cpp +++ b/Engine/source/afx/xm/afxXM_Shockwave.cpp @@ -48,14 +48,14 @@ public: /*C*/ afxXM_ShockwaveData(); /*C*/ afxXM_ShockwaveData(const afxXM_ShockwaveData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_ShockwaveData); }; @@ -73,7 +73,7 @@ class afxXM_Shockwave : public afxXM_Base public: /*C*/ afxXM_Shockwave(afxXM_ShockwaveData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_Spin.cpp b/Engine/source/afx/xm/afxXM_Spin.cpp index f87b9d970..2fffa6c5a 100644 --- a/Engine/source/afx/xm/afxXM_Spin.cpp +++ b/Engine/source/afx/xm/afxXM_Spin.cpp @@ -51,15 +51,15 @@ public: /*C*/ afxXM_SpinData() : spin_axis(0,0,1), spin_angle(0), spin_angle_var(0), spin_rate(0), spin_rate_var(0) { } /*C*/ afxXM_SpinData(const afxXM_SpinData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); - bool onAdd(); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; + bool onAdd() override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_SpinData); }; @@ -77,7 +77,7 @@ class afxXM_Spin_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_Spin_weighted(afxXM_SpinData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -93,7 +93,7 @@ class afxXM_Spin_fixed : public afxXM_Base public: /*C*/ afxXM_Spin_fixed(afxXM_SpinData*, afxEffectWrapper*); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_VelocityOffset.cpp b/Engine/source/afx/xm/afxXM_VelocityOffset.cpp index ca2ea29df..2c9e97eb4 100644 --- a/Engine/source/afx/xm/afxXM_VelocityOffset.cpp +++ b/Engine/source/afx/xm/afxXM_VelocityOffset.cpp @@ -50,14 +50,14 @@ public: /*C*/ afxXM_VelocityOffsetData(); /*C*/ afxXM_VelocityOffsetData(const afxXM_VelocityOffsetData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_VelocityOffsetData); }; @@ -75,8 +75,8 @@ class afxXM_VelocityOffset_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_VelocityOffset_weighted(afxXM_VelocityOffsetData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -95,8 +95,8 @@ class afxXM_VelocityOffset_fixed : public afxXM_Base public: /*C*/ afxXM_VelocityOffset_fixed(afxXM_VelocityOffsetData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -112,8 +112,8 @@ class afxXM_VelocityOffset2_weighted : public afxXM_WeightedBase public: /*C*/ afxXM_VelocityOffset2_weighted(afxXM_VelocityOffsetData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// @@ -132,8 +132,8 @@ class afxXM_VelocityOffset2_fixed : public afxXM_Base public: /*C*/ afxXM_VelocityOffset2_fixed(afxXM_VelocityOffsetData*, afxEffectWrapper*); - virtual void start(F32 timestamp); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void start(F32 timestamp) override; + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_WaveBase.h b/Engine/source/afx/xm/afxXM_WaveBase.h index 0931b937b..6d4f37982 100644 --- a/Engine/source/afx/xm/afxXM_WaveBase.h +++ b/Engine/source/afx/xm/afxXM_WaveBase.h @@ -42,37 +42,37 @@ public: class afxXM_WaveformSine : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t); + F32 evaluate(F32 t) override; }; class afxXM_WaveformSquare : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t); + F32 evaluate(F32 t) override; }; class afxXM_WaveformTriangle : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t); + F32 evaluate(F32 t) override; }; class afxXM_WaveformSawtooth : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t) { return t; } + F32 evaluate(F32 t) override { return t; } }; class afxXM_WaveformNoise : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t) { return gRandGen.randF(); }; + F32 evaluate(F32 t) override { return gRandGen.randF(); }; }; class afxXM_WaveformOne : public afxXM_Waveform { public: - virtual F32 evaluate(F32 t) { return 1.0f; }; + F32 evaluate(F32 t) override { return 1.0f; }; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -163,8 +163,8 @@ public: /*C*/ afxXM_WaveBaseData(); /*C*/ afxXM_WaveBaseData(const afxXM_WaveBaseData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); @@ -203,8 +203,8 @@ public: /*C*/ afxXM_WaveRiderBaseData(); /*C*/ afxXM_WaveRiderBaseData(const afxXM_WaveRiderBaseData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); @@ -249,7 +249,7 @@ public: /*C*/ afxXM_WaveBase(afxXM_WaveBaseData*, afxEffectWrapper*, afxXM_WaveInterp*); /*D*/ virtual ~afxXM_WaveBase(); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; inline F32 afxXM_WaveBase::calc_initial_speed() @@ -302,7 +302,7 @@ public: /*C*/ afxXM_WaveRiderBase(afxXM_WaveRiderBaseData*, afxEffectWrapper*, afxXM_WaveInterp*); /*D*/ ~afxXM_WaveRiderBase(); - virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); + void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override; }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/xm/afxXM_WaveColor.cpp b/Engine/source/afx/xm/afxXM_WaveColor.cpp index 3584ca011..441336e54 100644 --- a/Engine/source/afx/xm/afxXM_WaveColor.cpp +++ b/Engine/source/afx/xm/afxXM_WaveColor.cpp @@ -45,8 +45,8 @@ public: void set(LinearColorF& a, LinearColorF& b, LinearColorF& a_var, LinearColorF& b_var, bool sync_var); - virtual void interpolate(F32 t, afxXM_Params& params)=0; - virtual void pulse(); + void interpolate(F32 t, afxXM_Params& params) override =0; + void pulse() override; }; afxXM_WaveInterp_Color::afxXM_WaveInterp_Color() @@ -88,7 +88,7 @@ inline void afxXM_WaveInterp_Color::pulse() class afxXM_WaveInterp_Color_Add : public afxXM_WaveInterp_Color { public: - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { LinearColorF temp_color; temp_color.interpolate(mA, mB, t); @@ -101,7 +101,7 @@ public: class afxXM_WaveInterp_Color_Mul : public afxXM_WaveInterp_Color { public: - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { LinearColorF temp_color; temp_color.interpolate(mA, mB, t); @@ -114,7 +114,7 @@ public: class afxXM_WaveInterp_Color_Rep : public afxXM_WaveInterp_Color { public: - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { params.color.interpolate(mA, mB, t); } @@ -171,14 +171,14 @@ public: /*C*/ afxXM_WaveColorData(); /*C*/ afxXM_WaveColorData(const afxXM_WaveColorData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_WaveColorData); }; @@ -286,14 +286,14 @@ public: /*C*/ afxXM_WaveRiderColorData(); /*C*/ afxXM_WaveRiderColorData(const afxXM_WaveRiderColorData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_WaveRiderColorData); }; diff --git a/Engine/source/afx/xm/afxXM_WaveScalar.cpp b/Engine/source/afx/xm/afxXM_WaveScalar.cpp index 8bebc8f1b..97c5ae672 100644 --- a/Engine/source/afx/xm/afxXM_WaveScalar.cpp +++ b/Engine/source/afx/xm/afxXM_WaveScalar.cpp @@ -45,8 +45,8 @@ public: void set(F32 a, F32 b, F32 a_var, F32 b_var, bool sync_var); - virtual void interpolate(F32 t, afxXM_Params& params)=0; - virtual void pulse(); + void interpolate(F32 t, afxXM_Params& params) override =0; + void pulse() override; }; afxXM_WaveInterp_Scalar::afxXM_WaveInterp_Scalar() @@ -88,7 +88,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Add(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { *((F32*)(((char*)(¶ms)) + offset)) += mLerp(mA, mB,t); } @@ -102,7 +102,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Mul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { *((F32*)(((char*)(¶ms)) + offset)) *= mLerp(mA, mB,t); } @@ -116,7 +116,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Rep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { *((F32*)(((char*)(¶ms)) + offset)) = mLerp(mA, mB,t); } @@ -130,7 +130,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_PointAdd(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 scalar_at_t = mLerp(mA, mB,t); Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t); @@ -146,7 +146,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_PointMul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { *((Point3F*)(((char*)(¶ms)) + offset)) *= mLerp(mA, mB,t); } @@ -160,7 +160,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_PointRep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 scalar_at_t = mLerp(mA, mB,t); Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t); @@ -177,7 +177,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Axis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F point_at_t = axis* mLerp(mA, mB,t); *((Point3F*)(((char*)(¶ms)) + offset)) += point_at_t; @@ -191,7 +191,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_LocalAxis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F local_axis(axis); params.ori.mulV(local_axis); @@ -209,7 +209,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Axis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F point_at_t = axis* mLerp(mA, mB,t); *((Point3F*)(((char*)(¶ms)) + offset)) *= point_at_t; @@ -223,7 +223,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_LocalAxis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F local_axis(axis); params.ori.mulV(local_axis); @@ -241,7 +241,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_Axis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F point_at_t = axis* mLerp(mA, mB,t); *((Point3F*)(((char*)(¶ms)) + offset)) = point_at_t; @@ -255,7 +255,7 @@ protected: U32 offset; public: afxXM_WaveInterp_Scalar_LocalAxis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { Point3F local_axis(axis); params.ori.mulV(local_axis); @@ -270,7 +270,7 @@ class afxXM_WaveInterp_Scalar_ColorAdd : public afxXM_WaveInterp_Scalar { public: afxXM_WaveInterp_Scalar_ColorAdd() : afxXM_WaveInterp_Scalar() { } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 scalar_at_t = mLerp(mA, mB,t); LinearColorF color_at_t(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t); @@ -284,7 +284,7 @@ class afxXM_WaveInterp_Scalar_ColorMul : public afxXM_WaveInterp_Scalar { public: afxXM_WaveInterp_Scalar_ColorMul() : afxXM_WaveInterp_Scalar() { } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { params.color *= mLerp(mA, mB,t); } @@ -296,7 +296,7 @@ class afxXM_WaveInterp_Scalar_ColorRep : public afxXM_WaveInterp_Scalar { public: afxXM_WaveInterp_Scalar_ColorRep() : afxXM_WaveInterp_Scalar() { } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 scalar_at_t = mLerp(mA, mB,t); params.color.set(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t); @@ -311,7 +311,7 @@ protected: Point3F axis; public: afxXM_WaveInterp_Scalar_OriMul(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 theta = mDegToRad(mLerp(mA, mB,t)); AngAxisF rot_aa(axis, theta); @@ -328,7 +328,7 @@ protected: Point3F axis; public: afxXM_WaveInterp_Scalar_OriRep(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax; } - virtual void interpolate(F32 t, afxXM_Params& params) + void interpolate(F32 t, afxXM_Params& params) override { F32 theta = mDegToRad(mLerp(mA, mB,t)); AngAxisF rot_aa(axis, theta); @@ -586,14 +586,14 @@ public: /*C*/ afxXM_WaveScalarData(); /*C*/ afxXM_WaveScalarData(const afxXM_WaveScalarData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_WaveScalarData); }; @@ -712,14 +712,14 @@ public: /*C*/ afxXM_WaveRiderScalarData(); /*C*/ afxXM_WaveRiderScalarData(const afxXM_WaveRiderScalarData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } static void initPersistFields(); - afxXM_Base* create(afxEffectWrapper* fx, bool on_server); + afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override; DECLARE_CONOBJECT(afxXM_WaveRiderScalarData); }; diff --git a/Engine/source/afx/xm/afxXfmMod.h b/Engine/source/afx/xm/afxXfmMod.h index 4a5e2911f..355f70659 100644 --- a/Engine/source/afx/xm/afxXfmMod.h +++ b/Engine/source/afx/xm/afxXfmMod.h @@ -83,8 +83,8 @@ public: /*C*/ afxXM_BaseData(); /*C*/ afxXM_BaseData(const afxXM_BaseData&, bool = false); - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); @@ -140,8 +140,8 @@ public: bool hasFixedWeight() const; F32 getWeightFactor() const; - void packData(BitStream* stream); - void unpackData(BitStream* stream); + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; static void initPersistFields(); diff --git a/Engine/source/app/net/net.h b/Engine/source/app/net/net.h index c0aee9335..92d39f79f 100644 --- a/Engine/source/app/net/net.h +++ b/Engine/source/app/net/net.h @@ -37,13 +37,13 @@ public: ~RemoteCommandEvent(); - virtual void pack(NetConnection* conn, BitStream *bstream); + void pack(NetConnection* conn, BitStream *bstream) override; - virtual void write(NetConnection* conn, BitStream *bstream); + void write(NetConnection* conn, BitStream *bstream) override; - virtual void unpack(NetConnection* conn, BitStream *bstream); + void unpack(NetConnection* conn, BitStream *bstream) override; - virtual void process(NetConnection *conn); + void process(NetConnection *conn) override; static void sendRemoteCommand(NetConnection *conn, S32 argc, const char **argv); diff --git a/Engine/source/app/net/netExamples.cpp b/Engine/source/app/net/netExamples.cpp index 1f53c6d21..92edc3147 100644 --- a/Engine/source/app/net/netExamples.cpp +++ b/Engine/source/app/net/netExamples.cpp @@ -42,13 +42,13 @@ public: ~SimpleMessageEvent() { dFree(msg); } - virtual void pack(NetConnection* /*ps*/, BitStream *bstream) + void pack(NetConnection* /*ps*/, BitStream *bstream) override { bstream->writeString(msg); } - virtual void write(NetConnection*, BitStream *bstream) + void write(NetConnection*, BitStream *bstream) override { bstream->writeString(msg); } - virtual void unpack(NetConnection* /*ps*/, BitStream *bstream) + void unpack(NetConnection* /*ps*/, BitStream *bstream) override { char buf[256]; bstream->readString(buf); msg = dStrdup(buf); } - virtual void process(NetConnection *) + void process(NetConnection *) override { Con::printf("RMSG %d %s", mSourceId, msg); } DECLARE_CONOBJECT(SimpleMessageEvent); @@ -112,12 +112,12 @@ public: mNetFlags.set(ScopeAlways | Ghostable); dStrcpy(message, "Hello World!", 256); } - U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) + U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override { stream->writeString(message); return 0; } - void unpackUpdate(NetConnection *conn, BitStream *stream) + void unpackUpdate(NetConnection *conn, BitStream *stream) override { stream->readString(message); Con::printf("Got message: %s", message); diff --git a/Engine/source/app/net/serverQuery.cpp b/Engine/source/app/net/serverQuery.cpp index 1f48cd57c..11049704e 100644 --- a/Engine/source/app/net/serverQuery.cpp +++ b/Engine/source/app/net/serverQuery.cpp @@ -151,7 +151,7 @@ static U32 gHeartbeatSeq = 0; class DemoNetInterface : public NetInterface { public: - void handleInfoPacket(const NetAddress *address, U8 packetType, BitStream *stream); + void handleInfoPacket(const NetAddress *address, U8 packetType, BitStream *stream) override; }; DemoNetInterface gNetInterface; @@ -323,7 +323,7 @@ class ProcessMasterQueryEvent : public SimEvent { session = _session; } - void process( SimObject *object ) + void process( SimObject *object ) override { processMasterServerQuery( session ); } @@ -338,7 +338,7 @@ class ProcessPingEvent : public SimEvent { session = _session; } - void process( SimObject *object ) + void process( SimObject *object ) override { processPingsAndQueries( session ); } @@ -354,7 +354,7 @@ class ProcessPacketEvent : public SimEvent session = _session; } - void process( SimObject *object ) + void process( SimObject *object ) override { processServerListPackets( session ); } @@ -369,7 +369,7 @@ class HeartbeatEvent : public SimEvent { mSeq = seq; } - void process( SimObject *object ) + void process( SimObject *object ) override { processHeartbeat(mSeq); } diff --git a/Engine/source/app/net/tcpObject.h b/Engine/source/app/net/tcpObject.h index a869f48be..036fbea59 100644 --- a/Engine/source/app/net/tcpObject.h +++ b/Engine/source/app/net/tcpObject.h @@ -83,7 +83,7 @@ public: void disconnect(); State getState() { return mState; } - bool processArguments(S32 argc, ConsoleValue *argv); + bool processArguments(S32 argc, ConsoleValue *argv) override; void send(const U8 *buffer, U32 bufferLen); ///Send an entire file over tcp @@ -96,7 +96,7 @@ public: void setPort(U16 port) { mPort = port; } - bool onAdd(); + bool onAdd() override; DECLARE_CONOBJECT(TCPObject); diff --git a/Engine/source/assets/assetBase.h b/Engine/source/assets/assetBase.h index ad6d4e95b..0877fc321 100644 --- a/Engine/source/assets/assetBase.h +++ b/Engine/source/assets/assetBase.h @@ -97,7 +97,7 @@ public: /// Engine. static void initPersistFields(); - virtual void copyTo(SimObject* object); + void copyTo(SimObject* object) override; /// Asset configuration. inline void setAssetName(const char* pAssetName) { if (mpOwningAssetManager == NULL) mpAssetDefinition->mAssetName = StringTable->insert(pAssetName); } diff --git a/Engine/source/assets/assetManager.h b/Engine/source/assets/assetManager.h index 9271ea534..43a5a6c35 100644 --- a/Engine/source/assets/assetManager.h +++ b/Engine/source/assets/assetManager.h @@ -119,8 +119,8 @@ public: virtual ~AssetManager() {} /// SimObject overrides - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); /// Declared assets. @@ -389,9 +389,9 @@ private: void unloadAsset( AssetDefinition* pAssetDefinition ); /// Module callbacks. - virtual void onModulePreLoad( ModuleDefinition* pModuleDefinition ); - virtual void onModulePreUnload( ModuleDefinition* pModuleDefinition ); - virtual void onModulePostUnload( ModuleDefinition* pModuleDefinition ); + void onModulePreLoad( ModuleDefinition* pModuleDefinition ) override; + void onModulePreUnload( ModuleDefinition* pModuleDefinition ) override; + void onModulePostUnload( ModuleDefinition* pModuleDefinition ) override; }; //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetPtr.h b/Engine/source/assets/assetPtr.h index a68a4e287..d30b822d9 100644 --- a/Engine/source/assets/assetPtr.h +++ b/Engine/source/assets/assetPtr.h @@ -155,7 +155,7 @@ public: } /// Referencing. - virtual void clear( void ) + void clear( void ) override { // Do we have an asset? if ( notNull() ) @@ -171,14 +171,14 @@ public: T* operator->( void ) const { return mpAsset; } T& operator*( void ) const { return *mpAsset; } operator T*( void ) const { return mpAsset; } - virtual void setAssetId( const char* pAssetId ) { *this = pAssetId; } - virtual StringTableEntry getAssetId( void ) const { return isNull() ? StringTable->EmptyString() : mpAsset->getAssetId(); } - virtual StringTableEntry getAssetType(void) const { return isNull() ? StringTable->EmptyString() : mpAsset->getClassName(); } - virtual bool isAssetId( const char* pAssetId ) const { return pAssetId == NULL ? isNull() : getAssetId() == StringTable->insert(pAssetId); } + void setAssetId( const char* pAssetId ) override { *this = pAssetId; } + StringTableEntry getAssetId( void ) const override { return isNull() ? StringTable->EmptyString() : mpAsset->getAssetId(); } + StringTableEntry getAssetType(void) const override { return isNull() ? StringTable->EmptyString() : mpAsset->getClassName(); } + bool isAssetId( const char* pAssetId ) const override { return pAssetId == NULL ? isNull() : getAssetId() == StringTable->insert(pAssetId); } /// Validity. - virtual bool isNull( void ) const { return mpAsset.isNull(); } - virtual bool notNull( void ) const { return !mpAsset.isNull(); } + bool isNull( void ) const override { return mpAsset.isNull(); } + bool notNull( void ) const override { return !mpAsset.isNull(); } }; #endif // _ASSET_PTR_H_ diff --git a/Engine/source/assets/assetQuery.h b/Engine/source/assets/assetQuery.h index 86a7f744f..b3d4879a2 100644 --- a/Engine/source/assets/assetQuery.h +++ b/Engine/source/assets/assetQuery.h @@ -53,8 +53,8 @@ private: typedef SimObject Parent; protected: - virtual void onTamlCustomWrite( TamlCustomNodes& customNodes ); - virtual void onTamlCustomRead( const TamlCustomNodes& customNodes ); + void onTamlCustomWrite( TamlCustomNodes& customNodes ) override; + void onTamlCustomRead( const TamlCustomNodes& customNodes ) override; static const char* getCount(void* obj, const char* data) { return Con::getIntArg(static_cast(obj)->mAssetList.size()); } static bool writeCount( void* obj, StringTableEntry pFieldName ) { return false; } diff --git a/Engine/source/assets/assetTagsManifest.h b/Engine/source/assets/assetTagsManifest.h index 82104bcfd..113965b30 100644 --- a/Engine/source/assets/assetTagsManifest.h +++ b/Engine/source/assets/assetTagsManifest.h @@ -120,8 +120,8 @@ private: void renameAssetId( const char* pAssetIdFrom, const char* pAssetIdTo ); protected: - virtual void onTamlCustomWrite( TamlCustomNodes& customNodes ); - virtual void onTamlCustomRead( const TamlCustomNodes& customNodes ); + void onTamlCustomWrite( TamlCustomNodes& customNodes ) override; + void onTamlCustomRead( const TamlCustomNodes& customNodes ) override; public: AssetTagsManifest(); diff --git a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h index 54a4de8e9..69be7e840 100644 --- a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h +++ b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h @@ -101,10 +101,10 @@ public: } const char* getAssetIdTo( void ) const { return mAssetIdTo; } - virtual bool wantsPropertyChanges( void ) { return true; } - virtual bool wantsRootOnly( void ) { return true; } + bool wantsPropertyChanges( void ) override { return true; } + bool wantsRootOnly( void ) override { return true; } - virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) + bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override { // Debug Profiling. PROFILE_SCOPE(TamlAssetDeclaredUpdateVisitor_Visit); diff --git a/Engine/source/assets/tamlAssetDeclaredVisitor.h b/Engine/source/assets/tamlAssetDeclaredVisitor.h index bbab18ebe..dd768034a 100644 --- a/Engine/source/assets/tamlAssetDeclaredVisitor.h +++ b/Engine/source/assets/tamlAssetDeclaredVisitor.h @@ -71,10 +71,10 @@ public: void clear( void ) { mAssetDefinition.reset(); mAssetDependencies.clear(); mAssetLooseFiles.clear(); } - virtual bool wantsPropertyChanges( void ) { return false; } - virtual bool wantsRootOnly( void ) { return false; } + bool wantsPropertyChanges( void ) override { return false; } + bool wantsRootOnly( void ) override { return false; } - virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) + bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override { // Debug Profiling. PROFILE_SCOPE(TamlAssetDeclaredVisitor_Visit); diff --git a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h index 499fc7428..a30d95808 100644 --- a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h +++ b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h @@ -76,10 +76,10 @@ public: } const char* getAssetIdTo( void ) const { return mAssetIdTo; } - virtual bool wantsPropertyChanges( void ) { return true; } - virtual bool wantsRootOnly( void ) { return false; } + bool wantsPropertyChanges( void ) override { return true; } + bool wantsRootOnly( void ) override { return false; } - virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) + bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override { // Debug Profiling. PROFILE_SCOPE(TamlAssetReferencedUpdateVisitor_Visit); diff --git a/Engine/source/assets/tamlAssetReferencedVisitor.h b/Engine/source/assets/tamlAssetReferencedVisitor.h index c744a880c..49c972ea9 100644 --- a/Engine/source/assets/tamlAssetReferencedVisitor.h +++ b/Engine/source/assets/tamlAssetReferencedVisitor.h @@ -57,10 +57,10 @@ public: void clear( void ) { mAssetReferenced.clear(); } - virtual bool wantsPropertyChanges( void ) { return false; } - virtual bool wantsRootOnly( void ) { return false; } + bool wantsPropertyChanges( void ) override { return false; } + bool wantsRootOnly( void ) override { return false; } - virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) + bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override { // Debug Profiling. PROFILE_SCOPE(TamlAssetReferencedVisitor_Visit); diff --git a/Engine/source/collision/boxConvex.h b/Engine/source/collision/boxConvex.h index 581a88570..cc2ca260f 100644 --- a/Engine/source/collision/boxConvex.h +++ b/Engine/source/collision/boxConvex.h @@ -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 diff --git a/Engine/source/collision/clippedPolyList.h b/Engine/source/collision/clippedPolyList.h index c9ebcc932..45ff56b88 100644 --- a/Engine/source/collision/clippedPolyList.h +++ b/Engine/source/collision/clippedPolyList.h @@ -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; }; diff --git a/Engine/source/collision/concretePolyList.h b/Engine/source/collision/concretePolyList.h index 482ff3ee0..131ddbd9b 100644 --- a/Engine/source/collision/concretePolyList.h +++ b/Engine/source/collision/concretePolyList.h @@ -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_ diff --git a/Engine/source/collision/depthSortList.h b/Engine/source/collision/depthSortList.h index 5781f65fd..3e46ef820 100644 --- a/Engine/source/collision/depthSortList.h +++ b/Engine/source/collision/depthSortList.h @@ -92,14 +92,14 @@ class DepthSortList : public ClippedPolyList void depthPartition(const Point3F * sourceVerts, U32 numVerts, Vector & partition, Vector & 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); diff --git a/Engine/source/collision/earlyOutPolyList.h b/Engine/source/collision/earlyOutPolyList.h index 971fe0519..b67cfc0ea 100644 --- a/Engine/source/collision/earlyOutPolyList.h +++ b/Engine/source/collision/earlyOutPolyList.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_ diff --git a/Engine/source/collision/extrudedPolyList.h b/Engine/source/collision/extrudedPolyList.h index cea6a76ef..2f3a58949 100644 --- a/Engine/source/collision/extrudedPolyList.h +++ b/Engine/source/collision/extrudedPolyList.h @@ -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 diff --git a/Engine/source/collision/gjk.h b/Engine/source/collision/gjk.h index 906007bb3..3980f95e5 100644 --- a/Engine/source/collision/gjk.h +++ b/Engine/source/collision/gjk.h @@ -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; }; diff --git a/Engine/source/collision/optimizedPolyList.h b/Engine/source/collision/optimizedPolyList.h index b42469fe1..772519c1f 100644 --- a/Engine/source/collision/optimizedPolyList.h +++ b/Engine/source/collision/optimizedPolyList.h @@ -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_ diff --git a/Engine/source/collision/planeExtractor.h b/Engine/source/collision/planeExtractor.h index 2a3f6e6e2..2fc65671d 100644 --- a/Engine/source/collision/planeExtractor.h +++ b/Engine/source/collision/planeExtractor.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; }; diff --git a/Engine/source/collision/vertexPolyList.h b/Engine/source/collision/vertexPolyList.h index c2fe5669b..241ee0c47 100644 --- a/Engine/source/collision/vertexPolyList.h +++ b/Engine/source/collision/vertexPolyList.h @@ -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& getVertexList() { return mVertexList; } diff --git a/Engine/source/console/SimXMLDocument.h b/Engine/source/console/SimXMLDocument.h index 2a12a50ba..96d63eeb8 100644 --- a/Engine/source/console/SimXMLDocument.h +++ b/Engine/source/console/SimXMLDocument.h @@ -56,9 +56,9 @@ class SimXMLDocument: public SimObject // tie in to the script language. The .cc file has more in depth // comments on these. //----------------------------------------------------------------------- - bool processArguments(S32 argc, ConsoleValue *argv); - bool onAdd(); - void onRemove(); + bool processArguments(S32 argc, ConsoleValue *argv) override; + bool onAdd() override; + void onRemove() override; static void initPersistFields(); // Set this to default state at construction. diff --git a/Engine/source/console/consoleLogger.h b/Engine/source/console/consoleLogger.h index e969f3ac1..062da62cb 100644 --- a/Engine/source/console/consoleLogger.h +++ b/Engine/source/console/consoleLogger.h @@ -81,7 +81,7 @@ class ConsoleLogger : public SimObject /// // Example script constructor usage. /// %obj = new ConsoleLogger( objName, logFileName, [append = false] ); /// @endcode - bool processArguments( S32 argc, ConsoleValue *argv ); + bool processArguments( S32 argc, ConsoleValue *argv ) override; /// Default constructor, make sure to initalize ConsoleLogger(); diff --git a/Engine/source/console/consoleObject.h b/Engine/source/console/consoleObject.h index 73a28567e..634b60225 100644 --- a/Engine/source/console/consoleObject.h +++ b/Engine/source/console/consoleObject.h @@ -554,8 +554,8 @@ public: /// @name Console Type Interface /// @{ - virtual void* getNativeVariable() { return new ( AbstractClassRep* ); } // Any pointer-sized allocation will do. - virtual void deleteNativeVariable( void* var ) { delete reinterpret_cast< AbstractClassRep** >( var ); } + void* getNativeVariable() override { return new ( AbstractClassRep* ); } // Any pointer-sized allocation will do. + void deleteNativeVariable( void* var ) override { delete reinterpret_cast< AbstractClassRep** >( var ); } /// @} @@ -603,7 +603,7 @@ class ConcreteAbstractClassRep : public AbstractClassRep { public: - virtual AbstractClassRep* getContainerChildClass(const bool recurse) + AbstractClassRep* getContainerChildClass(const bool recurse) override { // Fetch container children type. AbstractClassRep* pChildren = T::getContainerChildStaticClassRep(); @@ -619,7 +619,7 @@ public: return pParent->getContainerChildClass(recurse); } - virtual WriteCustomTamlSchema getCustomTamlSchema(void) + WriteCustomTamlSchema getCustomTamlSchema(void) override { return T::getStaticWriteCustomTamlSchema(); } @@ -663,12 +663,12 @@ public: }; /// Wrap constructor. - ConsoleObject* create() const { return NULL; } + ConsoleObject* create() const override { return NULL; } /// Perform class specific initialization tasks. /// /// Link namespaces, call initPersistFields() and consoleInit(). - void init() + void init() override { // Get handle to our parent class, if any, and ourselves (we are our parent's child). AbstractClassRep *parent = T::getParentStaticClassRep(); @@ -712,7 +712,7 @@ public: /// @name Console Type Interface /// @{ - virtual void setData(void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag) + void setData(void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag) override { if (argc == 1) { @@ -723,14 +723,14 @@ public: Con::errorf("Cannot set multiple args to a single ConsoleObject*."); } - virtual const char* getData(void* dptr, const EnumTable* tbl, BitSet32 flag) + const char* getData(void* dptr, const EnumTable* tbl, BitSet32 flag) override { T** obj = (T**)dptr; return Con::getReturnBuffer(T::__getObjectId(*obj)); } - virtual const char* getTypeClassName() { return mClassName; } - virtual const bool isDatablock() { return T::__smIsDatablock; }; + const char* getTypeClassName() override { return mClassName; } + const bool isDatablock() override { return T::__smIsDatablock; }; /// @} }; @@ -752,7 +752,7 @@ public: } /// Wrap constructor. - ConsoleObject* create() const { return new T; } + ConsoleObject* create() const override { return new T; } }; template< typename T > EnginePropertyTable ConcreteAbstractClassRep< T >::_smPropertyTable(0, NULL); @@ -1205,7 +1205,7 @@ inline bool& ConsoleObject::getDynamicGroupExpand() static SimObjectRefConsoleBaseType< className > ptrRefType; \ static AbstractClassRep::WriteCustomTamlSchema getStaticWriteCustomTamlSchema(); \ static AbstractClassRep* getContainerChildStaticClassRep(); \ - virtual AbstractClassRep* getClassRep() const + AbstractClassRep* getClassRep() const override #define DECLARE_CATEGORY( string ) \ static const char* __category() { return string; } diff --git a/Engine/source/console/dynamicTypes.h b/Engine/source/console/dynamicTypes.h index 476d029f9..416519f74 100644 --- a/Engine/source/console/dynamicTypes.h +++ b/Engine/source/console/dynamicTypes.h @@ -174,7 +174,7 @@ class EnumConsoleBaseType : public ConsoleBaseType public: - virtual const char* getData(void *dptr, const EnumTable *tbl, BitSet32 flag) + const char* getData(void *dptr, const EnumTable *tbl, BitSet32 flag) override { S32 dptrVal = *( S32* ) dptr; if( !tbl ) tbl = getEnumTable(); @@ -184,7 +184,7 @@ class EnumConsoleBaseType : public ConsoleBaseType return ( *tbl )[ i ].mName; return ""; } - virtual void setData(void *dptr, S32 argc, const char **argv, const EnumTable *tbl, BitSet32 flag) + void setData(void *dptr, S32 argc, const char **argv, const EnumTable *tbl, BitSet32 flag) override { if( argc != 1 ) return; if( !tbl ) tbl = getEnumTable(); @@ -214,14 +214,14 @@ class BitfieldConsoleBaseType : public ConsoleBaseType public: - virtual const char* getData( void* dptr, const EnumTable*, BitSet32 ) + const char* getData( void* dptr, const EnumTable*, BitSet32 ) override { static const U32 bufSize = 256; char* returnBuffer = Con::getReturnBuffer(bufSize); dSprintf(returnBuffer, bufSize, "0x%08x", *((S32 *) dptr) ); return returnBuffer; } - virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) + void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) override { if( argc != 1 ) return; \ *((S32 *) dptr) = dAtoui(argv[0],0); \ diff --git a/Engine/source/console/engineAPI.h b/Engine/source/console/engineAPI.h index 0a6af3dcd..ada1c305c 100644 --- a/Engine/source/console/engineAPI.h +++ b/Engine/source/console/engineAPI.h @@ -294,7 +294,7 @@ struct EngineUnmarshallData< ConsoleValue > { ConsoleValue operator()( ConsoleValue ref ) const { - return std::move(ref); + return ref; } }; diff --git a/Engine/source/console/engineObject.h b/Engine/source/console/engineObject.h index 388fd2244..64cd9c1bc 100644 --- a/Engine/source/console/engineObject.h +++ b/Engine/source/console/engineObject.h @@ -258,7 +258,7 @@ class EngineObject; static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \ static EngineExportScope& __engineExportScope(); \ static EnginePropertyTable& _smPropertyTable; \ - virtual const EngineTypeInfo* __typeinfo() const; \ + const EngineTypeInfo* __typeinfo() const override; \ public: /// Declare an abstract class @a type derived from the class @a super. @@ -282,6 +282,28 @@ class EngineObject; template< typename T > friend struct ::_SCOPE; \ template< typename T > friend T* _CREATE(); \ template< typename T, typename Base > friend class ::EngineClassTypeInfo; \ + private: \ + typedef ::_Private::_AbstractClassBase< ThisType > _ClassBase; \ + static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \ + static EngineExportScope& __engineExportScope(); \ + static EnginePropertyTable& _smPropertyTable; \ + const EngineTypeInfo* __typeinfo() const override; \ + public: + +/// Declare an abstract base class @a type derived from the class @a super. +/// +/// Nearly identical to DECLARE_ABSTRACT_CLASS macro, but with virtual methods +/// that are suppose to be override'd in child classes. +/// +/// @see DECLARE_ABSTRACT_CLASS +#define DECLARE_ABSTRACT_BASE_CLASS(type) \ + public: \ + typedef type ThisType; \ + typedef void SuperType; \ + template< typename T > friend struct ::_EngineTypeTraits; \ + template< typename T > friend struct ::_SCOPE; \ + template< typename T > friend T* _CREATE(); \ + template< typename T, typename Base > friend class ::EngineClassTypeInfo; \ private: \ typedef ::_Private::_AbstractClassBase< ThisType > _ClassBase; \ static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \ @@ -485,8 +507,8 @@ class EngineCRuntimeObjectPool : public IEngineObjectPool static EngineCRuntimeObjectPool* instance() { return &smInstance; } // IEngineObjectPool - virtual void* allocateObject(size_t size TORQUE_TMM_ARGS_DECL ); - virtual void freeObject( void* ptr ); + void* allocateObject(size_t size TORQUE_TMM_ARGS_DECL ) override; + void freeObject( void* ptr ) override; }; @@ -504,7 +526,7 @@ class EngineObject : public StrongRefBase { public: - DECLARE_ABSTRACT_CLASS( EngineObject, void ); + DECLARE_ABSTRACT_BASE_CLASS( EngineObject ); DECLARE_INSCOPE( _GLOBALSCOPE ); DECLARE_INSTANTIABLE; @@ -569,7 +591,7 @@ class EngineObject : public StrongRefBase IEngineObjectPool* getEngineObjectPool() const { return mEngineObjectPool; } // StrongRefBase - virtual void destroySelf(); + void destroySelf() override; #ifdef TORQUE_DEBUG @@ -653,7 +675,7 @@ class StaticEngineObject : public EngineObject StaticEngineObject(); // EngineObject. - virtual void destroySelf(); + void destroySelf() override; }; diff --git a/Engine/source/console/engineTypeInfo.h b/Engine/source/console/engineTypeInfo.h index 9f9c0d12f..83a3c0c58 100644 --- a/Engine/source/console/engineTypeInfo.h +++ b/Engine/source/console/engineTypeInfo.h @@ -538,14 +538,14 @@ class EngineSimpleTypeInfo : public EngineTypeInfo mTypeFlags.set( EngineTypeInstantiable ); } - virtual bool constructInstance( void* ptr ) const + bool constructInstance( void* ptr ) const override { T* p = reinterpret_cast< T* >( ptr ); *p = T(); return true; } - virtual void destructInstance( void* ptr ) const + void destructInstance( void* ptr ) const override { // Nothing to do. } @@ -567,14 +567,14 @@ class EngineStructTypeInfo : public EngineTypeInfo mTypeFlags.set( EngineTypeInstantiable ); } - virtual bool constructInstance( void* ptr ) const + bool constructInstance( void* ptr ) const override { T* p = reinterpret_cast< T* >( ptr ); *p = T(); return true; } - virtual void destructInstance( void* ptr ) const + void destructInstance( void* ptr ) const override { T* p = reinterpret_cast< T* >( ptr ); destructInPlace( p ); @@ -609,12 +609,12 @@ class EngineClassTypeInfo : public EngineTypeInfo mTypeFlags.set( EngineTypeSingleton ); } - virtual bool constructInstance( void* ptr ) const + bool constructInstance( void* ptr ) const override { return Base::_construct( ptr ); } - virtual void destructInstance( void* ptr ) const + void destructInstance( void* ptr ) const override { return Base::_destruct( ptr ); } diff --git a/Engine/source/console/fieldBrushObject.h b/Engine/source/console/fieldBrushObject.h index aeed548cf..96b213f44 100644 --- a/Engine/source/console/fieldBrushObject.h +++ b/Engine/source/console/fieldBrushObject.h @@ -71,7 +71,7 @@ public: StringTableEntry getSortName(void) const { return mSortName; } static void initPersistFields(); ///< Persist Fields. - virtual void onRemove(); ///< Called when the object is removed from the sim. + void onRemove() override; ///< Called when the object is removed from the sim. DECLARE_CONOBJECT(FieldBrushObject); }; diff --git a/Engine/source/console/persistenceManager.h b/Engine/source/console/persistenceManager.h index afb908960..bba565da2 100644 --- a/Engine/source/console/persistenceManager.h +++ b/Engine/source/console/persistenceManager.h @@ -280,8 +280,8 @@ public: PersistenceManager(); virtual ~PersistenceManager(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // Adds an object to the dirty list // Optionally changes the object's filename diff --git a/Engine/source/console/runtimeClassRep.h b/Engine/source/console/runtimeClassRep.h index d684652cf..4cab0dbd9 100644 --- a/Engine/source/console/runtimeClassRep.h +++ b/Engine/source/console/runtimeClassRep.h @@ -60,7 +60,7 @@ public: parentClass = parent; }; - virtual AbstractClassRep* getContainerChildClass(const bool recurse) + AbstractClassRep* getContainerChildClass(const bool recurse) override { // Fetch container children type. AbstractClassRep* pChildren = T::getContainerChildStaticClassRep(); @@ -76,7 +76,7 @@ public: return pParent->getContainerChildClass(recurse); } - virtual WriteCustomTamlSchema getCustomTamlSchema(void) + WriteCustomTamlSchema getCustomTamlSchema(void) override { return T::getStaticWriteCustomTamlSchema(); } @@ -100,7 +100,7 @@ public: } /// Wrap constructor. - ConsoleObject *create() const { return new T; } + ConsoleObject *create() const override { return new T; } //----------------------------------------------------------------------------- @@ -148,7 +148,7 @@ public: /// @name Console Type Interface /// @{ - virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag ) + void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag ) override { if( argc == 1 ) { @@ -159,14 +159,14 @@ public: Con::errorf( "Cannot set multiple args to a single ConsoleObject*."); } - virtual const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag ) + const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag ) override { T** obj = ( T** ) dptr; return Con::getReturnBuffer( T::__getObjectId( *obj ) ); } - virtual const char* getTypeClassName() { return mClassName; } - virtual const bool isDatablock() { return T::__smIsDatablock; }; + const char* getTypeClassName() override { return mClassName; } + const bool isDatablock() override { return T::__smIsDatablock; }; /// @} }; diff --git a/Engine/source/console/script.h b/Engine/source/console/script.h index 89f290e09..e1a9633a2 100644 --- a/Engine/source/console/script.h +++ b/Engine/source/console/script.h @@ -14,7 +14,7 @@ namespace Con gLastEvalResult.valid = pLastEvalResult.valid; gLastEvalResult.error = pLastEvalResult.error; gLastEvalResult.value.setString(pLastEvalResult.value.getString()); - return std::move(pLastEvalResult); + return pLastEvalResult; } inline EvalResult getLastEvalResult() { return setLastEvalResult(std::move(gLastEvalResult)); }; diff --git a/Engine/source/console/scriptObjects.h b/Engine/source/console/scriptObjects.h index 4686a547b..45de8aa17 100644 --- a/Engine/source/console/scriptObjects.h +++ b/Engine/source/console/scriptObjects.h @@ -41,8 +41,8 @@ class ScriptObject : public SimObject public: ScriptObject(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; DECLARE_CONOBJECT(ScriptObject); @@ -64,12 +64,12 @@ protected: public: ScriptTickObject(); static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - virtual void interpolateTick( F32 delta ); - virtual void processTick(); - virtual void advanceTime( F32 timeDelta ); + void interpolateTick( F32 delta ) override; + void processTick() override; + void advanceTime( F32 timeDelta ) override; DECLARE_CONOBJECT(ScriptTickObject); @@ -88,8 +88,8 @@ class ScriptGroup : public SimGroup public: ScriptGroup(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; DECLARE_CONOBJECT(ScriptGroup); diff --git a/Engine/source/console/simDatablock.h b/Engine/source/console/simDatablock.h index 21856bb46..1b61822d7 100644 --- a/Engine/source/console/simDatablock.h +++ b/Engine/source/console/simDatablock.h @@ -137,8 +137,8 @@ public: /// Get the modified key for this particular datablock. S32 getModifiedKey() const { return modifiedKey; } - bool onAdd(); - virtual void onStaticModified(const char* slotName, const char*newValue = NULL); + bool onAdd() override; + void onStaticModified(const char* slotName, const char*newValue = NULL) override; //void setLastError(const char*); void assignId(); @@ -171,7 +171,7 @@ public: /// @param flags If SelectedOnly is passed here, then /// only objects marked as selected (using setSelected) /// will output themselves. - virtual void write(Stream &stream, U32 tabStop, U32 flags = 0); + void write(Stream &stream, U32 tabStop, U32 flags = 0) override; /// Used by the console system to automatically tell datablock classes apart /// from non-datablock classes. diff --git a/Engine/source/console/simEvents.h b/Engine/source/console/simEvents.h index 20fa53f5b..9f6893ff2 100644 --- a/Engine/source/console/simEvents.h +++ b/Engine/source/console/simEvents.h @@ -111,7 +111,7 @@ public: SimConsoleEvent(S32 argc, ConsoleValue *argv, bool onObject); ~SimConsoleEvent(); - virtual void process(SimObject *object); + void process(SimObject *object) override; /// Creates a reference to our internal args list in argv void populateArgs(ConsoleValue *argv); @@ -140,7 +140,7 @@ public: SimConsoleThreadExecEvent(S32 argc, ConsoleValue *argv, bool onObject, SimConsoleThreadExecCallback *callback); SimConsoleThreadExecCallback& getCB() { return *cb; } - virtual void process(SimObject *object); + void process(SimObject *object) override; }; /// General purpose SimEvent which calls a Delegate callback. @@ -151,7 +151,7 @@ public: U32 *mEventId; Delegate mCallback; - void process( SimObject* ) + void process( SimObject* ) override { // Clear the event id and call the delegate. *mEventId = InvalidEventId; diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp index c3a45c3be..8417a9883 100644 --- a/Engine/source/console/simObject.cpp +++ b/Engine/source/console/simObject.cpp @@ -751,7 +751,7 @@ void SimObject::destroySelf() class SimObjectDeleteEvent : public SimEvent { public: - void process(SimObject *object) + void process(SimObject *object) override { object->deleteObject(); } diff --git a/Engine/source/console/simObject.h b/Engine/source/console/simObject.h index 947302f0e..7588f0aec 100644 --- a/Engine/source/console/simObject.h +++ b/Engine/source/console/simObject.h @@ -391,13 +391,13 @@ class SimObject: public ConsoleObject, public TamlCallbacks static bool _doPrototype(void* object, const char* index, const char* data); protected: /// Taml callbacks. - virtual void onTamlPreWrite(void) {} - virtual void onTamlPostWrite(void) {} - virtual void onTamlPreRead(void) {} - virtual void onTamlPostRead(const TamlCustomNodes& customNodes) {} - virtual void onTamlAddParent(SimObject* pParentObject) {} - virtual void onTamlCustomWrite(TamlCustomNodes& customNodes) {} - virtual void onTamlCustomRead(const TamlCustomNodes& customNodes); + void onTamlPreWrite(void) override {} + void onTamlPostWrite(void) override {} + void onTamlPreRead(void) override {} + void onTamlPostRead(const TamlCustomNodes& customNodes) override {} + void onTamlAddParent(SimObject* pParentObject) override {} + void onTamlCustomWrite(TamlCustomNodes& customNodes) override {} + void onTamlCustomRead(const TamlCustomNodes& customNodes) override; /// Id number for this object. SimObjectId mId; @@ -454,7 +454,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks virtual void _onUnselected() {} /// We can provide more detail, like object name and id. - virtual String _getLogMessage(const char* fmt, va_list args) const; + String _getLogMessage(const char* fmt, va_list args) const override; DEFINE_CREATE_METHOD { @@ -465,7 +465,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks // EngineObject. - virtual void _destroySelf(); + void _destroySelf() override; public: @@ -952,7 +952,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks /// @{ /// Return a textual description of the object. - virtual String describeSelf() const; + String describeSelf() const override; /// Dump the contents of this object to the console. Use the Torque Script dump() and dumpF() functions to /// call this. @@ -993,7 +993,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks } // EngineObject. - virtual void destroySelf(); + void destroySelf() override; protected: bool is_temp_clone; public: diff --git a/Engine/source/console/simObjectRef.h b/Engine/source/console/simObjectRef.h index d91415e5a..8e7201966 100644 --- a/Engine/source/console/simObjectRef.h +++ b/Engine/source/console/simObjectRef.h @@ -137,14 +137,14 @@ public: public: - virtual const char* getData( void *dptr, const EnumTable*, BitSet32 ) + const char* getData( void *dptr, const EnumTable*, BitSet32 ) override { SimObjectRef *objRef = static_cast< SimObjectRef* >( dptr ); T *obj = *objRef; return T::__getObjectId( obj ); } - virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) + void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) override { SimObjectRef *objRef = static_cast< SimObjectRef* >( dptr ); @@ -154,23 +154,23 @@ public: *objRef = argv[0]; } - virtual const bool isDatablock() + const bool isDatablock() override { return T::__smIsDatablock; }; - virtual const char* getTypeClassName() + const char* getTypeClassName() override { return T::getStaticClassRep()->getClassName(); } - virtual void* getNativeVariable() + void* getNativeVariable() override { SimObjectRef *var = new SimObjectRef(); return (void*)var; } - virtual void deleteNativeVariable( void *var ) + void deleteNativeVariable( void *var ) override { SimObjectRef *nativeVar = reinterpret_cast< SimObjectRef* >( var ); delete nativeVar; diff --git a/Engine/source/console/simPersistSet.h b/Engine/source/console/simPersistSet.h index e09a828ff..ea1cc72b8 100644 --- a/Engine/source/console/simPersistSet.h +++ b/Engine/source/console/simPersistSet.h @@ -56,9 +56,9 @@ class SimPersistSet : public SimSet void resolvePIDs(); // SimSet. - virtual void addObject( SimObject* ); - virtual void write( Stream &stream, U32 tabStop, U32 flags = 0 ); - virtual bool processArguments( S32 argc, ConsoleValue *argv ); + void addObject( SimObject* ) override; + void write( Stream &stream, U32 tabStop, U32 flags = 0 ) override; + bool processArguments( S32 argc, ConsoleValue *argv ) override; DECLARE_CONOBJECT( SimPersistSet ); DECLARE_CATEGORY( "Console" ); diff --git a/Engine/source/console/simSet.h b/Engine/source/console/simSet.h index b1f8c3f24..09e94fd1e 100644 --- a/Engine/source/console/simSet.h +++ b/Engine/source/console/simSet.h @@ -271,24 +271,24 @@ class SimSet : public SimObject, public TamlChildren // SimObject. DECLARE_CONOBJECT( SimSet ); - virtual void onRemove(); - virtual void onDeleteNotify(SimObject *object); + void onRemove() override; + void onDeleteNotify(SimObject *object) override; - virtual SimObject* findObject( const char* name ); + SimObject* findObject( const char* name ) override; - virtual void write(Stream &stream, U32 tabStop, U32 flags = 0); - virtual bool writeObject(Stream *stream); - virtual bool readObject(Stream *stream); + void write(Stream &stream, U32 tabStop, U32 flags = 0) override; + bool writeObject(Stream *stream) override; + bool readObject(Stream *stream) override; - virtual SimSet* clone(); + SimSet* clone() override; // TamlChildren - virtual U32 getTamlChildCount(void) const + U32 getTamlChildCount(void) const override { return (U32)size(); } - virtual SimObject* getTamlChild(const U32 childIndex) const + SimObject* getTamlChild(const U32 childIndex) const override { // Sanity! AssertFatal(childIndex < (U32)size(), "SimSet::getTamlChild() - Child index is out of range."); @@ -300,7 +300,7 @@ class SimSet : public SimObject, public TamlChildren return at(childIndex); } - virtual void addTamlChild(SimObject* pSimObject) + void addTamlChild(SimObject* pSimObject) override { // Sanity! AssertFatal(pSimObject != NULL, "SimSet::addTamlChild() - Cannot add a NULL child object."); @@ -452,19 +452,19 @@ class SimGroup: public SimSet void addObject( SimObject* object, const char* name ); // SimSet. - virtual void addObject( SimObject* object ); - virtual void removeObject( SimObject* object ); - virtual void pushObject( SimObject* object ); - virtual void popObject(); - virtual void clear(); + void addObject( SimObject* object ) override; + void removeObject( SimObject* object ) override; + void pushObject( SimObject* object ) override; + void popObject() override; + void clear() override; - virtual SimGroup* clone(); - virtual SimGroup* deepClone(); + SimGroup* clone() override; + SimGroup* deepClone() override; - virtual SimObject* findObject(const char* name); - virtual void onRemove(); + SimObject* findObject(const char* name) override; + void onRemove() override; - virtual bool processArguments( S32 argc, ConsoleValue *argv ); + bool processArguments( S32 argc, ConsoleValue *argv ) override; virtual SimObject* getObject(const S32& index); diff --git a/Engine/source/console/torquescript/ast.h b/Engine/source/console/torquescript/ast.h index d9de3dd02..1c41958a3 100644 --- a/Engine/source/console/torquescript/ast.h +++ b/Engine/source/console/torquescript/ast.h @@ -110,7 +110,7 @@ struct BreakStmtNode : StmtNode static BreakStmtNode* alloc(S32 lineNumber); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(BreakStmtNode); }; @@ -118,7 +118,7 @@ struct ContinueStmtNode : StmtNode { static ContinueStmtNode* alloc(S32 lineNumber); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(ContinueStmtNode); }; @@ -127,7 +127,7 @@ struct ExprNode : StmtNode { ExprNode* optimizedNode; - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) = 0; virtual TypeReq getPreferredType() = 0; @@ -140,7 +140,7 @@ struct ReturnStmtNode : StmtNode static ReturnStmtNode* alloc(S32 lineNumber, ExprNode* expr); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(ReturnStmtNode); }; @@ -157,7 +157,7 @@ struct IfStmtNode : StmtNode void propagateSwitchExpr(ExprNode* left, bool string); ExprNode* getSwitchOR(ExprNode* left, ExprNode* list, bool string); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(IfStmtNode); }; @@ -175,7 +175,7 @@ struct LoopStmtNode : StmtNode static LoopStmtNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* initExpr, ExprNode* endLoopExpr, StmtNode* loopBlock, bool isDoLoop); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(LoopStmtNode); }; @@ -199,7 +199,7 @@ struct IterStmtNode : StmtNode static IterStmtNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* containerExpr, StmtNode* body, bool isStringIter); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; }; /// A binary mathematical expression (ie, left op right). @@ -214,11 +214,11 @@ struct FloatBinaryExprNode : BinaryExprNode { static FloatBinaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* left, ExprNode* right); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; bool optimize(); - TypeReq getPreferredType(); + TypeReq getPreferredType() override; DBG_STMT_TYPE(FloatBinaryExprNode); }; @@ -230,8 +230,8 @@ struct ConditionalExprNode : ExprNode bool integer; static ConditionalExprNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* trueExpr, ExprNode* falseExpr); - virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - virtual TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(ConditionalExprNode); }; @@ -246,8 +246,8 @@ struct IntBinaryExprNode : BinaryExprNode bool optimize(); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(IntBinaryExprNode); }; @@ -256,8 +256,8 @@ struct StreqExprNode : BinaryExprNode bool eq; static StreqExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, bool eq); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(StreqExprNode); }; @@ -266,8 +266,8 @@ struct StrcatExprNode : BinaryExprNode S32 appendChar; static StrcatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, S32 appendChar); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(StrcatExprNode); }; @@ -276,8 +276,8 @@ struct CommaCatExprNode : BinaryExprNode static CommaCatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(CommaCatExprNode); }; @@ -289,8 +289,8 @@ struct IntUnaryExprNode : ExprNode static IntUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(IntUnaryExprNode); }; @@ -301,8 +301,8 @@ struct FloatUnaryExprNode : ExprNode static FloatUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(FloatUnaryExprNode); }; @@ -313,9 +313,9 @@ struct VarNode : ExprNode static VarNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); - virtual ExprNodeName getExprNodeNameEnum() const { return NameVarNode; } + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; + ExprNodeName getExprNodeNameEnum() const override { return NameVarNode; } DBG_STMT_TYPE(VarNode); }; @@ -326,9 +326,9 @@ struct IntNode : ExprNode static IntNode* alloc(S32 lineNumber, S32 value); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); - virtual ExprNodeName getExprNodeNameEnum() const { return NameIntNode; } + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; + ExprNodeName getExprNodeNameEnum() const override { return NameIntNode; } DBG_STMT_TYPE(IntNode); }; @@ -339,9 +339,9 @@ struct FloatNode : ExprNode static FloatNode* alloc(S32 lineNumber, F64 value); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); - virtual ExprNodeName getExprNodeNameEnum() const { return NameFloatNode; } + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; + ExprNodeName getExprNodeNameEnum() const override { return NameFloatNode; } DBG_STMT_TYPE(FloatNode); }; @@ -355,8 +355,8 @@ struct StrConstNode : ExprNode static StrConstNode* alloc(S32 lineNumber, const char* str, bool tag, bool doc = false); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(StrConstNode); }; @@ -368,8 +368,8 @@ struct ConstantNode : ExprNode static ConstantNode* alloc(S32 lineNumber, StringTableEntry value); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(ConstantNode); }; @@ -382,8 +382,8 @@ struct AssignExprNode : ExprNode static AssignExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(AssignExprNode); }; @@ -406,8 +406,8 @@ struct AssignOpExprNode : ExprNode static AssignOpExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr, S32 op); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(AssignOpExprNode); }; @@ -419,7 +419,7 @@ struct TTagSetStmtNode : StmtNode static TTagSetStmtNode* alloc(S32 lineNumber, StringTableEntry tag, ExprNode* valueExpr, ExprNode* stringExpr); - U32 compileStmt(CodeStream& codeStream, U32 ip); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; DBG_STMT_TYPE(TTagSetStmtNode); }; @@ -429,8 +429,8 @@ struct TTagDerefNode : ExprNode static TTagDerefNode* alloc(S32 lineNumber, ExprNode* expr); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(TTagDerefNode); }; @@ -440,8 +440,8 @@ struct TTagExprNode : ExprNode static TTagExprNode* alloc(S32 lineNumber, StringTableEntry tag); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(TTagExprNode); }; @@ -460,8 +460,8 @@ struct FuncCallExprNode : ExprNode static FuncCallExprNode* alloc(S32 lineNumber, StringTableEntry funcName, StringTableEntry nameSpace, ExprNode* args, bool dot); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(FuncCallExprNode); }; @@ -473,8 +473,8 @@ struct AssertCallExprNode : ExprNode static AssertCallExprNode* alloc(S32 lineNumber, ExprNode* testExpr, const char* message); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(AssertCallExprNode); }; @@ -493,8 +493,8 @@ struct SlotAccessNode : ExprNode static SlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(SlotAccessNode); }; @@ -513,8 +513,8 @@ struct InternalSlotAccessNode : ExprNode static InternalSlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* slotExpr, bool recurse); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(InternalSlotAccessNode); }; @@ -527,8 +527,8 @@ struct SlotAssignNode : ExprNode static SlotAssignNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName, ExprNode* valueExpr, U32 typeID = -1); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(SlotAssignNode); }; @@ -543,8 +543,8 @@ struct SlotAssignOpNode : ExprNode static SlotAssignOpNode* alloc(S32 lineNumber, ExprNode* objectExpr, StringTableEntry slotName, ExprNode* arrayExpr, S32 op, ExprNode* valueExpr); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); - TypeReq getPreferredType(); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; + TypeReq getPreferredType() override; DBG_STMT_TYPE(SlotAssignOpNode); }; @@ -564,9 +564,9 @@ struct ObjectDeclNode : ExprNode static ObjectDeclNode* alloc(S32 lineNumber, ExprNode* classNameExpr, ExprNode* objectNameExpr, ExprNode* argList, StringTableEntry parentObject, SlotAssignNode* slotDecls, ObjectDeclNode* subObjects, bool isDatablock, bool classNameInternal, bool isSingleton); U32 precompileSubObject(bool); - U32 compile(CodeStream& codeStream, U32 ip, TypeReq type); + U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override; U32 compileSubObject(CodeStream& codeStream, U32 ip, bool); - TypeReq getPreferredType(); + TypeReq getPreferredType() override; DBG_STMT_TYPE(ObjectDeclNode); }; @@ -588,8 +588,8 @@ struct FunctionDeclStmtNode : StmtNode static FunctionDeclStmtNode* alloc(S32 lineNumber, StringTableEntry fnName, StringTableEntry nameSpace, VarNode* args, StmtNode* stmts); - U32 compileStmt(CodeStream& codeStream, U32 ip); - void setPackage(StringTableEntry packageName); + U32 compileStmt(CodeStream& codeStream, U32 ip) override; + void setPackage(StringTableEntry packageName) override; DBG_STMT_TYPE(FunctionDeclStmtNode); }; diff --git a/Engine/source/console/typeValidators.h b/Engine/source/console/typeValidators.h index c4982a781..ac97cbd44 100644 --- a/Engine/source/console/typeValidators.h +++ b/Engine/source/console/typeValidators.h @@ -53,7 +53,7 @@ public: minV = minValue; maxV = maxValue; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; F32 getMin() { return minV; }; F32 getMax() { return maxV; }; }; @@ -68,7 +68,7 @@ public: minV = minValue; maxV = maxValue; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; F32 getMin() { return minV; }; F32 getMax() { return maxV; }; }; @@ -88,7 +88,7 @@ public: maxV = maxValueScaled; factor = scaleFactor; } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; }; /// Vector normalization validator @@ -97,7 +97,7 @@ class Point3NormalizeValidator : public TypeValidator F32 length; public: Point3NormalizeValidator(F32 normalizeLength = 1.0f) : length(normalizeLength) { } - void validateType(SimObject *object, void *typePtr); + void validateType(SimObject *object, void *typePtr) override; F32 getLength() { return length; }; }; diff --git a/Engine/source/core/filterStream.h b/Engine/source/core/filterStream.h index adb024e16..27a1834be 100644 --- a/Engine/source/core/filterStream.h +++ b/Engine/source/core/filterStream.h @@ -43,14 +43,14 @@ class FilterStream : public Stream // Mandatory overrides. By default, these are simply passed to // whatever is returned from getStream(); protected: - bool _read(const U32 in_numBytes, void* out_pBuffer); - bool _write(const U32 in_numBytes, const void* in_pBuffer); + bool _read(const U32 in_numBytes, void* out_pBuffer) override; + bool _write(const U32 in_numBytes, const void* in_pBuffer) override; public: - bool hasCapability(const Capability) const; + bool hasCapability(const Capability) const override; - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); - U32 getStreamSize(); + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; + U32 getStreamSize() override; }; #endif //_FILTERSTREAM_H_ diff --git a/Engine/source/core/memVolume.h b/Engine/source/core/memVolume.h index bc45bcec2..f3dbe95a7 100644 --- a/Engine/source/core/memVolume.h +++ b/Engine/source/core/memVolume.h @@ -48,14 +48,14 @@ namespace Torque MemFileSystem(String volume); ~MemFileSystem(); - String getTypeStr() const { return "Mem"; } + String getTypeStr() const override { return "Mem"; } - FileNodeRef resolve(const Path& path); - FileNodeRef create(const Path& path,FileNode::Mode); - bool remove(const Path& path); - bool rename(const Path& from,const Path& to); - Path mapTo(const Path& path); - Path mapFrom(const Path& path); + FileNodeRef resolve(const Path& path) override; + FileNodeRef create(const Path& path,FileNode::Mode) override; + bool remove(const Path& path) override; + bool rename(const Path& from,const Path& to) override; + Path mapTo(const Path& path) override; + Path mapFrom(const Path& path) override; private: String mVolume; @@ -73,21 +73,21 @@ namespace Torque MemFile(MemFileSystem* fs, MemFileData* fileData); virtual ~MemFile(); - Path getName() const; - NodeStatus getStatus() const; - bool getAttributes(Attributes*); + Path getName() const override; + NodeStatus getStatus() const override; + bool getAttributes(Attributes*) override; - U32 getPosition(); - U32 setPosition(U32,SeekMode); + U32 getPosition() override; + U32 setPosition(U32,SeekMode) override; - bool open(AccessMode); - bool close(); + bool open(AccessMode) override; + bool close() override; - U32 read(void* dst, U32 size); - U32 write(const void* src, U32 size); + U32 read(void* dst, U32 size) override; + U32 write(const void* src, U32 size) override; private: - U32 calculateChecksum(); + U32 calculateChecksum() override; MemFileSystem* mFileSystem; MemFileData* mFileData; @@ -107,20 +107,20 @@ namespace Torque MemDirectory(MemFileSystem* fs, MemDirectoryData* dir); ~MemDirectory(); - Path getName() const; - NodeStatus getStatus() const; - bool getAttributes(Attributes*); + Path getName() const override; + NodeStatus getStatus() const override; + bool getAttributes(Attributes*) override; - bool open(); - bool close(); - bool read(Attributes*); + bool open() override; + bool close() override; + bool read(Attributes*) override; private: friend class MemFileSystem; MemFileSystem* mFileSystem; MemDirectoryData* mDirectoryData; - U32 calculateChecksum(); + U32 calculateChecksum() override; NodeStatus mStatus; U32 mSearchIndex; diff --git a/Engine/source/core/ogg/oggTheoraDecoder.h b/Engine/source/core/ogg/oggTheoraDecoder.h index b148aba1f..dc5a6245c 100644 --- a/Engine/source/core/ogg/oggTheoraDecoder.h +++ b/Engine/source/core/ogg/oggTheoraDecoder.h @@ -177,9 +177,9 @@ class OggTheoraDecoder : public OggDecoder, void _transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch ); #endif // OggDecoder. - virtual bool _detect( ogg_page* startPage ); - virtual bool _init(); - virtual bool _packetin( ogg_packet* packet ); + bool _detect( ogg_page* startPage ) override; + bool _init() override; + bool _packetin( ogg_packet* packet ) override; /// U32 _getPixelOffset( th_ycbcr_buffer buffer, U32 plane, U32 x, U32 y ) const @@ -258,10 +258,10 @@ class OggTheoraDecoder : public OggDecoder, void reusePacket( OggTheoraFrame* packet ) { mFreePackets.pushBack( packet ); } // OggDecoder. - virtual const char* getName() const { return "Theora"; } + const char* getName() const override { return "Theora"; } // IInputStream. - virtual U32 read( OggTheoraFrame** buffer, U32 num ); + U32 read( OggTheoraFrame** buffer, U32 num ) override; }; #endif // !_OGGTHEORADECODER_H_ diff --git a/Engine/source/core/ogg/oggVorbisDecoder.h b/Engine/source/core/ogg/oggVorbisDecoder.h index 20ca6c65a..3319cd3be 100644 --- a/Engine/source/core/ogg/oggVorbisDecoder.h +++ b/Engine/source/core/ogg/oggVorbisDecoder.h @@ -64,9 +64,9 @@ class OggVorbisDecoder : public OggDecoder, #endif // OggDecoder. - virtual bool _detect( ogg_page* startPage ); - virtual bool _init(); - virtual bool _packetin( ogg_packet* packet ); + bool _detect( ogg_page* startPage ) override; + bool _init() override; + bool _packetin( ogg_packet* packet ) override; public: @@ -82,10 +82,10 @@ class OggVorbisDecoder : public OggDecoder, U32 getSamplesPerSecond() const { return mVorbisInfo.rate; } // OggDecoder. - virtual const char* getName() const { return "Vorbis"; } + const char* getName() const override { return "Vorbis"; } // IInputStream. - virtual U32 read( RawData** buffer, U32 num ); + U32 read( RawData** buffer, U32 num ) override; }; #endif // !_OGGVORBISDECODER_H_ diff --git a/Engine/source/core/resizeStream.h b/Engine/source/core/resizeStream.h index 38875eeff..c925921c5 100644 --- a/Engine/source/core/resizeStream.h +++ b/Engine/source/core/resizeStream.h @@ -45,25 +45,25 @@ class ResizeFilterStream : public FilterStream, public IStreamByteCount ResizeFilterStream(); ~ResizeFilterStream(); - bool attachStream(Stream* io_pSlaveStream); - void detachStream(); - Stream* getStream(); + bool attachStream(Stream* io_pSlaveStream) override; + void detachStream() override; + Stream* getStream() override; bool setStreamOffset(const U32 in_startOffset, const U32 in_streamLen); // Mandatory overrides. protected: - bool _read(const U32 in_numBytes, void* out_pBuffer); + bool _read(const U32 in_numBytes, void* out_pBuffer) override; public: - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; - U32 getStreamSize(); + U32 getStreamSize() override; // IStreamByteCount - U32 getLastBytesRead() { return m_lastBytesRead; } - U32 getLastBytesWritten() { return 0; } + U32 getLastBytesRead() override { return m_lastBytesRead; } + U32 getLastBytesWritten() override { return 0; } }; #endif //_RESIZESTREAM_H_ diff --git a/Engine/source/core/resource.h b/Engine/source/core/resource.h index 8b8ef85e6..04334e981 100644 --- a/Engine/source/core/resource.h +++ b/Engine/source/core/resource.h @@ -131,7 +131,7 @@ protected: void *getResource() const { return (mResource ? mResource->getResource() : NULL); } U32 getChecksum() const; - virtual void destroySelf(); + void destroySelf() override; private: @@ -264,22 +264,22 @@ private: T *getResource() { return (T*)mResourceHeader->getResource(); } const T *getResource() const { return (T*)mResourceHeader->getResource(); } - Signature getSignature() const { return Resource::signature(); } + Signature getSignature() const override { return Resource::signature(); } - ResourceHolderBase *createHolder(void *); + ResourceHolderBase *createHolder(void *) override; - Signal &getStaticLoadSignal() { return getLoadSignal(); } + Signal &getStaticLoadSignal() override { return getLoadSignal(); } static void _notifyUnload( const Torque::Path& path, void* resource ) { getUnloadSignal().trigger( path, ( T* ) resource ); } - virtual void _triggerPostLoadSignal() { getPostLoadSignal().trigger( *this ); } - virtual NotifyUnloadFn _getNotifyUnloadFn() { return ( NotifyUnloadFn ) &_notifyUnload; } + void _triggerPostLoadSignal() override { getPostLoadSignal().trigger( *this ); } + NotifyUnloadFn _getNotifyUnloadFn() override { return ( NotifyUnloadFn ) &_notifyUnload; } // These are to be define by instantiated resources // No generic version is provided...however, since // base resources are instantiated by resource manager, // these are not pure virtuals if undefined (but will assert)... - void *create(const Torque::Path &path); + void *create(const Torque::Path &path) override; }; diff --git a/Engine/source/core/stream/bitStream.h b/Engine/source/core/stream/bitStream.h index bd81f3b1b..dc2107519 100644 --- a/Engine/source/core/stream/bitStream.h +++ b/Engine/source/core/stream/bitStream.h @@ -249,16 +249,16 @@ public: bool isFull() { return bitNum > (bufSize << 3); } bool isValid() { return !error; } - bool _read (const U32 size,void* d); - bool _write(const U32 size,const void* d); + bool _read (const U32 size,void* d) override; + bool _write(const U32 size,const void* d) override; - void readString(char stringBuf[256]); - void writeString(const char *stringBuf, S32 maxLen=255); + void readString(char stringBuf[256]) override; + void writeString(const char *stringBuf, S32 maxLen=255) override; - bool hasCapability(const Capability) const { return true; } - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); - U32 getStreamSize(); + bool hasCapability(const Capability) const override { return true; } + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; + U32 getStreamSize() override; S32 getMaxWriteBitNum() const { return maxWriteBitNum; } }; @@ -295,13 +295,13 @@ public: /// Write us out to a stream... Results in last byte getting padded! void writeToStream(Stream &s); - virtual void writeBits(S32 bitCount, const void *bitPtr) + void writeBits(S32 bitCount, const void *bitPtr) override { validate((bitCount >> 3) + 1); // Add a little safety. BitStream::writeBits(bitCount, bitPtr); } - virtual bool writeFlag(bool val) + bool writeFlag(bool val) override { validate(1); // One bit will at most grow our buffer by a byte. return BitStream::writeFlag(val); diff --git a/Engine/source/core/stream/fileStream.h b/Engine/source/core/stream/fileStream.h index fe7218b9d..9ae20798a 100644 --- a/Engine/source/core/stream/fileStream.h +++ b/Engine/source/core/stream/fileStream.h @@ -50,11 +50,11 @@ public: static FileStream *createAndOpen(const String &inFileName, Torque::FS::File::AccessMode inMode); // mandatory methods from Stream base class... - virtual bool hasCapability(const Capability i_cap) const; + bool hasCapability(const Capability i_cap) const override; - virtual U32 getPosition() const; - virtual bool setPosition(const U32 i_newPosition); - virtual U32 getStreamSize(); + U32 getPosition() const override; + bool setPosition(const U32 i_newPosition) override; + U32 getStreamSize() override; // additional methods needed for a file stream... virtual bool open(const String &inFileName, Torque::FS::File::AccessMode inMode); @@ -63,12 +63,12 @@ public: bool flush(); //rjson compatibility bool Flush() { return flush(); } - FileStream* clone() const; + FileStream* clone() const override; protected: // more mandatory methods from Stream base class... - virtual bool _read(const U32 i_numBytes, void *o_pBuffer); - virtual bool _write(const U32 i_numBytes, const void* i_pBuffer); + bool _read(const U32 i_numBytes, void *o_pBuffer) override; + bool _write(const U32 i_numBytes, const void* i_pBuffer) override; void init(); bool fillBuffer(const U32 i_startPosition); diff --git a/Engine/source/core/stream/fileStreamObject.h b/Engine/source/core/stream/fileStreamObject.h index 5063da3e2..2db6c9348 100644 --- a/Engine/source/core/stream/fileStreamObject.h +++ b/Engine/source/core/stream/fileStreamObject.h @@ -44,7 +44,7 @@ public: virtual ~FileStreamObject(); DECLARE_CONOBJECT(FileStreamObject); - virtual bool onAdd(); + bool onAdd() override; //----------------------------------------------------------------------------- /// @brief Open a file diff --git a/Engine/source/core/stream/memStream.h b/Engine/source/core/stream/memStream.h index 538c8d93e..9cb99a5a5 100644 --- a/Engine/source/core/stream/memStream.h +++ b/Engine/source/core/stream/memStream.h @@ -81,16 +81,16 @@ class MemStream : public Stream protected: // Stream - bool _read( const U32 in_numBytes, void *out_pBuffer ); - bool _write( const U32 in_numBytes, const void *in_pBuffer ); + bool _read( const U32 in_numBytes, void *out_pBuffer ) override; + bool _write( const U32 in_numBytes, const void *in_pBuffer ) override; public: // Stream - bool hasCapability( const Capability caps ) const; - U32 getPosition() const; - bool setPosition( const U32 in_newPosition ); - U32 getStreamSize(); + bool hasCapability( const Capability caps ) const override; + U32 getPosition() const override; + bool setPosition( const U32 in_newPosition ) override; + U32 getStreamSize() override; /// Returns the memory buffer. void *getBuffer() { return mBufferBase; } diff --git a/Engine/source/core/stream/streamObject.h b/Engine/source/core/stream/streamObject.h index b70fa236b..be5c1d69a 100644 --- a/Engine/source/core/stream/streamObject.h +++ b/Engine/source/core/stream/streamObject.h @@ -53,7 +53,7 @@ public: DECLARE_CONOBJECT(StreamObject); - virtual bool onAdd(); + bool onAdd() override; /// Set the stream to allow reuse of the object void setStream(Stream *stream) { mStream = stream; } diff --git a/Engine/source/core/threadStatic.h b/Engine/source/core/threadStatic.h index 830ba260c..29d63731e 100644 --- a/Engine/source/core/threadStatic.h +++ b/Engine/source/core/threadStatic.h @@ -143,8 +143,8 @@ private: public: TorqueThreadStatic( T instanceVal ) : mInstance( instanceVal ) {} - virtual void *getMemInstPtr() { return &mInstance; } - virtual const void *getConstMemInstPtr() const { return &mInstance; } + void *getMemInstPtr() override { return &mInstance; } + const void *getConstMemInstPtr() const override { return &mInstance; } // I am not sure these are needed, and I don't want to create confusing-to-debug code #if 0 diff --git a/Engine/source/core/util/dxt5nmSwizzle.h b/Engine/source/core/util/dxt5nmSwizzle.h index 58acbac66..26ce6ccc8 100644 --- a/Engine/source/core/util/dxt5nmSwizzle.h +++ b/Engine/source/core/util/dxt5nmSwizzle.h @@ -31,7 +31,7 @@ class DXT5nmSwizzle : public Swizzle public: DXT5nmSwizzle() : Swizzle( NULL ) {}; - virtual void InPlace( void *memory, const dsize_t size ) const + void InPlace( void *memory, const dsize_t size ) const override { AssertFatal( size % 4 == 0, "Bad buffer size for DXT5nm Swizzle" ); @@ -50,7 +50,7 @@ public: } } - virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const + void ToBuffer( void *destination, const void *source, const dsize_t size ) const override { AssertFatal( size % 4 == 0, "Bad buffer size for DXT5nm Swizzle" ); @@ -77,12 +77,12 @@ class DXT5nmSwizzleUp24t32 : public Swizzle public: DXT5nmSwizzleUp24t32() : Swizzle( NULL ) {}; - virtual void InPlace( void *memory, const dsize_t size ) const + void InPlace( void *memory, const dsize_t size ) const override { AssertISV( false, "Cannot swizzle in place a 24->32 bit swizzle." ); } - virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const + void ToBuffer( void *destination, const void *source, const dsize_t size ) const override { AssertFatal( size % 3 == 0, "Bad buffer size for DXT5nm Swizzle" ); const S32 pixels = size / 3; diff --git a/Engine/source/core/util/journal/journal.h b/Engine/source/core/util/journal/journal.h index cc1b2c921..6f64648ca 100644 --- a/Engine/source/core/util/journal/journal.h +++ b/Engine/source/core/util/journal/journal.h @@ -69,8 +69,8 @@ class Journal typedef void(*FuncPtr)(); FuncPtr ptr; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) {} - void dispatch() { (*ptr)(); } + void read(Stream *file) override {} + void dispatch() override { (*ptr)(); } }; template @@ -78,8 +78,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H,I,J,K,L,M); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; L l; M m; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l,m); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h,i,j,k,l,m); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l,m); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h,i,j,k,l,m); } }; template @@ -87,8 +87,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H,I,J,K,L); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; L l; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h,i,j,k,l); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h,i,j,k,l); } }; template @@ -96,8 +96,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H,I,J,K); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h,i,j,k); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h,i,j,k); } }; template @@ -105,8 +105,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H,I,J); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h,i,j); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h,i,j); } }; template @@ -114,8 +114,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H,I); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; I i; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h,i); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h,i); } }; template @@ -123,8 +123,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G,H); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; H h; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g,h); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g,h); } }; template @@ -132,8 +132,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F,G); FuncPtr ptr; A a; B b; C c; D d; E e; F f; G g; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g); } - void dispatch() { (*ptr)(a,b,c,d,e,f,g); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g); } + void dispatch() override { (*ptr)(a,b,c,d,e,f,g); } }; template @@ -141,8 +141,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E,F); FuncPtr ptr; A a; B b; C c; D d; E e; F f; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f); } - void dispatch() { (*ptr)(a,b,c,d,e,f); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f); } + void dispatch() override { (*ptr)(a,b,c,d,e,f); } }; template @@ -150,8 +150,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D,E); FuncPtr ptr; A a; B b; C c; D d; E e; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e); } - void dispatch() { (*ptr)(a,b,c,d,e); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e); } + void dispatch() override { (*ptr)(a,b,c,d,e); } }; template @@ -159,8 +159,8 @@ class Journal typedef void(*FuncPtr)(A,B,C,D); FuncPtr ptr; A a; B b; C c; D d; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d); } - void dispatch() { (*ptr)(a,b,c,d); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d); } + void dispatch() override { (*ptr)(a,b,c,d); } }; template @@ -168,8 +168,8 @@ class Journal typedef void(*FuncPtr)(A,B,C); FuncPtr ptr; A a; B b; C c; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c); } - void dispatch() { (*ptr)(a,b,c); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c); } + void dispatch() override { (*ptr)(a,b,c); } }; template @@ -177,8 +177,8 @@ class Journal typedef void(*FuncPtr)(A,B); FuncPtr ptr; A a; B b; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b); } - void dispatch() { (*ptr)(a,b); } + void read(Stream *file) override { IOHelper::reads(file,a,b); } + void dispatch() override { (*ptr)(a,b); } }; template @@ -186,8 +186,8 @@ class Journal typedef void(*FuncPtr)(A); FuncPtr ptr; A a; FunctorDecl(FuncPtr p): ptr(p) {} - void read(Stream *file) { IOHelper::reads(file,a); } - void dispatch() { (*ptr)(a); } + void read(Stream *file) override { IOHelper::reads(file,a); } + void dispatch() override { (*ptr)(a); } }; // Multiple argument object member function functor specialization @@ -197,8 +197,8 @@ class Journal typedef U MethodPtr; ObjPtr obj; MethodPtr method; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) {} - void dispatch() { (obj->*method)(); } + void read(Stream *file) override {} + void dispatch() override { (obj->*method)(); } }; template @@ -207,8 +207,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H,I,J,K,L,M); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; L l; M m; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l,m); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k,l,m); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l,m); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k,l,m); } }; template @@ -217,8 +217,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H,I,J,K,L); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; L l; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k,l); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k,l); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k,l); } }; template @@ -227,8 +227,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H,I,J,K); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; K k; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j,k); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h,i,j,k); } }; template @@ -237,8 +237,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H,I,J); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; I i; J j; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h,i,j); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i,j); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h,i,j); } }; template @@ -247,8 +247,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H,I); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; I i; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h,i); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h,i); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h,i); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h,i); } }; template @@ -257,8 +257,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G,H); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; H h; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g,h); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g,h); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g,h); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g,h); } }; template @@ -267,8 +267,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F,G); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; G g; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f,g); } - void dispatch() { (obj->*method)(a,b,c,d,e,f,g); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f,g); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f,g); } }; template @@ -277,8 +277,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E,F); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; F f; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e,f); } - void dispatch() { (obj->*method)(a,b,c,d,e,f); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e,f); } + void dispatch() override { (obj->*method)(a,b,c,d,e,f); } }; template @@ -287,8 +287,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D,E); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; E e; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d,e); } - void dispatch() { (obj->*method)(a,b,c,d,e); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d,e); } + void dispatch() override { (obj->*method)(a,b,c,d,e); } }; template @@ -297,8 +297,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C,D); ObjPtr obj; MethodPtr method; A a; B b; C c; D d; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c,d); } - void dispatch() { (obj->*method)(a,b,c,d); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c,d); } + void dispatch() override { (obj->*method)(a,b,c,d); } }; template @@ -307,8 +307,8 @@ class Journal typedef void(T::*MethodPtr)(A,B,C); ObjPtr obj; MethodPtr method; A a; B b; C c; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b,c); } - void dispatch() { (obj->*method)(a,b,c); } + void read(Stream *file) override { IOHelper::reads(file,a,b,c); } + void dispatch() override { (obj->*method)(a,b,c); } }; template @@ -317,8 +317,8 @@ class Journal typedef void(T::*MethodPtr)(A,B); ObjPtr obj; MethodPtr method; A a; B b; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a,b); } - void dispatch() { (obj->*method)(a,b); } + void read(Stream *file) override { IOHelper::reads(file,a,b); } + void dispatch() override { (obj->*method)(a,b); } }; template @@ -327,8 +327,8 @@ class Journal typedef void(T::*MethodPtr)(A); ObjPtr obj; MethodPtr method; A a; MethodDecl(ObjPtr o,MethodPtr p): obj(o), method(p) {} - void read(Stream *file) { IOHelper::reads(file,a); } - void dispatch() { (obj->*method)(a); } + void read(Stream *file) override { IOHelper::reads(file,a); } + void dispatch() override { (obj->*method)(a); } }; // Function declarations @@ -344,20 +344,20 @@ class Journal template struct FuncRep: public FuncDecl { typename T::FuncPtr function; - virtual bool match(VoidPtr ptr,VoidMethod) const { + bool match(VoidPtr ptr,VoidMethod) const override { return function == (typename T::FuncPtr)ptr; } - T* create() const { return new T(function); }; + T* create() const override { return new T(function); }; }; template struct MethodRep: public FuncDecl { typename T::ObjPtr obj = NULL; typename T::MethodPtr method = NULL; - virtual bool match(VoidPtr ptr,VoidMethod func) const { + bool match(VoidPtr ptr,VoidMethod func) const override { return obj == (typename T::ObjPtr)ptr && method == (typename T::MethodPtr)func; } - T* create() const { return new T(obj,method); }; + T* create() const override { return new T(obj,method); }; }; static FuncDecl* _FunctionList; diff --git a/Engine/source/core/util/swizzle.h b/Engine/source/core/util/swizzle.h index f8038f624..1c3d723a7 100644 --- a/Engine/source/core/util/swizzle.h +++ b/Engine/source/core/util/swizzle.h @@ -81,9 +81,9 @@ class NullSwizzle : public Swizzle public: NullSwizzle( const dsize_t *map = NULL ) : Swizzle( map ) {}; - virtual void InPlace( void *memory, const dsize_t size ) const {} + void InPlace( void *memory, const dsize_t size ) const override {} - virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const + void ToBuffer( void *destination, const void *source, const dsize_t size ) const override { dMemcpy( destination, source, size ); } diff --git a/Engine/source/core/util/tSignal.h b/Engine/source/core/util/tSignal.h index 4bf3e16b3..0d3781569 100644 --- a/Engine/source/core/util/tSignal.h +++ b/Engine/source/core/util/tSignal.h @@ -285,7 +285,7 @@ protected: struct SlotLinkImpl : public DelegateLinkImpl { - SlotLinkImpl(SignalSlot& slot) : mSlot( &slot ), DelegateLinkImpl( slot.getDelegate() ) + SlotLinkImpl(SignalSlot& slot) : DelegateLinkImpl( slot.getDelegate() ), mSlot( &slot ) { } diff --git a/Engine/source/core/util/timeSource.h b/Engine/source/core/util/timeSource.h index 9c1a3ca89..991a6aa50 100644 --- a/Engine/source/core/util/timeSource.h +++ b/Engine/source/core/util/timeSource.h @@ -106,7 +106,7 @@ class GenericTimeSource : public IPositionable< Tick >, /// Return the number of ticks since the time source /// has been started. - TickType getPosition() const + TickType getPosition() const override { if( !isStarted() ) return TypeTraits< TickType >::ZERO; @@ -117,7 +117,7 @@ class GenericTimeSource : public IPositionable< Tick >, } /// - void setPosition( TickType pos ) + void setPosition( TickType pos ) override { if( !isStarted() ) mStartTime = pos; @@ -132,14 +132,14 @@ class GenericTimeSource : public IPositionable< Tick >, } // IResettable. - virtual void reset() + void reset() override { mStartTime = TypeTraits< TickType >::MAX; mPauseTime = TypeTraits< TickType >::MAX; } // IProcess. - virtual void start() + void start() override { if( !isStarted() ) { @@ -154,11 +154,11 @@ class GenericTimeSource : public IPositionable< Tick >, mStartTime = now; } } - virtual void stop() + void stop() override { reset(); } - virtual void pause() + void pause() override { if( !isPaused() ) mPauseTime = mTimer.getTick(); diff --git a/Engine/source/core/util/zip/centralDir.h b/Engine/source/core/util/zip/centralDir.h index 4f582b206..e679c67af 100644 --- a/Engine/source/core/util/zip/centralDir.h +++ b/Engine/source/core/util/zip/centralDir.h @@ -65,8 +65,8 @@ public: CentralDir(FileHeader &fh); virtual ~CentralDir(); - virtual bool read(Stream *stream); - virtual bool write(Stream *stream); + bool read(Stream *stream) override; + bool write(Stream *stream) override; void setFileComment(const char *comment); }; diff --git a/Engine/source/core/util/zip/zipCryptStream.h b/Engine/source/core/util/zip/zipCryptStream.h index dcdae35fa..88694b1b1 100644 --- a/Engine/source/core/util/zip/zipCryptStream.h +++ b/Engine/source/core/util/zip/zipCryptStream.h @@ -51,15 +51,15 @@ public: inline void setFileEndPos(S32 pos) { mFileEndPos = pos; } // Overrides of FilterStream - bool attachStream(Stream* io_pSlaveStream); - void detachStream(); - Stream *getStream() { return mStream; } + bool attachStream(Stream* io_pSlaveStream) override; + void detachStream() override; + Stream *getStream() override { return mStream; } - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; protected: - bool _read(const U32 in_numBytes, void* out_pBuffer); + bool _read(const U32 in_numBytes, void* out_pBuffer) override; void updateKeys(const U8 c); U8 decryptByte(); diff --git a/Engine/source/core/util/zip/zipStatFilter.h b/Engine/source/core/util/zip/zipStatFilter.h index 17d377c61..e37184e1a 100644 --- a/Engine/source/core/util/zip/zipStatFilter.h +++ b/Engine/source/core/util/zip/zipStatFilter.h @@ -109,7 +109,7 @@ protected: CentralDir *mCD; - virtual bool _write(const U32 numBytes, const void *buffer) + bool _write(const U32 numBytes, const void *buffer) override { if(! mStream->write(numBytes, buffer)) return false; @@ -120,7 +120,7 @@ protected: return true; } - virtual bool _read(const U32 numBytes, void *buffer) + bool _read(const U32 numBytes, void *buffer) override { if(! mStream->read(numBytes, buffer)) return false; @@ -139,7 +139,7 @@ public: detachStream(); } - virtual bool attachStream(Stream *stream) + bool attachStream(Stream *stream) override { if(mCD == NULL) return false; @@ -150,7 +150,7 @@ public: return true; } - virtual void detachStream() + void detachStream() override { if(mStream == NULL) return; @@ -160,7 +160,7 @@ public: mStream = NULL; } - virtual Stream *getStream() { return mStream; } + Stream *getStream() override { return mStream; } void setCentralDir(CentralDir *cd) { mCD = cd; } CentralDir *getCentralDir() { return mCD; } diff --git a/Engine/source/core/util/zip/zipSubStream.h b/Engine/source/core/util/zip/zipSubStream.h index db672b1dd..395d9960f 100644 --- a/Engine/source/core/util/zip/zipSubStream.h +++ b/Engine/source/core/util/zip/zipSubStream.h @@ -47,8 +47,8 @@ class ZipSubRStream : public FilterStream, public IStreamByteCount U32 fillBuffer(const U32 in_attemptSize); public: - virtual U32 getLastBytesRead() { return m_lastBytesRead; } - virtual U32 getLastBytesWritten() { return 0; } + U32 getLastBytesRead() override { return m_lastBytesRead; } + U32 getLastBytesWritten() override { return 0; } public: @@ -57,23 +57,23 @@ public: // Overrides of NFilterStream public: - bool attachStream(Stream* io_pSlaveStream); - void detachStream(); - Stream* getStream(); + bool attachStream(Stream* io_pSlaveStream) override; + void detachStream() override; + Stream* getStream() override; void setUncompressedSize(const U32); // Mandatory overrides. By default, these are simply passed to // whatever is returned from getStream(); protected: - bool _read(const U32 in_numBytes, void* out_pBuffer); + bool _read(const U32 in_numBytes, void* out_pBuffer) override; public: - bool hasCapability(const Capability) const; + bool hasCapability(const Capability) const override; - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; - U32 getStreamSize(); + U32 getStreamSize() override; }; class ZipSubWStream : public FilterStream, public IStreamByteCount @@ -91,8 +91,8 @@ class ZipSubWStream : public FilterStream, public IStreamByteCount U32 m_lastBytesWritten; public: - virtual U32 getLastBytesRead() { return m_lastBytesRead; } - virtual U32 getLastBytesWritten() { return m_lastBytesWritten; } + U32 getLastBytesRead() override { return m_lastBytesRead; } + U32 getLastBytesWritten() override { return m_lastBytesWritten; } public: ZipSubWStream(); @@ -100,22 +100,22 @@ public: // Overrides of NFilterStream public: - bool attachStream(Stream* io_pSlaveStream); - void detachStream(); - Stream* getStream(); + bool attachStream(Stream* io_pSlaveStream) override; + void detachStream() override; + Stream* getStream() override; // Mandatory overrides. By default, these are simply passed to // whatever is returned from getStream(); protected: - bool _read(const U32 in_numBytes, void* out_pBuffer); - bool _write(const U32 in_numBytes, const void* in_pBuffer); + bool _read(const U32 in_numBytes, void* out_pBuffer) override; + bool _write(const U32 in_numBytes, const void* in_pBuffer) override; public: - bool hasCapability(const Capability) const; + bool hasCapability(const Capability) const override; - U32 getPosition() const; - bool setPosition(const U32 in_newPosition); + U32 getPosition() const override; + bool setPosition(const U32 in_newPosition) override; - U32 getStreamSize(); + U32 getStreamSize() override; }; #endif //_ZIPSUBSTREAM_H_ diff --git a/Engine/source/core/util/zip/zipTempStream.h b/Engine/source/core/util/zip/zipTempStream.h index 7efcb141b..ca1771075 100644 --- a/Engine/source/core/util/zip/zipTempStream.h +++ b/Engine/source/core/util/zip/zipTempStream.h @@ -60,7 +60,7 @@ public: return open(String(), Torque::FS::File::ReadWrite); } - virtual void close() + void close() override { Parent::close(); @@ -70,7 +70,7 @@ public: } /// Disallow setPosition() - virtual bool setPosition(const U32 i_newPosition) { return false; } + bool setPosition(const U32 i_newPosition) override { return false; } /// Seek back to the start of the file. /// This is used internally by the zip code and should never be called whilst diff --git a/Engine/source/core/util/zip/zipVolume.cpp b/Engine/source/core/util/zip/zipVolume.cpp index 6fe6edb37..80fa81dcd 100644 --- a/Engine/source/core/util/zip/zipVolume.cpp +++ b/Engine/source/core/util/zip/zipVolume.cpp @@ -54,8 +54,8 @@ public: close(); } - virtual Path getName() const { return mZipFilename; } - virtual NodeStatus getStatus() const + Path getName() const override { return mZipFilename; } + NodeStatus getStatus() const override { if (mZipStream) { @@ -76,7 +76,7 @@ public: return FileNode::Closed; } - virtual bool getAttributes(Attributes* attr) + bool getAttributes(Attributes* attr) override { if (!attr) return false; @@ -92,7 +92,7 @@ public: return true; } - virtual U32 getPosition() + U32 getPosition() override { if (mZipStream) return mZipStream->getPosition(); @@ -100,7 +100,7 @@ public: return 0; } - virtual U32 setPosition(U32 pos, SeekMode mode) + U32 setPosition(U32 pos, SeekMode mode) override { if (!mZipStream || mode != Begin) return 0; @@ -108,7 +108,7 @@ public: return mZipStream->setPosition(pos); } - virtual bool open(AccessMode mode) + bool open(AccessMode mode) override { // stream is already open so just check to make sure that they are using a valid mode if (mode == Read) @@ -120,7 +120,7 @@ public: } } - virtual bool close() + bool close() override { if (mZipStream != NULL && mArchive != NULL) { @@ -131,7 +131,7 @@ public: return true; } - virtual U32 read(void* dst, U32 size) + U32 read(void* dst, U32 size) override { if (mZipStream && mZipStream->read(size, dst) && mByteCount) return mByteCount->getLastBytesRead(); @@ -139,7 +139,7 @@ public: return 0; } - virtual U32 write(const void* src, U32 size) + U32 write(const void* src, U32 size) override { if (mZipStream && mZipStream->write(size, src) && mByteCount) return mByteCount->getLastBytesWritten(); @@ -148,7 +148,7 @@ public: } protected: - virtual U32 calculateChecksum() + U32 calculateChecksum() override { // JMQ: implement return 0; @@ -180,15 +180,15 @@ public: { } - Torque::Path getName() const { return mPath; } + Torque::Path getName() const override { return mPath; } // getStatus() doesn't appear to be used for directories - NodeStatus getStatus() const + NodeStatus getStatus() const override { return FileNode::Open; } - bool getAttributes(Attributes* attr) + bool getAttributes(Attributes* attr) override { if (!attr) return false; @@ -204,20 +204,20 @@ public: return true; } - bool open() + bool open() override { // reset iterator if (mZipEntry) mChildIter = mZipEntry->mChildren.begin(); return (mZipEntry != NULL && mArchive.getPointer() != NULL); } - bool close() + bool close() override { if (mZipEntry) mChildIter = mZipEntry->mChildren.end(); return true; } - bool read(Attributes* attr) + bool read(Attributes* attr) override { if (!attr) return false; @@ -244,7 +244,7 @@ public: } private: - U32 calculateChecksum() + U32 calculateChecksum() override { return 0; } @@ -273,15 +273,15 @@ public: { } - Torque::Path getName() const { return mPath; } + Torque::Path getName() const override { return mPath; } // getStatus() doesn't appear to be used for directories - NodeStatus getStatus() const + NodeStatus getStatus() const override { return FileNode::Open; } - bool getAttributes(Attributes* attr) + bool getAttributes(Attributes* attr) override { if (!attr) return false; @@ -299,17 +299,17 @@ public: return true; } - bool open() + bool open() override { mRead = false; return (mArchive.getPointer() != NULL); } - bool close() + bool close() override { mRead = false; return true; } - bool read(Attributes* attr) + bool read(Attributes* attr) override { if (!attr) return false; @@ -336,7 +336,7 @@ public: } private: - U32 calculateChecksum() + U32 calculateChecksum() override { return 0; } diff --git a/Engine/source/core/util/zip/zipVolume.h b/Engine/source/core/util/zip/zipVolume.h index db1a7faab..99c2cc089 100644 --- a/Engine/source/core/util/zip/zipVolume.h +++ b/Engine/source/core/util/zip/zipVolume.h @@ -38,25 +38,25 @@ public: ZipFileSystem(String& zipFilename, bool zipNameIsDir = false); virtual ~ZipFileSystem(); - String getTypeStr() const { return "Zip"; } + String getTypeStr() const override { return "Zip"; } // Strict resolve function will reteurn a node if it is mounted *AS* the requested path. - FileNodeRef resolve(const Path& path); + FileNodeRef resolve(const Path& path) override; // Loose resolve function will return a node if it is mounted as or under the requested path. // This is needed so mounted subdirectories will be included in recursive FindByPatern searches. // i.e. If data/ui.zip is mounted as data/ui, a search for data/*.module will only include files // under data/ui if the loose resolve function is used. - FileNodeRef resolveLoose(const Path& path); + FileNodeRef resolveLoose(const Path& path) override; // these are unsupported, ZipFileSystem is currently read only access - FileNodeRef create(const Path& path,FileNode::Mode) { return 0; } - bool remove(const Path& path) { return 0; } - bool rename(const Path& a,const Path& b) { return 0; } + FileNodeRef create(const Path& path,FileNode::Mode) override { return 0; } + bool remove(const Path& path) override { return 0; } + bool rename(const Path& a,const Path& b) override { return 0; } // these are unsupported - Path mapTo(const Path& path) { return path; } - Path mapFrom(const Path& path) { return path; } + Path mapTo(const Path& path) override { return path; } + Path mapFrom(const Path& path) override { return path; } public: /// Private interface for use by unit test only. diff --git a/Engine/source/core/virtualMountSystem.h b/Engine/source/core/virtualMountSystem.h index 875e68993..14824a886 100644 --- a/Engine/source/core/virtualMountSystem.h +++ b/Engine/source/core/virtualMountSystem.h @@ -55,17 +55,17 @@ namespace FS VirtualMountSystem() : mUseParentFind(false) {} virtual ~VirtualMountSystem() { } - virtual bool mount(String root, FileSystemRef fs); - virtual bool mount(String root, const Path &path); - virtual FileSystemRef unmount(String root); - virtual bool unmount(FileSystemRef fs); - virtual S32 findByPattern( const Path &inBasePath, const String &inFilePattern, bool inRecursive, Vector &outList, bool includeDirs=false, bool multiMatch = true ); - virtual bool createPath(const Path& path); + bool mount(String root, FileSystemRef fs) override; + bool mount(String root, const Path &path) override; + FileSystemRef unmount(String root) override; + bool unmount(FileSystemRef fs) override; + S32 findByPattern( const Path &inBasePath, const String &inFilePattern, bool inRecursive, Vector &outList, bool includeDirs=false, bool multiMatch = true ) override; + bool createPath(const Path& path) override; protected: - virtual void _log(const String& msg); - virtual FileSystemRef _removeMountFromList(String root); - virtual FileSystemRef _getFileSystemFromList(const Path& path) const ; + void _log(const String& msg) override; + FileSystemRef _removeMountFromList(String root) override; + FileSystemRef _getFileSystemFromList(const Path& path) const override ; // Vector of file system refs typedef Vector RootToFSVec; diff --git a/Engine/source/core/volume.cpp b/Engine/source/core/volume.cpp index 6d2e4cab7..1a8ecbfb1 100644 --- a/Engine/source/core/volume.cpp +++ b/Engine/source/core/volume.cpp @@ -384,14 +384,14 @@ class FileSystemRedirect: public FileSystem public: FileSystemRedirect(MountSystem* mfs,const Path& path); - String getTypeStr() const { return "Redirect"; } + String getTypeStr() const override { return "Redirect"; } - FileNodeRef resolve(const Path& path); - FileNodeRef create(const Path& path,FileNode::Mode); - bool remove(const Path& path); - bool rename(const Path& a,const Path& b); - Path mapTo(const Path& path); - Path mapFrom(const Path& path); + FileNodeRef resolve(const Path& path) override; + FileNodeRef create(const Path& path,FileNode::Mode) override; + bool remove(const Path& path) override; + bool rename(const Path& a,const Path& b) override; + Path mapTo(const Path& path) override; + Path mapFrom(const Path& path) override; private: Path _merge(const Path& path); @@ -406,14 +406,14 @@ public: FileSystemRedirectChangeNotifier( FileSystem *fs ); - bool addNotification( const Path &path, ChangeDelegate callback ); - bool removeNotification( const Path &path, ChangeDelegate callback ); + bool addNotification( const Path &path, ChangeDelegate callback ) override; + bool removeNotification( const Path &path, ChangeDelegate callback ) override; protected: - virtual void internalProcessOnce() {} - virtual bool internalAddNotification( const Path &dir ) { return false; } - virtual bool internalRemoveNotification( const Path &dir ) { return false; } + void internalProcessOnce() override {} + bool internalAddNotification( const Path &dir ) override { return false; } + bool internalRemoveNotification( const Path &dir ) override { return false; } }; FileSystemRedirectChangeNotifier::FileSystemRedirectChangeNotifier( FileSystem *fs ) diff --git a/Engine/source/environment/VolumetricFog.h b/Engine/source/environment/VolumetricFog.h index c9206a5dc..a85ef1665 100644 --- a/Engine/source/environment/VolumetricFog.h +++ b/Engine/source/environment/VolumetricFog.h @@ -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); diff --git a/Engine/source/environment/VolumetricFogRTManager.h b/Engine/source/environment/VolumetricFogRTManager.h index d4b2bcbd4..021fd66f9 100644 --- a/Engine/source/environment/VolumetricFogRTManager.h +++ b/Engine/source/environment/VolumetricFogRTManager.h @@ -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; diff --git a/Engine/source/environment/basicClouds.h b/Engine/source/environment/basicClouds.h index 2e7468de8..982b9cf9c 100644 --- a/Engine/source/environment/basicClouds.h +++ b/Engine/source/environment/basicClouds.h @@ -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: diff --git a/Engine/source/environment/cloudLayer.h b/Engine/source/environment/cloudLayer.h index 3634dbfa8..ba8110c39 100644 --- a/Engine/source/environment/cloudLayer.h +++ b/Engine/source/environment/cloudLayer.h @@ -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() {} diff --git a/Engine/source/environment/decalRoad.cpp b/Engine/source/environment/decalRoad.cpp index 4ee7b98de..b5ba0c8d4 100644 --- a/Engine/source/environment/decalRoad.cpp +++ b/Engine/source/environment/decalRoad.cpp @@ -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 ) diff --git a/Engine/source/environment/decalRoad.h b/Engine/source/environment/decalRoad.h index f7759b447..f1aecf187 100644 --- a/Engine/source/environment/decalRoad.h +++ b/Engine/source/environment/decalRoad.h @@ -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 diff --git a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h index 497dd14f8..96098273c 100644 --- a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h +++ b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h @@ -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_ diff --git a/Engine/source/environment/editors/guiRiverEditorCtrl.h b/Engine/source/environment/editors/guiRiverEditorCtrl.h index a5dae237d..29938513c 100644 --- a/Engine/source/environment/editors/guiRiverEditorCtrl.h +++ b/Engine/source/environment/editors/guiRiverEditorCtrl.h @@ -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 diff --git a/Engine/source/environment/editors/guiRoadEditorCtrl.h b/Engine/source/environment/editors/guiRoadEditorCtrl.h index 9d2c5d014..39a109b84 100644 --- a/Engine/source/environment/editors/guiRoadEditorCtrl.h +++ b/Engine/source/environment/editors/guiRoadEditorCtrl.h @@ -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 diff --git a/Engine/source/environment/meshRoad.cpp b/Engine/source/environment/meshRoad.cpp index 5e8d42a6d..93593df7a 100644 --- a/Engine/source/environment/meshRoad.cpp +++ b/Engine/source/environment/meshRoad.cpp @@ -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 ) diff --git a/Engine/source/environment/meshRoad.h b/Engine/source/environment/meshRoad.h index abc3074b0..17747e83b 100644 --- a/Engine/source/environment/meshRoad.h +++ b/Engine/source/environment/meshRoad.h @@ -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(); diff --git a/Engine/source/environment/nodeListManager.h b/Engine/source/environment/nodeListManager.h index f6e46b23a..39f5fb232 100644 --- a/Engine/source/environment/nodeListManager.h +++ b/Engine/source/environment/nodeListManager.h @@ -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) { } diff --git a/Engine/source/environment/river.cpp b/Engine/source/environment/river.cpp index e5862710a..725f4a350 100644 --- a/Engine/source/environment/river.cpp +++ b/Engine/source/environment/river.cpp @@ -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 ) diff --git a/Engine/source/environment/river.h b/Engine/source/environment/river.h index f91217955..ded0e7e37 100644 --- a/Engine/source/environment/river.h +++ b/Engine/source/environment/river.h @@ -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 ¶mHandles ); - virtual void innerRender( SceneRenderState *state ); - virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ); + void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams ¶mHandles ) override; + void innerRender( SceneRenderState *state ) override; + void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override; protected: diff --git a/Engine/source/environment/scatterSky.h b/Engine/source/environment/scatterSky.h index 7f71183bb..aecfeab19 100644 --- a/Engine/source/environment/scatterSky.h +++ b/Engine/source/environment/scatterSky.h @@ -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: diff --git a/Engine/source/environment/skyBox.h b/Engine/source/environment/skyBox.h index 0daddb8a7..6a59f133c 100644 --- a/Engine/source/environment/skyBox.h +++ b/Engine/source/environment/skyBox.h @@ -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 ); diff --git a/Engine/source/environment/skySphere.h b/Engine/source/environment/skySphere.h index 9c50b9bfc..7aeebb5f1 100644 --- a/Engine/source/environment/skySphere.h +++ b/Engine/source/environment/skySphere.h @@ -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); diff --git a/Engine/source/environment/sun.h b/Engine/source/environment/sun.h index b87611a25..f47a5ecb9 100644 --- a/Engine/source/environment/sun.h +++ b/Engine/source/environment/sun.h @@ -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 ); diff --git a/Engine/source/environment/timeOfDay.h b/Engine/source/environment/timeOfDay.h index 94a48f14a..e4dfcc321 100644 --- a/Engine/source/environment/timeOfDay.h +++ b/Engine/source/environment/timeOfDay.h @@ -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; } diff --git a/Engine/source/environment/waterBlock.h b/Engine/source/environment/waterBlock.h index c052e242f..555a8a8a6 100644 --- a/Engine/source/environment/waterBlock.h +++ b/Engine/source/environment/waterBlock.h @@ -109,12 +109,12 @@ protected: //------------------------------------------------------- // Standard engine functions //------------------------------------------------------- - bool onAdd(); - void onRemove(); - U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); + 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); + bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override; public: WaterBlock(); @@ -123,31 +123,31 @@ public: DECLARE_CONOBJECT(WaterBlock); static void initPersistFields(); - void onStaticModified( const char* slotName, const char*newValue = NULL ); - virtual void inspectPostApply(); - virtual void setTransform( const MatrixF & mat ); - virtual void setScale( const Point3F &scale ); - 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; + void setScale( const Point3F &scale ) 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; - virtual bool isUnderwater( const Point3F &pnt ) const; + F32 getWaterCoverage( const Box3F &worldBox ) const override; + F32 getSurfaceHeight( const Point2F &pos ) const override; + bool isUnderwater( const Point3F &pnt ) const override; // WaterBlock bool isPointSubmerged ( const Point3F &pos, bool worldSpace = true ) const{ return true; } // SceneObject. - virtual F32 distanceTo( const Point3F& pos ) const; + F32 distanceTo( const Point3F& pos ) const override; protected: // WaterObject - virtual void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams ¶mHandles ); + void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams ¶mHandles ) override; virtual SceneData setupSceneGraphInfo( SceneRenderState *state ); - virtual void setupVBIB(); - virtual void innerRender( SceneRenderState *state ); - virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ); + void setupVBIB() override; + void innerRender( SceneRenderState *state ) override; + void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override; }; #endif // _WATERBLOCK_H_ diff --git a/Engine/source/environment/waterObject.h b/Engine/source/environment/waterObject.h index 4bdfbe021..09f3e1eaa 100644 --- a/Engine/source/environment/waterObject.h +++ b/Engine/source/environment/waterObject.h @@ -156,20 +156,20 @@ public: static void initPersistFields(); // SimObject - virtual bool onAdd(); - virtual void onRemove(); - virtual void inspectPostApply(); - virtual bool processArguments(S32 argc, ConsoleValue *argv); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; + bool processArguments(S32 argc, ConsoleValue *argv) 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; virtual void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ); - virtual SFXAmbience* getSoundAmbience() const { return mSoundAmbience; } - virtual bool containsPoint( const Point3F& point ) { return isUnderwater( point ); } + SFXAmbience* getSoundAmbience() const override { return mSoundAmbience; } + bool containsPoint( const Point3F& point ) override { return isUnderwater( point ); } // WaterObject virtual F32 getViscosity() const { return mViscosity; } diff --git a/Engine/source/environment/waterPlane.h b/Engine/source/environment/waterPlane.h index 682e34074..0f21166e0 100644 --- a/Engine/source/environment/waterPlane.h +++ b/Engine/source/environment/waterPlane.h @@ -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_ diff --git a/Engine/source/forest/editor/forestBrushElement.h b/Engine/source/forest/editor/forestBrushElement.h index 6a7d98973..a5b14650d 100644 --- a/Engine/source/forest/editor/forestBrushElement.h +++ b/Engine/source/forest/editor/forestBrushElement.h @@ -109,9 +109,9 @@ public: DECLARE_CONOBJECT( ForestBrush ); - virtual bool onAdd(); + bool onAdd() override; - virtual void addObject(SimObject*); + void addObject(SimObject*) override; static SimGroup* getGroup(); @@ -135,9 +135,9 @@ public: DECLARE_CONOBJECT(ForestBrushGroup); - virtual bool onAdd(); + bool onAdd() override; - virtual void addObject(SimObject*); + void addObject(SimObject*) override; bool containsBrushData(const ForestBrush* inData); protected: diff --git a/Engine/source/forest/editor/forestBrushTool.h b/Engine/source/forest/editor/forestBrushTool.h index 0debad616..9c41d1047 100644 --- a/Engine/source/forest/editor/forestBrushTool.h +++ b/Engine/source/forest/editor/forestBrushTool.h @@ -62,20 +62,20 @@ public: // SimObject DECLARE_CONOBJECT( ForestBrushTool ); static void initPersistFields(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // ForestTool - virtual void on3DMouseDown( const Gui3DMouseEvent &evt ); - virtual void on3DMouseUp( const Gui3DMouseEvent &evt ); - virtual void on3DMouseMove( const Gui3DMouseEvent &evt ); - virtual void on3DMouseDragged( const Gui3DMouseEvent &evt ); - virtual bool onMouseWheel(const GuiEvent &evt ); - virtual void onRender3D(); - virtual void onRender2D(); - virtual void onActivated( const Gui3DMouseEvent &lastEvent ); - virtual void onDeactivated(); - virtual bool updateGuiInfo(); + void on3DMouseDown( const Gui3DMouseEvent &evt ) override; + void on3DMouseUp( const Gui3DMouseEvent &evt ) override; + void on3DMouseMove( const Gui3DMouseEvent &evt ) override; + void on3DMouseDragged( const Gui3DMouseEvent &evt ) override; + bool onMouseWheel(const GuiEvent &evt ) override; + void onRender3D() override; + void onRender2D() override; + void onActivated( const Gui3DMouseEvent &lastEvent ) override; + void onDeactivated() override; + bool updateGuiInfo() override; // ForestBrushTool void setSize( F32 val ); @@ -139,7 +139,7 @@ class ForestBrushToolEvent : public SimEvent { public: - void process( SimObject *object ) + void process( SimObject *object ) override { ((ForestBrushTool*)object)->_onStroke(); } diff --git a/Engine/source/forest/editor/forestEditorCtrl.h b/Engine/source/forest/editor/forestEditorCtrl.h index b91310a58..d8fc6aae6 100644 --- a/Engine/source/forest/editor/forestEditorCtrl.h +++ b/Engine/source/forest/editor/forestEditorCtrl.h @@ -58,30 +58,30 @@ class ForestEditorCtrl : public EditTSCtrl DECLARE_CONOBJECT( ForestEditorCtrl ); // SimObject - bool onAdd(); + bool onAdd() override; static void initPersistFields(); // GuiControl - virtual bool onWake(); - virtual void onSleep(); - virtual void onMouseUp( const GuiEvent &event_ ); + bool onWake() override; + void onSleep() override; + void onMouseUp( const GuiEvent &event_ ) override; // EditTSCtrl - 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_ ); - bool onMouseWheelUp(const GuiEvent &event_); - bool onMouseWheelDown(const GuiEvent &event_); - void updateGuiInfo(); - void updateGizmo(); - void renderScene( const RectI &updateRect ); - void renderGui( Point2I offset, const RectI &updateRect ); + 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; + bool onMouseWheelUp(const GuiEvent &event_) override; + bool onMouseWheelDown(const GuiEvent &event_) override; + void updateGuiInfo() override; + void updateGizmo() override; + void renderScene( const RectI &updateRect ) override; + void renderGui( Point2I offset, const RectI &updateRect ) override; /// Causes the editor to reselect the active forest. bool updateActiveForest( bool createNew ); diff --git a/Engine/source/forest/editor/forestSelectionTool.h b/Engine/source/forest/editor/forestSelectionTool.h index c7185e89d..90945c2b0 100644 --- a/Engine/source/forest/editor/forestSelectionTool.h +++ b/Engine/source/forest/editor/forestSelectionTool.h @@ -47,9 +47,9 @@ public: protected: - void offsetObject( ForestItem &object, const Point3F &delta ); - void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin ); - void scaleObject( ForestItem &object, const Point3F &delta ); + void offsetObject( ForestItem &object, const Point3F &delta ) override; + void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin ) override; + void scaleObject( ForestItem &object, const Point3F &delta ) override; protected: @@ -93,17 +93,17 @@ class ForestSelectionTool : public ForestTool DECLARE_CONOBJECT( ForestSelectionTool ); // ForestTool - virtual void setParentEditor( ForestEditorCtrl *editor ); - virtual void setActiveForest( Forest *forest ); - virtual void on3DMouseDown( const Gui3DMouseEvent &evt ); - virtual void on3DMouseUp( const Gui3DMouseEvent &evt ); - virtual void on3DMouseMove( const Gui3DMouseEvent &evt ); - virtual void on3DMouseDragged( const Gui3DMouseEvent &evt ); - virtual void onRender3D(); - virtual void onRender2D(); - virtual bool updateGuiInfo(); - virtual void updateGizmo(); - virtual void onUndoAction(); + void setParentEditor( ForestEditorCtrl *editor ) override; + void setActiveForest( Forest *forest ) override; + void on3DMouseDown( const Gui3DMouseEvent &evt ) override; + void on3DMouseUp( const Gui3DMouseEvent &evt ) override; + void on3DMouseMove( const Gui3DMouseEvent &evt ) override; + void on3DMouseDragged( const Gui3DMouseEvent &evt ) override; + void onRender3D() override; + void onRender2D() override; + bool updateGuiInfo() override; + void updateGizmo() override; + void onUndoAction() override; S32 getSelectionCount() const { return mSelection.size(); } diff --git a/Engine/source/forest/editor/forestUndo.h b/Engine/source/forest/editor/forestUndo.h index 1d63c85e9..bf85e811c 100644 --- a/Engine/source/forest/editor/forestUndo.h +++ b/Engine/source/forest/editor/forestUndo.h @@ -45,8 +45,8 @@ public: ForestUndoAction( const Resource &data, ForestEditorCtrl *editor, const char *description ); // UndoAction - virtual void undo() {} - virtual void redo() {} + void undo() override {} + void redo() override {} protected: @@ -72,8 +72,8 @@ public: F32 scale ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; @@ -91,8 +91,8 @@ public: void removeItem( const Vector &itemList ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; @@ -107,8 +107,8 @@ public: void saveItem( const ForestItem &item ); - virtual void undo() { _swapState(); } - virtual void redo() { _swapState(); } + void undo() override { _swapState(); } + void redo() override { _swapState(); } protected: diff --git a/Engine/source/forest/forest.h b/Engine/source/forest/forest.h index 7fed73f4d..e446fd3de 100644 --- a/Engine/source/forest/forest.h +++ b/Engine/source/forest/forest.h @@ -152,37 +152,37 @@ public: static void initPersistFields(); // SimObject - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; /// Overloaded from SceneObject to properly update /// the client side forest when changes occur within /// the mission editor. - void inspectPostApply(); + void inspectPostApply() override; /// Overloaded from SceneObject for updating the /// client side position of the forest. - void setTransform( const MatrixF &mat ); + void setTransform( const MatrixF &mat ) override; - void prepRenderImage( SceneRenderState *state ); + void prepRenderImage( SceneRenderState *state ) override; bool isTreeInRange( const Point2F& point, F32 radius ) const; // 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; //IForestCollision *getCollision() const { return mCollision; } // 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 *outInfo ); - virtual bool castRayRendered( const Point3F &start, const Point3F &end, RayInfo *outInfo ); - virtual bool collideBox( const Point3F &start, const Point3F &end, RayInfo *outInfo ); + 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 *outInfo ) override; + bool castRayRendered( const Point3F &start, const Point3F &end, RayInfo *outInfo ) override; + bool collideBox( const Point3F &start, const Point3F &end, RayInfo *outInfo ) override; // SceneObject - Other - virtual void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ); + void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override; bool castRayBase( const Point3F &start, const Point3F &end, RayInfo *outInfo, bool rendered ); @@ -203,7 +203,7 @@ public: void saveDataFile( const char *path = NULL ); /// - void clear() { mData->clear(); } + void clear() override { mData->clear(); } /// Called to rebuild the collision state. void updateCollision(); diff --git a/Engine/source/forest/forestCollision.h b/Engine/source/forest/forestCollision.h index 0118307ec..4628ab290 100644 --- a/Engine/source/forest/forestCollision.h +++ b/Engine/source/forest/forestCollision.h @@ -66,12 +66,12 @@ public: } void calculateTransform( const MatrixF &worldXfrm ); - const MatrixF& getTransform() const { return mTransform; } - Box3F getBoundingBox() const; - Box3F getBoundingBox( const MatrixF &mat, const Point3F &scale) const; - Point3F support( const VectorF &v ) const; - void getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeature *cf ); - void getPolyList( AbstractPolyList *list); + const MatrixF& getTransform() const override { return mTransform; } + Box3F getBoundingBox() const override; + Box3F getBoundingBox( const MatrixF &mat, const Point3F &scale) const override; + Point3F support( const VectorF &v ) const override; + void getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeature *cf ) override; + void getPolyList( AbstractPolyList *list) override; public: diff --git a/Engine/source/forest/forestItem.h b/Engine/source/forest/forestItem.h index 2ffb9f9ab..42bf56a5f 100644 --- a/Engine/source/forest/forestItem.h +++ b/Engine/source/forest/forestItem.h @@ -111,10 +111,10 @@ public: static void consoleInit(); static void initPersistFields(); - virtual void onNameChange(const char *name); - virtual bool onAdd(); - virtual void packData(BitStream* stream); - virtual void unpackData(BitStream* stream); + void onNameChange(const char *name) override; + bool onAdd() override; + void packData(BitStream* stream) override; + void unpackData(BitStream* stream) override; /// Called from Forest the first time a datablock is used /// in order to lazy load content. diff --git a/Engine/source/forest/forestWindEmitter.h b/Engine/source/forest/forestWindEmitter.h index 9c3c51859..4597ad5ca 100644 --- a/Engine/source/forest/forestWindEmitter.h +++ b/Engine/source/forest/forestWindEmitter.h @@ -196,20 +196,20 @@ public: void updateMountPosition(); // SceneObject - virtual void setTransform( const MatrixF &mat ); - void prepRenderImage( SceneRenderState *state ); + void setTransform( const MatrixF &mat ) override; + void prepRenderImage( SceneRenderState *state ) override; // SimObject - bool onAdd(); - void onRemove(); - void inspectPostApply(); - void onEditorEnable(); - void onEditorDisable(); - void onDeleteNotify(SimObject *object); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; + void onEditorEnable() override; + void onEditorDisable() override; + void onDeleteNotify(SimObject *object) 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; // ConObject. static void initPersistFields(); diff --git a/Engine/source/forest/forestWindMgr.h b/Engine/source/forest/forestWindMgr.h index 32fdab67a..3258ed8f6 100644 --- a/Engine/source/forest/forestWindMgr.h +++ b/Engine/source/forest/forestWindMgr.h @@ -62,9 +62,9 @@ protected: static WindAdvanceSignal smAdvanceSignal; - virtual void interpolateTick( F32 delta ) {}; - virtual void processTick(); - virtual void advanceTime( F32 timeDelta ) {}; + void interpolateTick( F32 delta ) override {}; + void processTick() override; + void advanceTime( F32 timeDelta ) override {}; public: diff --git a/Engine/source/forest/glsl/windDeformationGLSL.h b/Engine/source/forest/glsl/windDeformationGLSL.h index cce0fe51c..5fe6b4a75 100644 --- a/Engine/source/forest/glsl/windDeformationGLSL.h +++ b/Engine/source/forest/glsl/windDeformationGLSL.h @@ -43,22 +43,22 @@ public: WindDeformationGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Wind Effect"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; - virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ); + ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override; }; DeclareFeatureType( MFT_WindEffect ); diff --git a/Engine/source/forest/hlsl/windDeformationHLSL.h b/Engine/source/forest/hlsl/windDeformationHLSL.h index 8c2c182d8..99aa49fe0 100644 --- a/Engine/source/forest/hlsl/windDeformationHLSL.h +++ b/Engine/source/forest/hlsl/windDeformationHLSL.h @@ -43,22 +43,22 @@ public: WindDeformationHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Wind Effect"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; - virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ); + ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override; }; DeclareFeatureType( MFT_WindEffect ); diff --git a/Engine/source/forest/ts/tsForestCellBatch.h b/Engine/source/forest/ts/tsForestCellBatch.h index a2911addc..2283bd439 100644 --- a/Engine/source/forest/ts/tsForestCellBatch.h +++ b/Engine/source/forest/ts/tsForestCellBatch.h @@ -52,9 +52,9 @@ protected: TSLastDetail *mDetail; // ForestCellBatch - virtual bool _prepBatch( const ForestItem &item ); - virtual void _rebuildBatch(); - virtual void _render( const SceneRenderState *state ); + bool _prepBatch( const ForestItem &item ) override; + void _rebuildBatch() override; + void _render( const SceneRenderState *state ) override; public: diff --git a/Engine/source/forest/ts/tsForestItemData.h b/Engine/source/forest/ts/tsForestItemData.h index a46c51684..46b4c33c7 100644 --- a/Engine/source/forest/ts/tsForestItemData.h +++ b/Engine/source/forest/ts/tsForestItemData.h @@ -63,7 +63,7 @@ protected: void _updateCollisionDetails(); // ForestItemData - void _preload() { _loadShape(); } + void _preload() override { _loadShape(); } public: @@ -71,11 +71,11 @@ public: TSForestItemData(); virtual ~TSForestItemData(); - bool preload( bool server, String &errorBuffer ); - void onRemove(); - bool onAdd(); + bool preload( bool server, String &errorBuffer ) override; + void onRemove() override; + bool onAdd() override; - virtual void inspectPostApply(); + void inspectPostApply() override; TSLastDetail* getLastDetail() const; @@ -86,10 +86,10 @@ public: const Vector& getLOSDetails() const { return mLOSDetails; } // ForestItemData - const Box3F& getObjBox() const { return mShape ? mShape->mBounds : Box3F::Zero; } - bool render( TSRenderState *rdata, const ForestItem& item ) const; - ForestCellBatch* allocateBatch() const; - bool canBillboard( const SceneRenderState *state, const ForestItem &item, F32 distToCamera ) const; + const Box3F& getObjBox() const override { return mShape ? mShape->mBounds : Box3F::Zero; } + bool render( TSRenderState *rdata, const ForestItem& item ) const override; + ForestCellBatch* allocateBatch() const override; + bool canBillboard( const SceneRenderState *state, const ForestItem &item, F32 distToCamera ) const override; bool buildPolyList( const ForestItem& item, AbstractPolyList *polyList, const Box3F *box ) const { return false; } }; diff --git a/Engine/source/forest/windDeformation.h b/Engine/source/forest/windDeformation.h index 46c2f7b8f..8ec644634 100644 --- a/Engine/source/forest/windDeformation.h +++ b/Engine/source/forest/windDeformation.h @@ -40,10 +40,10 @@ public: GFXShaderConstHandle *mWindParams; // ShaderFeatureConstHandles - virtual void init( GFXShader *shader ); - virtual void setConsts( SceneRenderState *state, + void init( GFXShader *shader ) override; + void setConsts( SceneRenderState *state, const SceneData &sgData, - GFXShaderConstBuffer *buffer ); + GFXShaderConstBuffer *buffer ) override; }; diff --git a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h index c26432928..06b6e90dd 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h +++ b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h @@ -33,14 +33,14 @@ private: public: GFXD3D11CardProfiler(); ~GFXD3D11CardProfiler(); - void init(); + void init() override; protected: - const String &getRendererString() const { static String sRS("Direct3D11"); return sRS; } + const String &getRendererString() const override { static String sRS("Direct3D11"); return sRS; } - void setupCardCapabilities(); - bool _queryCardCap(const String &query, U32 &foundResult); - bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips); + void setupCardCapabilities() override; + bool _queryCardCap(const String &query, U32 &foundResult) override; + bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override; }; #endif diff --git a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h index 02cc91627..f8621b485 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h @@ -34,21 +34,21 @@ const U32 MaxMipMaps = 13; //todo this needs a proper static value somewhere to class GFXD3D11Cubemap : public GFXCubemap { public: - virtual void initStatic( GFXTexHandle *faces ); - virtual void initStatic( DDSFile *dds ); - virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0); - virtual void setToTexUnit( U32 tuNum ); - virtual U32 getSize() const { return mTexSize; } - virtual GFXFormat getFormat() const { return mFaceFormat; } + void initStatic( GFXTexHandle *faces ) override; + void initStatic( DDSFile *dds ) override; + void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override; + void setToTexUnit( U32 tuNum ) override; + U32 getSize() const override { return mTexSize; } + GFXFormat getFormat() const override { return mFaceFormat; } GFXD3D11Cubemap(); virtual ~GFXD3D11Cubemap(); // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; - virtual bool isInitialized() { return mTexture ? true : false; } + bool isInitialized() override { return mTexture ? true : false; } // Get functions ID3D11ShaderResourceView* getSRView(); @@ -83,18 +83,18 @@ class GFXD3D11CubemapArray : public GFXCubemapArray public: GFXD3D11CubemapArray(); virtual ~GFXD3D11CubemapArray(); - virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount); - virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format); - virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot); - virtual void copyTo(GFXCubemapArray *pDstCubemap); - virtual void setToTexUnit(U32 tuNum); + void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override; + void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override; + void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override; + void copyTo(GFXCubemapArray *pDstCubemap) override; + void setToTexUnit(U32 tuNum) override; ID3D11ShaderResourceView* getSRView() { return mSRView; } ID3D11Texture2D* get2DTex() { return mTexture; } // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; private: friend class GFXD3D11TextureTarget; diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.h b/Engine/source/gfx/D3D11/gfxD3D11Device.h index 41b3415e9..05f4deda3 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Device.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Device.h @@ -63,17 +63,17 @@ private: friend class OculusVRHMDDevice; friend class D3D11OculusTexture; - virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile, - const Vector &formats, bool texture, bool mustblend, bool mustfilter); + GFXFormat selectSupportedFormat(GFXTextureProfile *profile, + const Vector &formats, bool texture, bool mustblend, bool mustfilter) override; - virtual void enumerateVideoModes(); + void enumerateVideoModes() override; - virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window); - virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true); + GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override; + GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true) override; - virtual void enterDebugEvent(ColorI color, const char *name); - virtual void leaveDebugEvent(); - virtual void setDebugMarker(ColorI color, const char *name); + void enterDebugEvent(ColorI color, const char *name) override; + void leaveDebugEvent() override; + void setDebugMarker(ColorI color, const char *name) override; protected: @@ -89,7 +89,7 @@ protected: ID3D11InputLayout *decl; }; - virtual void initStates() { }; + void initStates() override { }; static GFXAdapter::CreateDeviceInstanceDelegate mCreateDeviceInstance; @@ -167,33 +167,33 @@ protected: // { /// - virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject* texture); + void setTextureInternal(U32 textureUnit, const GFXTextureObject* texture) override; /// Called by GFXDevice to create a device specific stateblock - virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc); + GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override; /// Called by GFXDevice to actually set a stateblock. - virtual void setStateBlockInternal(GFXStateBlock* block, bool force); + void setStateBlockInternal(GFXStateBlock* block, bool force) override; /// Track the last const buffer we've used. Used to notify new constant buffers that /// they should send all of their constants up StrongRefPtr mCurrentConstBuffer; /// Called by base GFXDevice to actually set a const buffer - virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer); + void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override; // } // Index buffer management // { virtual void _setPrimitiveBuffer( GFXPrimitiveBuffer *buffer ); - virtual void drawIndexedPrimitive( GFXPrimitiveType primType, + void drawIndexedPrimitive( GFXPrimitiveType primType, U32 startVertex, U32 minIndex, U32 numVerts, U32 startIndex, - U32 primitiveCount ); + U32 primitiveCount ) override; // } - virtual GFXShader* createShader(); + GFXShader* createShader() override; /// Device helper function virtual DXGI_SWAP_CHAIN_DESC setupPresentParams( const GFXVideoMode &mode, const HWND &hwnd ); @@ -220,41 +220,41 @@ public: // Activate/deactivate // { - virtual void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ); + void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override; - virtual void preDestroy() { GFXDevice::preDestroy(); if(mTextureManager) mTextureManager->kill(); } + void preDestroy() override { GFXDevice::preDestroy(); if(mTextureManager) mTextureManager->kill(); } - GFXAdapterType getAdapterType(){ return Direct3D11; } + GFXAdapterType getAdapterType() override{ return Direct3D11; } U32 getAdaterIndex() const { return mAdapterIndex; } - virtual GFXCubemap *createCubemap(); - virtual GFXCubemapArray *createCubemapArray(); - virtual GFXTextureArray* createTextureArray(); + GFXCubemap *createCubemap() override; + GFXCubemapArray *createCubemapArray() override; + GFXTextureArray* createTextureArray() override; - virtual F32 getPixelShaderVersion() const { return mPixVersion; } - virtual void setPixelShaderVersion( F32 version ){ mPixVersion = version;} + F32 getPixelShaderVersion() const override { return mPixVersion; } + void setPixelShaderVersion( F32 version ) override{ mPixVersion = version;} - virtual void setShader(GFXShader *shader, bool force = false); - virtual U32 getNumSamplers() const { return 16; } - virtual U32 getNumRenderTargets() const { return 8; } + void setShader(GFXShader *shader, bool force = false) override; + U32 getNumSamplers() const override { return 16; } + U32 getNumRenderTargets() const override { return 8; } // } // Copy methods // { - virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face); + void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override; // } // Misc rendering control // { - virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ); - virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color); + void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override; + void clearColorAttachment(const U32 attachment, const LinearColorF& color) override; - virtual bool beginSceneInternal(); - virtual void endSceneInternal(); + bool beginSceneInternal() override; + void endSceneInternal() override; - virtual void setClipRect( const RectI &rect ); - virtual const RectI& getClipRect() const { return mClipRect; } + void setClipRect( const RectI &rect ) override; + const RectI& getClipRect() const override { return mClipRect; } // } @@ -262,37 +262,37 @@ public: /// @name Render Targets /// @{ - virtual void _updateRenderTargets(); + void _updateRenderTargets() override; /// @} // Vertex/Index buffer management // { - virtual GFXVertexBuffer* allocVertexBuffer( U32 numVerts, + GFXVertexBuffer* allocVertexBuffer( U32 numVerts, const GFXVertexFormat *vertexFormat, U32 vertSize, GFXBufferType bufferType, - void* data = NULL); + void* data = NULL) override; - virtual GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, + GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, - void* data = NULL); + void* data = NULL) override; - virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ); - virtual void setVertexDecl( const GFXVertexDecl *decl ); + GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override; + void setVertexDecl( const GFXVertexDecl *decl ) override; - virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer ); - virtual void setVertexStreamFrequency( U32 stream, U32 frequency ); + void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override; + void setVertexStreamFrequency( U32 stream, U32 frequency ) override; // } - virtual U32 getMaxDynamicVerts() { return GFX_MAX_DYNAMIC_VERTS; } - virtual U32 getMaxDynamicIndices() { return GFX_MAX_DYNAMIC_INDICES; } + U32 getMaxDynamicVerts() override { return GFX_MAX_DYNAMIC_VERTS; } + U32 getMaxDynamicIndices() override { return GFX_MAX_DYNAMIC_INDICES; } inline U32 primCountToIndexCount(GFXPrimitiveType primType, U32 primitiveCount); // Rendering // { - virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ); + void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override; // } ID3D11DeviceContext* getDeviceContext(){ return mD3DDeviceContext; } @@ -304,14 +304,14 @@ public: void beginReset(); void endReset(GFXD3D11WindowTarget* windowTarget); - virtual void setupGenericShaders( GenericShaderType type = GSColor ); + void setupGenericShaders( GenericShaderType type = GSColor ) override; - inline virtual F32 getFillConventionOffset() const { return 0.0f; } - virtual void doParanoidStateCheck() {}; + inline F32 getFillConventionOffset() const override { return 0.0f; } + void doParanoidStateCheck() override {}; - GFXFence *createFence(); + GFXFence *createFence() override; - GFXOcclusionQuery* createOcclusionQuery(); + GFXOcclusionQuery* createOcclusionQuery() override; // Default multisample parameters DXGI_SAMPLE_DESC getMultisampleType() const { return mMultisampleDesc; } @@ -327,7 +327,7 @@ public: // grab the sampler map const SamplerMap &getSamplersMap() const { return mSamplersMap; } SamplerMap &getSamplersMap(){ return mSamplersMap; } - const char* interpretDebugResult(long result); + const char* interpretDebugResult(long result) override; // grab device buffer. ID3D11Buffer* getDeviceBuffer(const GFXShaderConstDesc desc); diff --git a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h index 52a722c2f..71e7f0ac3 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h +++ b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h @@ -45,14 +45,14 @@ public: GFXD3D11OcclusionQuery(GFXDevice *device); virtual ~GFXD3D11OcclusionQuery(); - virtual bool begin(); - virtual void end(); - virtual OcclusionQueryStatus getStatus(bool block, U32 *data = NULL); + bool begin() override; + void end() override; + OcclusionQueryStatus getStatus(bool block, U32 *data = NULL) override; // GFXResource - virtual void zombify(); - virtual void resurrect(); - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; }; #endif \ No newline at end of file diff --git a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h index 948176af6..3226c1fd1 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h +++ b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h @@ -51,14 +51,14 @@ public: virtual ~GFXD3D11PrimitiveBuffer(); - virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); - virtual void unlock(); + void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; + void unlock() override; - virtual void prepare(); + void prepare() override; // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; }; inline GFXD3D11PrimitiveBuffer::GFXD3D11PrimitiveBuffer( GFXDevice *device, diff --git a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h index 5113651c9..30231c795 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h +++ b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h @@ -36,14 +36,14 @@ public: GFXD3D11QueryFence( GFXDevice *device ) : GFXFence( device ), mQuery( NULL ) {}; virtual ~GFXD3D11QueryFence(); - virtual void issue(); - virtual FenceStatus getStatus() const; - virtual void block(); + void issue() override; + FenceStatus getStatus() const override; + void block() override; // GFXResource interface - virtual void zombify(); - virtual void resurrect(); - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; }; #endif \ No newline at end of file diff --git a/Engine/source/gfx/D3D11/gfxD3D11Shader.h b/Engine/source/gfx/D3D11/gfxD3D11Shader.h index 80bb55b5e..5e8b367fd 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Shader.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Shader.h @@ -69,15 +69,15 @@ public: virtual ~GFXD3D11ShaderConstHandle(); void addDesc(GFXShaderStage stage, const GFXShaderConstDesc& desc); const GFXShaderConstDesc getDesc(GFXShaderStage stage); - const String& getName() const { return mDesc.name; } - GFXShaderConstType getType() const { return mDesc.constType; } - U32 getArraySize() const { return mDesc.arraySize; } + const String& getName() const override { return mDesc.name; } + GFXShaderConstType getType() const override { return mDesc.constType; } + U32 getArraySize() const override { return mDesc.arraySize; } U32 getSize() const { return mDesc.size; } void setValid(bool valid) { mValid = valid; } /// @warning This will always return the value assigned when the shader was /// initialized. If the value is later changed this method won't reflect that. - S32 getSamplerRegister() const { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; } + S32 getSamplerRegister() const override { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; } // Returns true if this is a handle to a sampler register. bool isSampler() const @@ -124,32 +124,32 @@ public: void onShaderReload(GFXD3D11Shader *shader); // GFXShaderConstBuffer - virtual GFXShader* getShader(); - virtual void set(GFXShaderConstHandle* handle, const F32 fv); - virtual void set(GFXShaderConstHandle* handle, const Point2F& fv); - virtual void set(GFXShaderConstHandle* handle, const Point3F& fv); - virtual void set(GFXShaderConstHandle* handle, const Point4F& fv); - virtual void set(GFXShaderConstHandle* handle, const PlaneF& fv); - virtual void set(GFXShaderConstHandle* handle, const LinearColorF& fv); - virtual void set(GFXShaderConstHandle* handle, const S32 f); - virtual void set(GFXShaderConstHandle* handle, const Point2I& fv); - virtual void set(GFXShaderConstHandle* handle, const Point3I& fv); - virtual void set(GFXShaderConstHandle* handle, const Point4I& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4); - virtual void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4); + GFXShader* getShader() override; + void set(GFXShaderConstHandle* handle, const F32 fv) override; + void set(GFXShaderConstHandle* handle, const Point2F& fv) override; + void set(GFXShaderConstHandle* handle, const Point3F& fv) override; + void set(GFXShaderConstHandle* handle, const Point4F& fv) override; + void set(GFXShaderConstHandle* handle, const PlaneF& fv) override; + void set(GFXShaderConstHandle* handle, const LinearColorF& fv) override; + void set(GFXShaderConstHandle* handle, const S32 f) override; + void set(GFXShaderConstHandle* handle, const Point2I& fv) override; + void set(GFXShaderConstHandle* handle, const Point3I& fv) override; + void set(GFXShaderConstHandle* handle, const Point4I& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4) override; + void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; // GFXResource - virtual const String describeSelf() const; - virtual void zombify() {} - virtual void resurrect() {} + const String describeSelf() const override; + void zombify() override {} + void resurrect() override {} protected: friend class GFXD3D11Shader; @@ -182,19 +182,19 @@ public: virtual ~GFXD3D11Shader(); // GFXShader - virtual GFXShaderConstBufferRef allocConstBuffer(); - virtual const Vector& getShaderConstDesc() const; - virtual GFXShaderConstHandle* getShaderConstHandle(const String& name); - virtual GFXShaderConstHandle* findShaderConstHandle(const String& name); - virtual U32 getAlignmentValue(const GFXShaderConstType constType) const; + GFXShaderConstBufferRef allocConstBuffer() override; + const Vector& getShaderConstDesc() const override; + GFXShaderConstHandle* getShaderConstHandle(const String& name) override; + GFXShaderConstHandle* findShaderConstHandle(const String& name) override; + U32 getAlignmentValue(const GFXShaderConstType constType) const override; // GFXResource - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; protected: - virtual bool _init(); + bool _init() override; ID3D11VertexShader *mVertShader; ID3D11PixelShader *mPixShader; diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h index e2205b036..496bb8ec9 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h @@ -47,17 +47,17 @@ public: // /// Returns the hash value of the desc that created this block - virtual U32 getHashValue() const; + U32 getHashValue() const override; /// Returns a GFXStateBlockDesc that this block represents - virtual const GFXStateBlockDesc& getDesc() const; + const GFXStateBlockDesc& getDesc() const override; // // GFXResource // - virtual void zombify() { } + void zombify() override { } /// When called the resource should restore all device sensitive information destroyed by zombify() - virtual void resurrect() { } + void resurrect() override { } private: D3D11_BLEND_DESC mBlendDesc; diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.h b/Engine/source/gfx/D3D11/gfxD3D11Target.h index d77ab42fb..1173a4ee4 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Target.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Target.h @@ -55,20 +55,20 @@ public: ~GFXD3D11TextureTarget(); // Public interface. - virtual const Point2I getSize() { return mTargetSize; } - virtual GFXFormat getFormat() { return mTargetFormat; } - virtual void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0); - virtual void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0); - virtual void resolve(); + const Point2I getSize() override { return mTargetSize; } + GFXFormat getFormat() override { return mTargetFormat; } + void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0) override; + void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0) override; + void resolve() override; /// Note we always copy the Color0 RenderSlot. - virtual void resolveTo( GFXTextureObject *tex ); + void resolveTo( GFXTextureObject *tex ) override; - virtual void activate(); - virtual void deactivate(); + void activate() override; + void deactivate() override; - void zombify(); - void resurrect(); + void zombify() override; + void resurrect() override; }; class GFXD3D11WindowTarget : public GFXWindowTarget @@ -87,7 +87,7 @@ class GFXD3D11WindowTarget : public GFXWindowTarget /// D3D presentation info. DXGI_SWAP_CHAIN_DESC mPresentationParams; /// Internal interface that notifies us we need to reset our video mode. - void resetMode(); + void resetMode() override; /// Is this a secondary window bool mSecondaryWindow; @@ -97,21 +97,21 @@ public: GFXD3D11WindowTarget(); ~GFXD3D11WindowTarget(); - virtual const Point2I getSize(); - virtual GFXFormat getFormat(); - virtual bool present(); + const Point2I getSize() override; + GFXFormat getFormat() override; + bool present() override; void initPresentationParams(); void createSwapChain(); void createBuffersAndViews(); void setBackBuffer(); - virtual void activate(); + void activate() override; - void zombify(); - void resurrect(); + void zombify() override; + void resurrect() override; - virtual void resolveTo( GFXTextureObject *tex ); + void resolveTo( GFXTextureObject *tex ) override; // These are all reference counted and must be released by whomever uses the get* function IDXGISwapChain* getSwapChain(); diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h index be7851d75..1626c39b7 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h @@ -22,7 +22,7 @@ public: ~GFXD3D11TextureArray() { Release(); }; - void init(); + void init() override; void setToTexUnit(U32 tuNum) override; void createResourceView(DXGI_FORMAT format, U32 numMipLevels, U32 usageFlags); diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h index 9698f4a6e..b035bd6b7 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h @@ -45,13 +45,13 @@ protected: U32 numMipLevels, bool forceMips = false, S32 antialiasLevel = 0, - GFXTextureObject *inTex = NULL ); + GFXTextureObject *inTex = NULL ) override; - bool _loadTexture(GFXTextureObject *texture, DDSFile *dds); - bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp); - bool _loadTexture(GFXTextureObject *texture, void *raw); - bool _refreshTexture(GFXTextureObject *texture); - bool _freeTexture(GFXTextureObject *texture, bool zombify = false); + bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override; + bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override; + bool _loadTexture(GFXTextureObject *texture, void *raw) override; + bool _refreshTexture(GFXTextureObject *texture) override; + bool _freeTexture(GFXTextureObject *texture, bool zombify = false) override; private: U32 mCurTexSet[GFX_TEXTURE_STAGE_COUNT]; diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h index 2152cc62a..a99cb7e58 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h @@ -70,19 +70,19 @@ public: bool isManaged; //setting to true tells this texture not to be released from being zombify - virtual GFXLockedRect * lock(U32 mipLevel = 0, RectI *inRect = NULL); - virtual void unlock(U32 mipLevel = 0 ); + GFXLockedRect * lock(U32 mipLevel = 0, RectI *inRect = NULL) override; + void unlock(U32 mipLevel = 0 ) override; - virtual bool copyToBmp(GBitmap* bmp); + bool copyToBmp(GBitmap* bmp) override; ID3D11Texture2D* getSurface() {return mD3DSurface;} ID3D11Texture2D** getSurfacePtr() {return &mD3DSurface;} // GFXResource - void zombify(); - void resurrect(); + void zombify() override; + void resurrect() override; #ifdef TORQUE_DEBUG - virtual void pureVirtualCrash() {}; + void pureVirtualCrash() override {}; #endif }; diff --git a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h index 9e961cc87..b677171d6 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h +++ b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h @@ -49,13 +49,13 @@ public: GFXBufferType bufferType ); virtual ~GFXD3D11VertexBuffer(); - void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr); - void unlock(); - void prepare() {} + void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override; + void unlock() override; + void prepare() override {} // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; }; //----------------------------------------------------------------------------- diff --git a/Engine/source/gfx/D3D11/screenshotD3D11.h b/Engine/source/gfx/D3D11/screenshotD3D11.h index 1a3de23b7..ce890a473 100644 --- a/Engine/source/gfx/D3D11/screenshotD3D11.h +++ b/Engine/source/gfx/D3D11/screenshotD3D11.h @@ -31,7 +31,7 @@ class ScreenShotD3D11 : public ScreenShot { protected: - GBitmap* _captureBackBuffer(); + GBitmap* _captureBackBuffer() override; }; diff --git a/Engine/source/gfx/Null/gfxNullDevice.cpp b/Engine/source/gfx/Null/gfxNullDevice.cpp index ea5d8b05d..7aeca8339 100644 --- a/Engine/source/gfx/Null/gfxNullDevice.cpp +++ b/Engine/source/gfx/Null/gfxNullDevice.cpp @@ -42,17 +42,17 @@ private: public: /// - virtual const String &getRendererString() const { static String sRS("GFX Null Device Renderer"); return sRS; } + const String &getRendererString() const override { static String sRS("GFX Null Device Renderer"); return sRS; } protected: - virtual void setupCardCapabilities() { }; + void setupCardCapabilities() override { }; - virtual bool _queryCardCap(const String &query, U32 &foundResult){ return false; } - virtual bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) { inOutAutogenMips = false; return false; } + bool _queryCardCap(const String &query, U32 &foundResult) override{ return false; } + bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override { inOutAutogenMips = false; return false; } public: - virtual void init() + void init() override { mCardDescription = "GFX Null Device Card"; mChipSet = "NULL Device"; @@ -68,14 +68,16 @@ public: GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile); ~GFXNullTextureObject() { kill(); }; - virtual void pureVirtualCrash() { }; +#ifdef TORQUE_DEBUG + void pureVirtualCrash() override {} +#endif - virtual GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) { return NULL; }; - virtual void unlock( U32 mipLevel = 0) {}; - virtual bool copyToBmp(GBitmap *) { return false; }; + GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) override { return NULL; }; + void unlock( U32 mipLevel = 0) override {}; + bool copyToBmp(GBitmap *) override { return false; }; - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} }; GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile) : @@ -88,13 +90,13 @@ GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfil class GFXNullTextureManager : public GFXTextureManager { public: - GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; } // _createNullTextureObject();} - GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) { return nullptr; } - GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) { return nullptr; } - GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) { return nullptr; } - GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) { return nullptr; } - GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) { return nullptr; } - GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; } + GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; } // _createNullTextureObject();} + GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) override { return nullptr; } + GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) override { return nullptr; } + GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) override { return nullptr; } + GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) override { return nullptr; } + GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) override { return nullptr; } + GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; } protected: GFXTextureObject *_createTextureObject( U32 height, U32 width, @@ -104,7 +106,7 @@ protected: U32 numMipLevels, bool forceMips = false, S32 antialiasLevel = 0, - GFXTextureObject *inTex = NULL ) + GFXTextureObject *inTex = NULL ) override { GFXNullTextureObject *retTex; if ( inTex ) @@ -124,26 +126,26 @@ protected: }; /// Load a texture from a proper DDSFile instance. - virtual bool _loadTexture(GFXTextureObject *texture, DDSFile *dds){ return true; }; + bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override{ return true; }; /// Load data into a texture from a GBitmap using the internal API. - virtual bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp){ return true; }; + bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override{ return true; }; /// Load data into a texture from a raw buffer using the internal API. /// /// Note that the size of the buffer is assumed from the parameters used /// for this GFXTextureObject's _createTexture call. - virtual bool _loadTexture(GFXTextureObject *texture, void *raw){ return true; }; + bool _loadTexture(GFXTextureObject *texture, void *raw) override{ return true; }; /// Refresh a texture using the internal API. - virtual bool _refreshTexture(GFXTextureObject *texture){ return true; }; + bool _refreshTexture(GFXTextureObject *texture) override{ return true; }; /// Free a texture (but do not delete the GFXTextureObject) using the internal /// API. /// /// This is only called during zombification for textures which need it, so you /// don't need to do any internal safety checks. - virtual bool _freeTexture(GFXTextureObject *texture, bool zombify=false) { return true; }; + bool _freeTexture(GFXTextureObject *texture, bool zombify=false) override { return true; }; virtual U32 _getTotalVideoMemory() { return 0; }; virtual U32 _getFreeVideoMemory() { return 0; }; @@ -154,19 +156,19 @@ class GFXNullCubemap : public GFXCubemap friend class GFXDevice; private: // should only be called by GFXDevice - virtual void setToTexUnit( U32 tuNum ) { }; + void setToTexUnit( U32 tuNum ) override { }; public: - virtual void initStatic( GFXTexHandle *faces ) { }; - virtual void initStatic( DDSFile *dds ) { }; - virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) { }; - virtual U32 getSize() const { return 0; } - virtual GFXFormat getFormat() const { return GFXFormatR8G8B8A8; } + void initStatic( GFXTexHandle *faces ) override { }; + void initStatic( DDSFile *dds ) override { }; + void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override { }; + U32 getSize() const override { return 0; } + GFXFormat getFormat() const override { return GFXFormatR8G8B8A8; } virtual ~GFXNullCubemap(){}; - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} }; class GFXNullCubemapArray : public GFXCubemapArray @@ -174,16 +176,16 @@ class GFXNullCubemapArray : public GFXCubemapArray friend class GFXDevice; private: // should only be called by GFXDevice - virtual void setToTexUnit(U32 tuNum) { }; + void setToTexUnit(U32 tuNum) override { }; public: - virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) { }; - virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) { }; - virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) { }; - virtual void copyTo(GFXCubemapArray *pDstCubemap) { } + void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override { }; + void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override { }; + void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override { }; + void copyTo(GFXCubemapArray *pDstCubemap) override { } virtual ~GFXNullCubemapArray() {}; - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} }; class GFXNullTextureArray : public GFXTextureArray @@ -209,12 +211,12 @@ public: U32 vertexSize, GFXBufferType bufferType ) : GFXVertexBuffer(device, numVerts, vertexFormat, vertexSize, bufferType) {tempBuf =NULL;}; - virtual void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr); - virtual void unlock(); - virtual void prepare(); + void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override; + void unlock() override; + void prepare() override; - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} }; void GFXNullVertexBuffer::lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) @@ -246,12 +248,12 @@ public: GFXBufferType bufferType ) : GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), temp( NULL ) {}; - virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); ///< locks this primitive buffer for writing into - virtual void unlock(); ///< unlocks this primitive buffer. - virtual void prepare() { }; ///< prepares this primitive buffer for use on the device it was allocated on + void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; ///< locks this primitive buffer for writing into + void unlock() override; ///< unlocks this primitive buffer. + void prepare() override { }; ///< prepares this primitive buffer for use on the device it was allocated on - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} }; void GFXNullPrimitiveBuffer::lock(U32 indexStart, U32 indexEnd, void **indexPtr) @@ -273,17 +275,17 @@ class GFXNullStateBlock : public GFXStateBlock { public: /// Returns the hash value of the desc that created this block - virtual U32 getHashValue() const { return 0; }; + U32 getHashValue() const override { return 0; }; /// Returns a GFXStateBlockDesc that this block represents - virtual const GFXStateBlockDesc& getDesc() const { return mDefaultDesc; } + const GFXStateBlockDesc& getDesc() const override { return mDefaultDesc; } // // GFXResource // - virtual void zombify() { } + void zombify() override { } /// When called the resource should restore all device sensitive information destroyed by zombify() - virtual void resurrect() { } + void resurrect() override { } private: GFXStateBlockDesc mDefaultDesc; }; diff --git a/Engine/source/gfx/Null/gfxNullDevice.h b/Engine/source/gfx/Null/gfxNullDevice.h index 320c3fee1..259fac5f2 100644 --- a/Engine/source/gfx/Null/gfxNullDevice.h +++ b/Engine/source/gfx/Null/gfxNullDevice.h @@ -34,26 +34,26 @@ class GFXNullWindowTarget : public GFXWindowTarget { public: - virtual bool present() + bool present() override { return true; } - virtual const Point2I getSize() + const Point2I getSize() override { // Return something stupid. return Point2I(1,1); } - virtual GFXFormat getFormat() { return GFXFormatR8G8B8A8; } + GFXFormat getFormat() override { return GFXFormatR8G8B8A8; } - virtual void resetMode() + void resetMode() override { } - virtual void zombify() {}; - virtual void resurrect() {}; + void zombify() override {}; + void resurrect() override {}; }; @@ -67,21 +67,21 @@ public: static void enumerateAdapters( Vector &adapterList ); - void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ); + void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override; virtual void activate() { }; virtual void deactivate() { }; - virtual GFXAdapterType getAdapterType() { return NullDevice; }; + GFXAdapterType getAdapterType() override { return NullDevice; }; /// @name Debug Methods /// @{ - virtual void enterDebugEvent(ColorI color, const char *name) { }; - virtual void leaveDebugEvent() { }; - virtual void setDebugMarker(ColorI color, const char *name) { }; + void enterDebugEvent(ColorI color, const char *name) override { }; + void leaveDebugEvent() override { }; + void setDebugMarker(ColorI color, const char *name) override { }; /// @} /// Enumerates the supported video modes of the device - virtual void enumerateVideoModes() { }; + void enumerateVideoModes() override { }; /// Sets the video mode for the device virtual void setVideoMode( const GFXVideoMode &mode ) { }; @@ -89,15 +89,15 @@ protected: static GFXAdapter::CreateDeviceInstanceDelegate mCreateDeviceInstance; /// Called by GFXDevice to create a device specific stateblock - virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc); + GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override; /// Called by GFXDevice to actually set a stateblock. - virtual void setStateBlockInternal(GFXStateBlock* block, bool force) { }; + void setStateBlockInternal(GFXStateBlock* block, bool force) override { }; /// @} /// Called by base GFXDevice to actually set a const buffer - virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) { }; + void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override { }; - virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) { }; + void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) override { }; /// @name State Initalization. @@ -105,77 +105,77 @@ protected: /// State initalization. This MUST BE CALLED in setVideoMode after the device /// is created. - virtual void initStates() { }; + void initStates() override { }; - virtual GFXVertexBuffer *allocVertexBuffer( U32 numVerts, + GFXVertexBuffer *allocVertexBuffer( U32 numVerts, const GFXVertexFormat *vertexFormat, U32 vertSize, GFXBufferType bufferType, - void* data = NULL ); - virtual GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, + void* data = NULL ) override; + GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, - void* data = NULL ); + void* data = NULL ) override; - virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) { return NULL; } - virtual void setVertexDecl( const GFXVertexDecl *decl ) { } - virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) { } - virtual void setVertexStreamFrequency( U32 stream, U32 frequency ) { } + GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override { return NULL; } + void setVertexDecl( const GFXVertexDecl *decl ) override { } + void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override { } + void setVertexStreamFrequency( U32 stream, U32 frequency ) override { } public: - virtual GFXCubemap * createCubemap(); - virtual GFXCubemapArray *createCubemapArray(); - virtual GFXTextureArray *createTextureArray(); + GFXCubemap * createCubemap() override; + GFXCubemapArray *createCubemapArray() override; + GFXTextureArray *createTextureArray() override; - virtual F32 getFillConventionOffset() const { return 0.0f; }; + F32 getFillConventionOffset() const override { return 0.0f; }; ///@} - virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true){return NULL;}; - virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window) + GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true) override{return NULL;}; + GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override { return new GFXNullWindowTarget(); }; - virtual void _updateRenderTargets(){}; + void _updateRenderTargets() override{}; - virtual F32 getPixelShaderVersion() const { return 0.0f; }; - virtual void setPixelShaderVersion( F32 version ) { }; - virtual U32 getNumSamplers() const { return 0; }; - virtual U32 getNumRenderTargets() const { return 0; }; + F32 getPixelShaderVersion() const override { return 0.0f; }; + void setPixelShaderVersion( F32 version ) override { }; + U32 getNumSamplers() const override { return 0; }; + U32 getNumRenderTargets() const override { return 0; }; - virtual GFXShader* createShader() { return NULL; }; + GFXShader* createShader() override { return NULL; }; - virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) { }; - virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) { }; - virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color) { }; - virtual bool beginSceneInternal() { return true; }; - virtual void endSceneInternal() { }; + void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override { }; + void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override { }; + void clearColorAttachment(const U32 attachment, const LinearColorF& color) override { }; + bool beginSceneInternal() override { return true; }; + void endSceneInternal() override { }; - virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) { }; - virtual void drawIndexedPrimitive( GFXPrimitiveType primType, + void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override { }; + void drawIndexedPrimitive( GFXPrimitiveType primType, U32 startVertex, U32 minIndex, U32 numVerts, U32 startIndex, - U32 primitiveCount ) { }; + U32 primitiveCount ) override { }; - virtual void setClipRect( const RectI &rect ) { }; - virtual const RectI &getClipRect() const { return clip; }; + void setClipRect( const RectI &rect ) override { }; + const RectI &getClipRect() const override { return clip; }; - virtual void preDestroy() { Parent::preDestroy(); }; + void preDestroy() override { Parent::preDestroy(); }; - virtual U32 getMaxDynamicVerts() { return 16384; }; - virtual U32 getMaxDynamicIndices() { return 16384; }; + U32 getMaxDynamicVerts() override { return 16384; }; + U32 getMaxDynamicIndices() override { return 16384; }; - virtual GFXFormat selectSupportedFormat( GFXTextureProfile *profile, + GFXFormat selectSupportedFormat( GFXTextureProfile *profile, const Vector &formats, bool texture, bool mustblend, - bool mustfilter ) { return GFXFormatR8G8B8A8; }; + bool mustfilter ) override { return GFXFormatR8G8B8A8; }; - GFXFence *createFence() { return new GFXGeneralFence( this ); } - GFXOcclusionQuery* createOcclusionQuery() { return NULL; } + GFXFence *createFence() override { return new GFXGeneralFence( this ); } + GFXOcclusionQuery* createOcclusionQuery() override { return NULL; } private: typedef GFXDevice Parent; diff --git a/Engine/source/gfx/bitmap/ddsFile.h b/Engine/source/gfx/bitmap/ddsFile.h index 7aae54ff4..84b515f86 100644 --- a/Engine/source/gfx/bitmap/ddsFile.h +++ b/Engine/source/gfx/bitmap/ddsFile.h @@ -177,14 +177,14 @@ struct DDSFile static S32 smActiveCopies; DDSFile(): - mBytesPerPixel(0), mHeight(0), mWidth(0), mDepth(0), - mFormat(GFXFormat_FIRST), - mFourCC(0), + mPitchOrLinearSize(0), mMipMapCount(0), - mPitchOrLinearSize(0) + mFormat(GFXFormat_FIRST), + mBytesPerPixel(0), + mFourCC(0) { VECTOR_SET_ASSOCIATION( mSurfaces ); smActiveCopies++; diff --git a/Engine/source/gfx/bitmap/imageUtils.cpp b/Engine/source/gfx/bitmap/imageUtils.cpp index ed8d108da..3426eecd3 100644 --- a/Engine/source/gfx/bitmap/imageUtils.cpp +++ b/Engine/source/gfx/bitmap/imageUtils.cpp @@ -78,7 +78,7 @@ namespace ImageUtil : pSrc(srcRGBA),pDst(dst), width(w), height(h), format(compressFormat),quality(compressQuality) {} protected: - virtual void execute() + void execute() override { rawCompress(pSrc,pDst, width, height, format,quality); } diff --git a/Engine/source/gfx/gfxCubemap.h b/Engine/source/gfx/gfxCubemap.h index 5343deb0e..6c831a083 100644 --- a/Engine/source/gfx/gfxCubemap.h +++ b/Engine/source/gfx/gfxCubemap.h @@ -81,7 +81,7 @@ public: // GFXResource interface /// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer - virtual const String describeSelf() const; + const String describeSelf() const override; /// Get the number of mip maps const U32 getMipMapLevels() const { return mMipMapLevels; } @@ -147,7 +147,7 @@ public: /// Returns the format const GFXFormat getFormat() const { return mFormat; } - virtual const String describeSelf() const; + const String describeSelf() const override; }; /// A reference counted handle to a cubemap array resource. diff --git a/Engine/source/gfx/gfxFence.h b/Engine/source/gfx/gfxFence.h index 8130c3510..5855ab076 100644 --- a/Engine/source/gfx/gfxFence.h +++ b/Engine/source/gfx/gfxFence.h @@ -91,15 +91,15 @@ public: virtual ~GFXGeneralFence(); - virtual void issue(); - virtual FenceStatus getStatus() const { return GFXFence::Unsupported; }; - virtual void block(); + void issue() override; + FenceStatus getStatus() const override { return GFXFence::Unsupported; }; + void block() override; // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; /// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer - virtual const String describeSelf() const; + const String describeSelf() const override; }; #endif // _GFXFENCE_H_ \ No newline at end of file diff --git a/Engine/source/gfx/gfxOcclusionQuery.h b/Engine/source/gfx/gfxOcclusionQuery.h index f3537fccc..0b36b410c 100644 --- a/Engine/source/gfx/gfxOcclusionQuery.h +++ b/Engine/source/gfx/gfxOcclusionQuery.h @@ -77,9 +77,9 @@ public: static String statusToString( OcclusionQueryStatus status ); // GFXResource - virtual void zombify() = 0; - virtual void resurrect() = 0; - virtual const String describeSelf() const = 0; + void zombify() override = 0; + void resurrect() override = 0; + const String describeSelf() const override = 0; }; /// Handle for GFXOcclusionQuery than store last valid state diff --git a/Engine/source/gfx/gfxPrimitiveBuffer.h b/Engine/source/gfx/gfxPrimitiveBuffer.h index b7f202b5a..bebe6dd32 100644 --- a/Engine/source/gfx/gfxPrimitiveBuffer.h +++ b/Engine/source/gfx/gfxPrimitiveBuffer.h @@ -125,7 +125,7 @@ public: //protected: // GFXResource interface /// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer - virtual const String describeSelf() const; + const String describeSelf() const override; }; class GFXPrimitiveBufferHandle : public StrongRefPtr diff --git a/Engine/source/gfx/gfxShader.h b/Engine/source/gfx/gfxShader.h index 4edcdce7d..b7f23a9e3 100644 --- a/Engine/source/gfx/gfxShader.h +++ b/Engine/source/gfx/gfxShader.h @@ -374,7 +374,7 @@ public: const String& getPixelShaderFile() const { return mPixelFile.getFullPath(); } // GFXResource - const String describeSelf() const { return mDescription; } + const String describeSelf() const override { return mDescription; } // Get instancing vertex format GFXVertexFormat *getInstancingFormat() { return mInstancingFormat; } diff --git a/Engine/source/gfx/gfxStateBlock.h b/Engine/source/gfx/gfxStateBlock.h index 21ca5b4d5..570e804d1 100644 --- a/Engine/source/gfx/gfxStateBlock.h +++ b/Engine/source/gfx/gfxStateBlock.h @@ -202,7 +202,7 @@ public: virtual const GFXStateBlockDesc& getDesc() const = 0; /// Default implementation for GFXResource::describeSelf - virtual const String describeSelf() const; + const String describeSelf() const override; }; typedef StrongRefPtr GFXStateBlockRef; diff --git a/Engine/source/gfx/gfxTarget.h b/Engine/source/gfx/gfxTarget.h index 9d774d5f8..52dfcff1e 100644 --- a/Engine/source/gfx/gfxTarget.h +++ b/Engine/source/gfx/gfxTarget.h @@ -93,7 +93,7 @@ public: // GFXResourceInterface /// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer - virtual const String describeSelf() const; + const String describeSelf() const override; /// This is called to set the render target. virtual void activate() { } diff --git a/Engine/source/gfx/gfxTextureArray.h b/Engine/source/gfx/gfxTextureArray.h index 7f8b144a1..14fccf49b 100644 --- a/Engine/source/gfx/gfxTextureArray.h +++ b/Engine/source/gfx/gfxTextureArray.h @@ -54,11 +54,11 @@ public: // GFXResource interface - virtual void zombify() = 0; - virtual void resurrect() = 0; + void zombify() override = 0; + void resurrect() override = 0; virtual void Release(); - virtual const String describeSelf() const; + const String describeSelf() const override; GFXFormat mFormat; bool mIsCompressed; diff --git a/Engine/source/gfx/gfxTextureObject.h b/Engine/source/gfx/gfxTextureObject.h index bed37bdce..049b0d1c0 100644 --- a/Engine/source/gfx/gfxTextureObject.h +++ b/Engine/source/gfx/gfxTextureObject.h @@ -200,10 +200,10 @@ public: // GFXResource interface /// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer - virtual const String describeSelf() const; + const String describeSelf() const override; // StrongRefBase - virtual void destroySelf(); + void destroySelf() override; }; //----------------------------------------------------------------------------- diff --git a/Engine/source/gfx/gfxVertexBuffer.h b/Engine/source/gfx/gfxVertexBuffer.h index b37769ad5..68ccc8b52 100644 --- a/Engine/source/gfx/gfxVertexBuffer.h +++ b/Engine/source/gfx/gfxVertexBuffer.h @@ -86,7 +86,7 @@ public: virtual void prepare() = 0; // GFXResource - virtual const String describeSelf() const; + const String describeSelf() const override; }; diff --git a/Engine/source/gfx/gl/gfxGLAppleFence.h b/Engine/source/gfx/gl/gfxGLAppleFence.h index 6968e7fc6..8d36ff1e1 100644 --- a/Engine/source/gfx/gl/gfxGLAppleFence.h +++ b/Engine/source/gfx/gl/gfxGLAppleFence.h @@ -33,14 +33,14 @@ public: virtual ~GFXGLAppleFence(); // GFXFence interface - virtual void issue(); - virtual FenceStatus getStatus() const; - virtual void block(); + void issue() override; + FenceStatus getStatus() const override; + void block() override; // GFXResource interface - virtual void zombify(); - virtual void resurrect(); - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; private: GLuint mHandle; diff --git a/Engine/source/gfx/gl/gfxGLCardProfiler.h b/Engine/source/gfx/gl/gfxGLCardProfiler.h index 01d54d7ac..e32d26ecd 100644 --- a/Engine/source/gfx/gl/gfxGLCardProfiler.h +++ b/Engine/source/gfx/gl/gfxGLCardProfiler.h @@ -38,13 +38,13 @@ class GFXGLCardProfiler : public GFXCardProfiler { public: - void init(); + void init() override; protected: - virtual const String& getRendererString() const { return mRendererString; } - virtual void setupCardCapabilities(); - virtual bool _queryCardCap(const String& query, U32& foundResult); - virtual bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips); + const String& getRendererString() const override { return mRendererString; } + void setupCardCapabilities() override; + bool _queryCardCap(const String& query, U32& foundResult) override; + bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override; private: String mRendererString; diff --git a/Engine/source/gfx/gl/gfxGLCubemap.h b/Engine/source/gfx/gl/gfxGLCubemap.h index eeab2e4a1..4e889f856 100644 --- a/Engine/source/gfx/gl/gfxGLCubemap.h +++ b/Engine/source/gfx/gl/gfxGLCubemap.h @@ -40,13 +40,13 @@ public: GFXGLCubemap(); virtual ~GFXGLCubemap(); - virtual void initStatic( GFXTexHandle *faces ); - virtual void initStatic( DDSFile *dds ); - virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0); - virtual U32 getSize() const { return mWidth; } - virtual GFXFormat getFormat() const { return mFaceFormat; } + void initStatic( GFXTexHandle *faces ) override; + void initStatic( DDSFile *dds ) override; + void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override; + U32 getSize() const override { return mWidth; } + GFXFormat getFormat() const override { return mFaceFormat; } - virtual bool isInitialized() { return mCubemap != 0 ? true : false; } + bool isInitialized() override { return mCubemap != 0 ? true : false; } // Convenience methods for GFXGLTextureTarget U32 getWidth() { return mWidth; } @@ -54,8 +54,8 @@ public: U32 getHandle() { return mCubemap; } // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; /// Called by texCB; this is to ensure that all textures have been resurrected before we attempt to res the cubemap. void tmResurrect(); @@ -90,7 +90,7 @@ protected: Resource mDDSFile; // should only be called by GFXDevice - virtual void setToTexUnit( U32 tuNum ); ///< Binds the cubemap to the given texture unit + void setToTexUnit( U32 tuNum ) override; ///< Binds the cubemap to the given texture unit virtual void bind(U32 textureUnit) const; ///< Notifies our owning device that we want to be set to the given texture unit (used for GL internal state tracking) void fillCubeTextures(GFXTexHandle* faces); ///< Copies the textures in faces into the cubemap @@ -102,15 +102,15 @@ public: GFXGLCubemapArray(); virtual ~GFXGLCubemapArray(); //virtual void initStatic(GFXCubemapHandle *cubemaps, const U32 cubemapCount); - virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount); - virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format); - virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot); - virtual void copyTo(GFXCubemapArray *pDstCubemap); - virtual void setToTexUnit(U32 tuNum); + void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override; + void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override; + void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override; + void copyTo(GFXCubemapArray *pDstCubemap) override; + void setToTexUnit(U32 tuNum) override; // GFXResource interface - virtual void zombify() {} - virtual void resurrect() {} + void zombify() override {} + void resurrect() override {} protected: friend class GFXGLDevice; diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h index 981aff662..52f0a39e6 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.h +++ b/Engine/source/gfx/gl/gfxGLDevice.h @@ -74,26 +74,26 @@ public: static void enumerateAdapters( Vector &adapterList ); static GFXDevice *createInstance( U32 adapterIndex ); - virtual void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ); + void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override; virtual void activate() { } virtual void deactivate() { } - virtual GFXAdapterType getAdapterType() { return OpenGL; } + GFXAdapterType getAdapterType() override { return OpenGL; } - virtual void enterDebugEvent(ColorI color, const char *name); - virtual void leaveDebugEvent(); - virtual void setDebugMarker(ColorI color, const char *name); + void enterDebugEvent(ColorI color, const char *name) override; + void leaveDebugEvent() override; + void setDebugMarker(ColorI color, const char *name) override; - virtual void enumerateVideoModes(); + void enumerateVideoModes() override; virtual U32 getTotalVideoMemory_GL_EXT(); virtual U32 getTotalVideoMemory(); - virtual GFXCubemap * createCubemap(); - virtual GFXCubemapArray *createCubemapArray(); - virtual GFXTextureArray *createTextureArray(); + GFXCubemap * createCubemap() override; + GFXCubemapArray *createCubemapArray() override; + GFXTextureArray *createTextureArray() override; - virtual F32 getFillConventionOffset() const { return 0.0f; } + F32 getFillConventionOffset() const override { return 0.0f; } ///@} @@ -102,61 +102,61 @@ public: /// @{ /// - virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true); - virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window); - virtual void _updateRenderTargets(); + GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true) override; + GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override; + void _updateRenderTargets() override; ///@} /// @name Shader functions /// @{ - virtual F32 getPixelShaderVersion() const { return mPixelShaderVersion; } - virtual void setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; } + F32 getPixelShaderVersion() const override { return mPixelShaderVersion; } + void setPixelShaderVersion( F32 version ) override { mPixelShaderVersion = version; } - virtual void setShader(GFXShader *shader, bool force = false); + void setShader(GFXShader *shader, bool force = false) override; /// @attention GL cannot check if the given format supports blending or filtering! - virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile, - const Vector &formats, bool texture, bool mustblend, bool mustfilter); + GFXFormat selectSupportedFormat(GFXTextureProfile *profile, + const Vector &formats, bool texture, bool mustblend, bool mustfilter) override; /// Returns the number of texture samplers that can be used in a shader rendering pass - virtual U32 getNumSamplers() const; + U32 getNumSamplers() const override; /// Returns the number of simultaneous render targets supported by the device. - virtual U32 getNumRenderTargets() const; + U32 getNumRenderTargets() const override; - virtual GFXShader* createShader(); + GFXShader* createShader() override; //TODO: implement me! - virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face); - virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ); - virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color); - virtual bool beginSceneInternal(); - virtual void endSceneInternal(); + void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override; + void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override; + void clearColorAttachment(const U32 attachment, const LinearColorF& color) override; + bool beginSceneInternal() override; + void endSceneInternal() override; - virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ); + void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override; - virtual void drawIndexedPrimitive( GFXPrimitiveType primType, + void drawIndexedPrimitive( GFXPrimitiveType primType, U32 startVertex, U32 minIndex, U32 numVerts, U32 startIndex, - U32 primitiveCount ); + U32 primitiveCount ) override; - virtual void setClipRect( const RectI &rect ); - virtual const RectI &getClipRect() const { return mClip; } + void setClipRect( const RectI &rect ) override; + const RectI &getClipRect() const override { return mClip; } - virtual void preDestroy() { Parent::preDestroy(); } + void preDestroy() override { Parent::preDestroy(); } - virtual U32 getMaxDynamicVerts() { return GFX_MAX_DYNAMIC_VERTS; } - virtual U32 getMaxDynamicIndices() { return GFX_MAX_DYNAMIC_INDICES; } + U32 getMaxDynamicVerts() override { return GFX_MAX_DYNAMIC_VERTS; } + U32 getMaxDynamicIndices() override { return GFX_MAX_DYNAMIC_INDICES; } - GFXFence *createFence(); + GFXFence *createFence() override; - GFXOcclusionQuery* createOcclusionQuery(); + GFXOcclusionQuery* createOcclusionQuery() override; GFXGLStateBlockRef getCurrentStateBlock() { return mCurrentGLStateBlock; } - virtual void setupGenericShaders( GenericShaderType type = GSColor ); + void setupGenericShaders( GenericShaderType type = GSColor ) override; /// bool supportsAnisotropic() const { return mCapabilities.anisotropicFiltering; } @@ -169,17 +169,17 @@ public: const U32 getNumVertexStreams() const { return mNumVertexStream; } bool glUseMap() const { return mUseGlMap; } - const char* interpretDebugResult(long result) { return "Not Implemented"; }; + const char* interpretDebugResult(long result) override { return "Not Implemented"; }; protected: /// Called by GFXDevice to create a device specific stateblock - virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc); + GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override; /// Called by GFXDevice to actually set a stateblock. - virtual void setStateBlockInternal(GFXStateBlock* block, bool force); + void setStateBlockInternal(GFXStateBlock* block, bool force) override; /// Called by base GFXDevice to actually set a const buffer - virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer); + void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override; - virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture); + void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) override; virtual void setCubemapInternal(U32 textureUnit, const GFXGLCubemap* texture); virtual void setCubemapArrayInternal(U32 textureUnit, const GFXGLCubemapArray* texture); virtual void setTextureArrayInternal(U32 textureUnit, const GFXGLTextureArray* texture); @@ -189,24 +189,24 @@ protected: /// State initalization. This MUST BE CALLED in setVideoMode after the device /// is created. - virtual void initStates() { } + void initStates() override { } - virtual GFXVertexBuffer *allocVertexBuffer( U32 numVerts, + GFXVertexBuffer *allocVertexBuffer( U32 numVerts, const GFXVertexFormat *vertexFormat, U32 vertSize, GFXBufferType bufferType, - void* data = NULL); - virtual GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, void* data = NULL ); + void* data = NULL) override; + GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, void* data = NULL ) override; // NOTE: The GL device doesn't need a vertex declaration at // this time, but we need to return something to keep the system // from retrying to allocate one on every call. - virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ); + GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override; - virtual void setVertexDecl( const GFXVertexDecl *decl ); + void setVertexDecl( const GFXVertexDecl *decl ) override; - virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer ); - virtual void setVertexStreamFrequency( U32 stream, U32 frequency ); + void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override; + void setVertexStreamFrequency( U32 stream, U32 frequency ) override; StrongRefPtr mCurrentConstBuffer; DeviceBufferMap mDeviceBufferMap; diff --git a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h b/Engine/source/gfx/gl/gfxGLOcclusionQuery.h index efc290722..b603bdfa5 100644 --- a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h +++ b/Engine/source/gfx/gl/gfxGLOcclusionQuery.h @@ -33,14 +33,14 @@ public: GFXGLOcclusionQuery( GFXDevice *device ); virtual ~GFXGLOcclusionQuery(); - virtual bool begin(); - virtual void end(); - virtual OcclusionQueryStatus getStatus( bool block, U32 *data = NULL ); + bool begin() override; + void end() override; + OcclusionQueryStatus getStatus( bool block, U32 *data = NULL ) override; // GFXResource - virtual void zombify(); - virtual void resurrect(); - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; private: U32 mQuery; diff --git a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h index ad447804b..3fc0a30e0 100644 --- a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h +++ b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h @@ -33,16 +33,16 @@ public: GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType); ~GFXGLPrimitiveBuffer(); - virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); ///< only write lock are supported - virtual void unlock(); ///< - virtual void prepare(); ///< binds the buffer + void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; ///< only write lock are supported + void unlock() override; ///< + void prepare() override; ///< binds the buffer virtual void finish(); ///< We're done with this buffer virtual void* getBuffer(); ///< returns NULL // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; private: /// Handle to our GL buffer object diff --git a/Engine/source/gfx/gl/gfxGLShader.h b/Engine/source/gfx/gl/gfxGLShader.h index 1ca420b9e..45896e89e 100644 --- a/Engine/source/gfx/gl/gfxGLShader.h +++ b/Engine/source/gfx/gl/gfxGLShader.h @@ -69,15 +69,15 @@ public: virtual ~GFXGLShaderConstHandle(); const GFXShaderConstDesc getDesc(); - const String& getName() const { return mDesc.name; } - GFXShaderConstType getType() const { return mDesc.constType; } - U32 getArraySize() const { return mDesc.arraySize; } + const String& getName() const override { return mDesc.name; } + GFXShaderConstType getType() const override { return mDesc.constType; } + U32 getArraySize() const override { return mDesc.arraySize; } U32 getSize() const { return mDesc.size; } void setValid(bool valid) { mValid = valid; } /// @warning This will always return the value assigned when the shader was /// initialized. If the value is later changed this method won't reflect that. - S32 getSamplerRegister() const { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; } + S32 getSamplerRegister() const override { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; } // Returns true if this is a handle to a sampler register. bool isSampler() const @@ -117,32 +117,32 @@ public: void onShaderReload(GFXGLShader* shader); // GFXShaderConstBuffer - virtual GFXShader* getShader(); - virtual void set(GFXShaderConstHandle* handle, const F32 fv); - virtual void set(GFXShaderConstHandle* handle, const Point2F& fv); - virtual void set(GFXShaderConstHandle* handle, const Point3F& fv); - virtual void set(GFXShaderConstHandle* handle, const Point4F& fv); - virtual void set(GFXShaderConstHandle* handle, const PlaneF& fv); - virtual void set(GFXShaderConstHandle* handle, const LinearColorF& fv); - virtual void set(GFXShaderConstHandle* handle, const S32 f); - virtual void set(GFXShaderConstHandle* handle, const Point2I& fv); - virtual void set(GFXShaderConstHandle* handle, const Point3I& fv); - virtual void set(GFXShaderConstHandle* handle, const Point4I& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const AlignedArray& fv); - virtual void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4); - virtual void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4); + GFXShader* getShader() override; + void set(GFXShaderConstHandle* handle, const F32 fv) override; + void set(GFXShaderConstHandle* handle, const Point2F& fv) override; + void set(GFXShaderConstHandle* handle, const Point3F& fv) override; + void set(GFXShaderConstHandle* handle, const Point4F& fv) override; + void set(GFXShaderConstHandle* handle, const PlaneF& fv) override; + void set(GFXShaderConstHandle* handle, const LinearColorF& fv) override; + void set(GFXShaderConstHandle* handle, const S32 f) override; + void set(GFXShaderConstHandle* handle, const Point2I& fv) override; + void set(GFXShaderConstHandle* handle, const Point3I& fv) override; + void set(GFXShaderConstHandle* handle, const Point4I& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const AlignedArray& fv) override; + void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4) override; + void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; // GFXResource - virtual const String describeSelf() const; - virtual void zombify() {} - virtual void resurrect() {} + const String describeSelf() const override; + void zombify() override {} + void resurrect() override {} private: @@ -171,31 +171,31 @@ public: /// @name GFXShader interface /// @{ - virtual GFXShaderConstHandle* getShaderConstHandle(const String& name); - virtual GFXShaderConstHandle* findShaderConstHandle(const String& name); + GFXShaderConstHandle* getShaderConstHandle(const String& name) override; + GFXShaderConstHandle* findShaderConstHandle(const String& name) override; /// Returns our list of shader constants, the material can get this and just set the constants it knows about - virtual const Vector& getShaderConstDesc() const; + const Vector& getShaderConstDesc() const override; /// Returns the alignment value for constType - virtual U32 getAlignmentValue(const GFXShaderConstType constType) const; + U32 getAlignmentValue(const GFXShaderConstType constType) const override; - virtual GFXShaderConstBufferRef allocConstBuffer(); + GFXShaderConstBufferRef allocConstBuffer() override; /// @} /// @name GFXResource interface /// @{ - virtual void zombify(); - virtual void resurrect() { reload(); } - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override { reload(); } + const String describeSelf() const override; /// @} /// Activates this shader in the GL context. void useProgram(); protected: - virtual bool _init(); + bool _init() override; bool initShader(const Torque::Path& file, GFXShaderStage stage, diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.h b/Engine/source/gfx/gl/gfxGLStateBlock.h index 1a9ec9c3e..be19c583d 100644 --- a/Engine/source/gfx/gl/gfxGLStateBlock.h +++ b/Engine/source/gfx/gl/gfxGLStateBlock.h @@ -49,17 +49,17 @@ public: // /// Returns the hash value of the desc that created this block - virtual U32 getHashValue() const; + U32 getHashValue() const override; /// Returns a GFXStateBlockDesc that this block represents - virtual const GFXStateBlockDesc& getDesc() const; + const GFXStateBlockDesc& getDesc() const override; // // GFXResource // - virtual void zombify() { } + void zombify() override { } /// When called the resource should restore all device sensitive information destroyed by zombify() - virtual void resurrect() { } + void resurrect() override { } private: GFXStateBlockDesc mDesc; U32 mCachedHashValue; diff --git a/Engine/source/gfx/gl/gfxGLTextureManager.h b/Engine/source/gfx/gl/gfxGLTextureManager.h index 30f4ce1c6..5e5aaf529 100644 --- a/Engine/source/gfx/gl/gfxGLTextureManager.h +++ b/Engine/source/gfx/gl/gfxGLTextureManager.h @@ -45,12 +45,12 @@ protected: U32 numMipLevels, bool forceMips = false, S32 antialiasLevel = 0, - GFXTextureObject *inTex = NULL ); - bool _loadTexture(GFXTextureObject *texture, DDSFile *dds); - bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp); - bool _loadTexture(GFXTextureObject *texture, void *raw); - bool _refreshTexture(GFXTextureObject *texture); - bool _freeTexture(GFXTextureObject *texture, bool zombify = false); + GFXTextureObject *inTex = NULL ) override; + bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override; + bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override; + bool _loadTexture(GFXTextureObject *texture, void *raw) override; + bool _refreshTexture(GFXTextureObject *texture) override; + bool _freeTexture(GFXTextureObject *texture, bool zombify = false) override; private: friend class GFXGLTextureObject; diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.h b/Engine/source/gfx/gl/gfxGLTextureObject.h index f07cb9138..2bd7b1b7f 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.h +++ b/Engine/source/gfx/gl/gfxGLTextureObject.h @@ -53,28 +53,28 @@ public: /// @note You are responsible for deleting the returned data! (Use delete[]) U8* getTextureData( U32 mip = 0); - virtual F32 getMaxUCoord() const; - virtual F32 getMaxVCoord() const; + F32 getMaxUCoord() const override; + F32 getMaxVCoord() const override; void reloadFromCache(); ///< Reloads texture from zombie cache, used by GFXGLTextureManager to resurrect the texture. #ifdef TORQUE_DEBUG - virtual void pureVirtualCrash() {} + void pureVirtualCrash() override {} #endif /// Get/set data from texture (for dynamic textures and render targets) /// @attention DO NOT READ FROM THE RETURNED RECT! It is not guaranteed to work and may incur significant performance penalties. - virtual GFXLockedRect* lock(U32 mipLevel = 0, RectI *inRect = NULL); - virtual void unlock(U32 mipLevel = 0 ); + GFXLockedRect* lock(U32 mipLevel = 0, RectI *inRect = NULL) override; + void unlock(U32 mipLevel = 0 ) override; - virtual bool copyToBmp(GBitmap *); ///< Not implemented + bool copyToBmp(GBitmap *) override; ///< Not implemented bool mIsNPoT2; // GFXResource interface - virtual void zombify(); - virtual void resurrect(); - virtual const String describeSelf() const; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; void initSamplerState(const GFXSamplerStateDesc &ssd); diff --git a/Engine/source/gfx/gl/gfxGLTextureTarget.cpp b/Engine/source/gfx/gl/gfxGLTextureTarget.cpp index 4cfc47854..9a5661b3b 100644 --- a/Engine/source/gfx/gl/gfxGLTextureTarget.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureTarget.cpp @@ -69,14 +69,14 @@ public: virtual ~_GFXGLTextureTargetDesc() {} - virtual U32 getHandle() { return mTex->getHandle(); } - virtual U32 getWidth() { return mTex->getWidth(); } - virtual U32 getHeight() { return mTex->getHeight(); } - virtual U32 getDepth() { return mTex->getDepth(); } - virtual bool hasMips() { return mTex->mMipLevels != 1; } - virtual GLenum getBinding() { return mTex->getBinding(); } - virtual GFXFormat getFormat() { return mTex->getFormat(); } - virtual bool isCompatible(const GFXGLTextureObject* tex) + U32 getHandle() override { return mTex->getHandle(); } + U32 getWidth() override { return mTex->getWidth(); } + U32 getHeight() override { return mTex->getHeight(); } + U32 getDepth() override { return mTex->getDepth(); } + bool hasMips() override { return mTex->mMipLevels != 1; } + GLenum getBinding() override { return mTex->getBinding(); } + GFXFormat getFormat() override { return mTex->getFormat(); } + bool isCompatible(const GFXGLTextureObject* tex) override { return mTex->getFormat() == tex->getFormat() && mTex->getWidth() == tex->getWidth() @@ -99,14 +99,14 @@ public: virtual ~_GFXGLCubemapTargetDesc() {} - virtual U32 getHandle() { return mTex->getHandle(); } - virtual U32 getWidth() { return mTex->getWidth(); } - virtual U32 getHeight() { return mTex->getHeight(); } - virtual U32 getDepth() { return 0; } - virtual bool hasMips() { return mTex->getMipMapLevels() != 1; } - virtual GLenum getBinding() { return GFXGLCubemap::getEnumForFaceNumber(mFace); } - virtual GFXFormat getFormat() { return mTex->getFormat(); } - virtual bool isCompatible(const GFXGLTextureObject* tex) + U32 getHandle() override { return mTex->getHandle(); } + U32 getWidth() override { return mTex->getWidth(); } + U32 getHeight() override { return mTex->getHeight(); } + U32 getDepth() override { return 0; } + bool hasMips() override { return mTex->getMipMapLevels() != 1; } + GLenum getBinding() override { return GFXGLCubemap::getEnumForFaceNumber(mFace); } + GFXFormat getFormat() override { return mTex->getFormat(); } + bool isCompatible(const GFXGLTextureObject* tex) override { return mTex->getFormat() == tex->getFormat() && mTex->getWidth() == tex->getWidth() @@ -141,9 +141,9 @@ public: _GFXGLTextureTargetFBOImpl(GFXGLTextureTarget* target); virtual ~_GFXGLTextureTargetFBOImpl(); - virtual void applyState(); - virtual void makeActive(); - virtual void finish(); + void applyState() override; + void makeActive() override; + void finish() override; }; _GFXGLTextureTargetFBOImpl::_GFXGLTextureTargetFBOImpl(GFXGLTextureTarget* target) diff --git a/Engine/source/gfx/gl/gfxGLTextureTarget.h b/Engine/source/gfx/gl/gfxGLTextureTarget.h index 99b744082..605d7b29e 100644 --- a/Engine/source/gfx/gl/gfxGLTextureTarget.h +++ b/Engine/source/gfx/gl/gfxGLTextureTarget.h @@ -48,10 +48,10 @@ public: GFXGLTextureTarget(bool genMips); virtual ~GFXGLTextureTarget(); - virtual const Point2I getSize(); - virtual GFXFormat getFormat(); - virtual void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0); - virtual void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0); + const Point2I getSize() override; + GFXFormat getFormat() override; + void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0) override; + void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0) override; virtual void clearAttachments(); /// Functions to query internal state @@ -62,14 +62,14 @@ public: /// @} - void deactivate(); - void zombify(); - void resurrect(); - virtual const String describeSelf() const; + void deactivate() override; + void zombify() override; + void resurrect() override; + const String describeSelf() const override; - virtual void resolve(); + void resolve() override; - virtual void resolveTo(GFXTextureObject* obj); + void resolveTo(GFXTextureObject* obj) override; protected: diff --git a/Engine/source/gfx/gl/gfxGLVertexBuffer.h b/Engine/source/gfx/gl/gfxGLVertexBuffer.h index 571192b3b..a995da1a2 100644 --- a/Engine/source/gfx/gl/gfxGLVertexBuffer.h +++ b/Engine/source/gfx/gl/gfxGLVertexBuffer.h @@ -42,9 +42,9 @@ public: ~GFXGLVertexBuffer(); - virtual void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr); ///< Only write lock are supported. - virtual void unlock(); ///< - virtual void prepare(); ///< Do nothing. Use void prepare(U32 stream, U32 divisor). + void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override; ///< Only write lock are supported. + void unlock() override; ///< + void prepare() override; ///< Do nothing. Use void prepare(U32 stream, U32 divisor). virtual void finish(); ///< Do nothing. void prepare(U32 stream, U32 divisor); @@ -52,8 +52,8 @@ public: GLvoid* getBuffer(); ///< returns NULL // GFXResource interface - virtual void zombify(); - virtual void resurrect(); + void zombify() override; + void resurrect() override; private: friend class GFXGLDevice; diff --git a/Engine/source/gfx/gl/gfxGLWindowTarget.h b/Engine/source/gfx/gl/gfxGLWindowTarget.h index 823f5427f..297357bd8 100644 --- a/Engine/source/gfx/gl/gfxGLWindowTarget.h +++ b/Engine/source/gfx/gl/gfxGLWindowTarget.h @@ -32,22 +32,22 @@ public: GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d); ~GFXGLWindowTarget(); - const Point2I getSize() + const Point2I getSize() override { return mWindow->getClientExtent(); } - virtual GFXFormat getFormat() + GFXFormat getFormat() override { // TODO: Fix me! return GFXFormatR8G8B8A8_SRGB; } void makeActive(); - virtual bool present(); - virtual void resetMode(); - virtual void zombify() { } - virtual void resurrect() { } + bool present() override; + void resetMode() override; + void zombify() override { } + void resurrect() override { } - virtual void resolveTo(GFXTextureObject* obj); + void resolveTo(GFXTextureObject* obj) override; void _onAppSignal(WindowId wnd, S32 event); diff --git a/Engine/source/gfx/gl/screenshotGL.h b/Engine/source/gfx/gl/screenshotGL.h index 028e9d351..442d8bb0f 100644 --- a/Engine/source/gfx/gl/screenshotGL.h +++ b/Engine/source/gfx/gl/screenshotGL.h @@ -31,7 +31,7 @@ class ScreenShotGL : public ScreenShot { protected: - GBitmap* _captureBackBuffer(); + GBitmap* _captureBackBuffer() override; }; diff --git a/Engine/source/gfx/sim/cubemapData.h b/Engine/source/gfx/sim/cubemapData.h index b6f97a2f9..dd35918e2 100644 --- a/Engine/source/gfx/sim/cubemapData.h +++ b/Engine/source/gfx/sim/cubemapData.h @@ -53,7 +53,7 @@ public: CubemapData(); ~CubemapData(); - bool onAdd(); + bool onAdd() override; static void initPersistFields(); DECLARE_CONOBJECT(CubemapData); diff --git a/Engine/source/gfx/sim/gfxStateBlockData.h b/Engine/source/gfx/sim/gfxStateBlockData.h index 7fb7731c6..061301a00 100644 --- a/Engine/source/gfx/sim/gfxStateBlockData.h +++ b/Engine/source/gfx/sim/gfxStateBlockData.h @@ -43,7 +43,7 @@ public: GFXStateBlockData(); // SimObject - virtual bool onAdd(); + bool onAdd() override; static void initPersistFields(); // GFXStateBlockData diff --git a/Engine/source/gfx/video/theoraTexture.h b/Engine/source/gfx/video/theoraTexture.h index 29341db0f..8c0748068 100644 --- a/Engine/source/gfx/video/theoraTexture.h +++ b/Engine/source/gfx/video/theoraTexture.h @@ -171,7 +171,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >, TheoraTextureFrame* mFrame; // WorkItem. - virtual void execute(); + void execute() override; public: @@ -293,8 +293,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >, private: // IPositionable. - virtual U32 getPosition() const { return mCurrentTime; } - virtual void setPosition( U32 pos ) {} + U32 getPosition() const override { return mCurrentTime; } + void setPosition( U32 pos ) override {} }; /// The Theora video file. @@ -351,7 +351,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >, void _onTextureEvent( GFXTexCallbackCode code ); // IOutputStream. - virtual void write( TheoraTextureFrame* const* frames, U32 num ); + void write( TheoraTextureFrame* const* frames, U32 num ) override; public: @@ -410,8 +410,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >, GFXTexHandle& getTexture() { return mCurrentFrame->mTexture; } // IPositionable. - virtual U32 getPosition() const { return _getTimeSource()->getPosition(); } - virtual void setPosition( U32 pos ) {} // Not (yet?) implemented. + U32 getPosition() const override { return _getTimeSource()->getPosition(); } + void setPosition( U32 pos ) override {} // Not (yet?) implemented. }; #endif // TORQUE_OGGTHEORA diff --git a/Engine/source/gfx/video/theoraTextureObject.h b/Engine/source/gfx/video/theoraTextureObject.h index 74d7f066c..48cbe5fd1 100644 --- a/Engine/source/gfx/video/theoraTextureObject.h +++ b/Engine/source/gfx/video/theoraTextureObject.h @@ -82,8 +82,8 @@ public: // SimObject. DECLARE_CONOBJECT( TheoraTextureObject ); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); }; diff --git a/Engine/source/gfx/video/videoEncoderPNG.cpp b/Engine/source/gfx/video/videoEncoderPNG.cpp index b6375a8ca..4c8db65fd 100644 --- a/Engine/source/gfx/video/videoEncoderPNG.cpp +++ b/Engine/source/gfx/video/videoEncoderPNG.cpp @@ -33,7 +33,7 @@ class VideoEncoderPNG : public VideoEncoder public: /// Begins accepting frames for encoding - bool begin() + bool begin() override { mPath += "\\"; mCurrentFrame = 0; @@ -42,7 +42,7 @@ public: } /// Pushes a new frame into the video stream - bool pushFrame( GBitmap * bitmap ) + bool pushFrame( GBitmap * bitmap ) override { String framePath = mPath + String::ToString("%.6u.png", mCurrentFrame); @@ -56,12 +56,12 @@ public: } /// Finishes the encoding and closes the video - bool end() + bool end() override { return true; } - void setResolution( Point2I* resolution ) + void setResolution( Point2I* resolution ) override { mResolution = *resolution; } diff --git a/Engine/source/gfx/video/videoEncoderTheora.cpp b/Engine/source/gfx/video/videoEncoderTheora.cpp index ef88787f8..4133ee19b 100644 --- a/Engine/source/gfx/video/videoEncoderTheora.cpp +++ b/Engine/source/gfx/video/videoEncoderTheora.cpp @@ -203,7 +203,7 @@ public: setStatus(false); } - virtual void run( void* arg ) + void run( void* arg ) override { _setName( "TheoraEncoderThread" ); while (!checkForStop()) @@ -214,7 +214,7 @@ public: } /// Begins accepting frames for encoding - bool begin() + bool begin() override { mPath += ".ogv"; mCurrentFrame = 0; @@ -340,7 +340,7 @@ public: } /// Pushes a new frame into the video stream - bool pushFrame( GBitmap * bitmap ) + bool pushFrame( GBitmap * bitmap ) override { // Push the bitmap into the frame list @@ -356,7 +356,7 @@ public: } /// Finishes the encoding and closes the video - bool end() + bool end() override { //Let's wait the thread stop doing whatever it needs to do stop(); @@ -375,7 +375,7 @@ public: } - void setResolution( Point2I* resolution ) + void setResolution( Point2I* resolution ) override { /* Theora has a divisible-by-sixteen restriction for the encoded frame size */ /* scale the picture size up to the nearest /16 and calculate offsets */ diff --git a/Engine/source/gui/3d/guiTSControl.h b/Engine/source/gui/3d/guiTSControl.h index b35d2630a..a596952d7 100644 --- a/Engine/source/gui/3d/guiTSControl.h +++ b/Engine/source/gui/3d/guiTSControl.h @@ -122,9 +122,9 @@ public: GuiTSCtrl(); - void onPreRender(); + void onPreRender() override; void _internalRender(RectI guiViewport, RectI renderViewport, Frustum &frustum); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; virtual bool processCameraQuery(CameraQuery *query); /// Subclasses can override this to perform 3D rendering. @@ -136,8 +136,8 @@ public: static void initPersistFields(); static void consoleInit(); - virtual bool onWake(); - virtual void onSleep(); + bool onWake() override; + void onSleep() override; /// Returns the last World Matrix set in onRender. const MatrixF& getLastWorldMatrix() const { return mSaveModelview; } diff --git a/Engine/source/gui/buttons/guiBitmapButtonCtrl.h b/Engine/source/gui/buttons/guiBitmapButtonCtrl.h index e605b15b1..8674432ec 100644 --- a/Engine/source/gui/buttons/guiBitmapButtonCtrl.h +++ b/Engine/source/gui/buttons/guiBitmapButtonCtrl.h @@ -172,15 +172,15 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl void setBitmapHandles( GFXTexHandle normal, GFXTexHandle highlighted, GFXTexHandle depressed, GFXTexHandle inactive ); //Parent methods - virtual bool onWake(); - virtual void onSleep(); - virtual void onAction(); - virtual void inspectPostApply(); + bool onWake() override; + void onSleep() override; + void onAction() override; + void inspectPostApply() override; - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); - bool pointInControl(const Point2I& parentCoordPoint); + bool pointInControl(const Point2I& parentCoordPoint) override; DECLARE_CONOBJECT(GuiBitmapButtonCtrl); DECLARE_DESCRIPTION( "A button control rendered entirely from bitmaps.\n" @@ -207,7 +207,7 @@ class GuiBitmapButtonTextCtrl : public GuiBitmapButtonCtrl protected: - virtual void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect ); + void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect ) override; public: diff --git a/Engine/source/gui/buttons/guiBorderButton.cpp b/Engine/source/gui/buttons/guiBorderButton.cpp index 24f4a50f3..a74ac60fe 100644 --- a/Engine/source/gui/buttons/guiBorderButton.cpp +++ b/Engine/source/gui/buttons/guiBorderButton.cpp @@ -37,7 +37,7 @@ protected: public: DECLARE_CONOBJECT(GuiBorderButtonCtrl); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; }; IMPLEMENT_CONOBJECT(GuiBorderButtonCtrl); diff --git a/Engine/source/gui/buttons/guiButtonBaseCtrl.h b/Engine/source/gui/buttons/guiButtonBaseCtrl.h index f6f5dddc7..cf9566f0c 100644 --- a/Engine/source/gui/buttons/guiButtonBaseCtrl.h +++ b/Engine/source/gui/buttons/guiButtonBaseCtrl.h @@ -80,7 +80,7 @@ protected: public: GuiButtonBaseCtrl(); - bool onWake(); + bool onWake() override; DECLARE_CONOBJECT(GuiButtonBaseCtrl); DECLARE_CATEGORY("Gui Buttons"); @@ -101,25 +101,25 @@ public: void setHighlighted(bool highlighted); bool isHighlighted() { return mHighlighted; } - void acceleratorKeyPress(U32 index); - void acceleratorKeyRelease(U32 index); + void acceleratorKeyPress(U32 index) override; + void acceleratorKeyRelease(U32 index) override; - void onMouseDown(const GuiEvent&); - void onMouseUp(const GuiEvent&); - void onMouseDragged(const GuiEvent& event); - void onRightMouseUp(const GuiEvent&); + void onMouseDown(const GuiEvent&) override; + void onMouseUp(const GuiEvent&) override; + void onMouseDragged(const GuiEvent& event) override; + void onRightMouseUp(const GuiEvent&) override; - void onMouseEnter(const GuiEvent&); - void onMouseLeave(const GuiEvent&); + void onMouseEnter(const GuiEvent&) override; + void onMouseLeave(const GuiEvent&) override; - bool onKeyDown(const GuiEvent& event); - bool onKeyUp(const GuiEvent& event); + bool onKeyDown(const GuiEvent& event) override; + bool onKeyUp(const GuiEvent& event) override; - void setScriptValue(const char* value); - const char* getScriptValue(); + void setScriptValue(const char* value) override; + const char* getScriptValue() override; - void onMessage(GuiControl*, S32 msg); - void onAction(); + void onMessage(GuiControl*, S32 msg) override; + void onAction() override; bool usesMouseEvents() const { return mUseMouseEvents; } void setUseMouseEvents(bool val) { mUseMouseEvents = val; } diff --git a/Engine/source/gui/buttons/guiButtonCtrl.h b/Engine/source/gui/buttons/guiButtonCtrl.h index 475b16bd5..e966f60b2 100644 --- a/Engine/source/gui/buttons/guiButtonCtrl.h +++ b/Engine/source/gui/buttons/guiButtonCtrl.h @@ -35,8 +35,8 @@ protected: public: DECLARE_CONOBJECT(GuiButtonCtrl); GuiButtonCtrl(); - bool onWake(); - void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onRender(Point2I offset, const RectI &updateRect) override; }; #endif //_GUI_BUTTON_CTRL_H diff --git a/Engine/source/gui/buttons/guiCheckBoxCtrl.h b/Engine/source/gui/buttons/guiCheckBoxCtrl.h index d01ee65c4..190fafdbe 100644 --- a/Engine/source/gui/buttons/guiCheckBoxCtrl.h +++ b/Engine/source/gui/buttons/guiCheckBoxCtrl.h @@ -46,8 +46,8 @@ class GuiCheckBoxCtrl : public GuiButtonBaseCtrl S32 getIndent() const { return mIndent; } void setIndent( S32 value ) { mIndent = value; } - void onRender( Point2I offset, const RectI &updateRect ); - bool onWake(); + void onRender( Point2I offset, const RectI &updateRect ) override; + bool onWake() override; void autoSize(); diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.h b/Engine/source/gui/buttons/guiIconButtonCtrl.h index 492602397..d4b00bfbc 100644 --- a/Engine/source/gui/buttons/guiIconButtonCtrl.h +++ b/Engine/source/gui/buttons/guiIconButtonCtrl.h @@ -103,18 +103,18 @@ public: static void initPersistFields(); //Parent methods - bool onWake(); - void onSleep(); - void inspectPostApply(); - void onStaticModified(const char* slotName, const char* newValue = NULL); - bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool onWake() override; + void onSleep() override; + void inspectPostApply() override; + void onStaticModified(const char* slotName, const char* newValue = NULL) override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; void setBitmap(const char *name); // Used to set the optional error bitmap void setErrorBitmap(const char *name); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; void onImageChanged() {} }; diff --git a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h index ac7b2f992..e457eb4f2 100644 --- a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h +++ b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h @@ -57,8 +57,8 @@ class GuiSwatchButtonCtrl : public GuiButtonBaseCtrl void setColor( const LinearColorF &color ) { mSwatchColor = color; } // GuiButtonBaseCtrl - virtual bool onWake(); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); diff --git a/Engine/source/gui/buttons/guiToggleButtonCtrl.h b/Engine/source/gui/buttons/guiToggleButtonCtrl.h index 6b379224e..e8ae9f860 100644 --- a/Engine/source/gui/buttons/guiToggleButtonCtrl.h +++ b/Engine/source/gui/buttons/guiToggleButtonCtrl.h @@ -34,8 +34,8 @@ public: DECLARE_CONOBJECT(GuiToggleButtonCtrl); GuiToggleButtonCtrl(); - virtual void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; }; #endif //_GUITOGGLEBUTTONCTRL_H_ diff --git a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h index fd3e360ad..9d56308ad 100644 --- a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h +++ b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h @@ -60,16 +60,16 @@ public: static void initPersistFields(); //Parent methods - bool onWake(); - void onSleep(); - void inspectPostApply(); + bool onWake() override; + void onSleep() override; + void inspectPostApply() override; void setNormalBitmap( StringTableEntry bitmapName ); void setLoweredBitmap( StringTableEntry bitmapName ); void setHoverBitmap( StringTableEntry bitmapName ); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; }; diff --git a/Engine/source/gui/containers/guiAutoScrollCtrl.h b/Engine/source/gui/containers/guiAutoScrollCtrl.h index 6e63fadf4..7c5b6d167 100644 --- a/Engine/source/gui/containers/guiAutoScrollCtrl.h +++ b/Engine/source/gui/containers/guiAutoScrollCtrl.h @@ -136,17 +136,17 @@ class GuiAutoScrollCtrl : public GuiTickCtrl void reset(); - virtual bool onWake(); - virtual void onSleep(); + bool onWake() override; + void onSleep() override; - virtual void onChildAdded( GuiControl* control ); - virtual void onChildRemoved( GuiControl* control ); - virtual bool resize( const Point2I& newPosition, const Point2I& newExtent ); - virtual void childResized( GuiControl *child ); + void onChildAdded( GuiControl* control ) override; + void onChildRemoved( GuiControl* control ) override; + bool resize( const Point2I& newPosition, const Point2I& newExtent ) override; + void childResized( GuiControl *child ) override; - virtual void processTick(); - virtual void advanceTime( F32 timeDelta ); - virtual void inspectPostApply(); + void processTick() override; + void advanceTime( F32 timeDelta ) override; + void inspectPostApply() override; static void initPersistFields(); diff --git a/Engine/source/gui/containers/guiContainer.h b/Engine/source/gui/containers/guiContainer.h index b7ead281e..4c79846b9 100644 --- a/Engine/source/gui/containers/guiContainer.h +++ b/Engine/source/gui/containers/guiContainer.h @@ -133,21 +133,21 @@ class GuiContainer : public GuiControl /// @name GuiControl Inherited /// @{ - virtual void onChildAdded(GuiControl* control); - virtual void onChildRemoved(GuiControl* control); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); - virtual void childResized(GuiControl *child); - virtual void addObject(SimObject *obj); - virtual void removeObject(SimObject *obj); - virtual bool reOrder(SimObject* obj, SimObject* target); - virtual void onPreRender(); + void onChildAdded(GuiControl* control) override; + void onChildRemoved(GuiControl* control) override; + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; + void childResized(GuiControl *child) override; + void addObject(SimObject *obj) override; + void removeObject(SimObject *obj) override; + bool reOrder(SimObject* obj, SimObject* target) override; + void onPreRender() override; /// GuiContainer deals with parentResized calls differently than GuiControl. It will /// update the layout for all of it's non-docked child controls. parentResized calls /// on the child controls will be handled by their default functions, but for our /// purposes we want at least our immediate children to use the anchors that they have /// set on themselves. - JDD [9/20/2006] - virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect); + void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override; /// @} }; diff --git a/Engine/source/gui/containers/guiCtrlArrayCtrl.h b/Engine/source/gui/containers/guiCtrlArrayCtrl.h index c3bfbf425..9e040dcef 100644 --- a/Engine/source/gui/containers/guiCtrlArrayCtrl.h +++ b/Engine/source/gui/containers/guiCtrlArrayCtrl.h @@ -47,18 +47,18 @@ private: public: GuiControlArrayControl(); - bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; - bool onWake(); - void onSleep(); - void inspectPostApply(); + bool onWake() override; + void onSleep() override; + void inspectPostApply() override; bool updateArray(); - void addObject(SimObject *obj); - void removeObject(SimObject *obj); + void addObject(SimObject *obj) override; + void removeObject(SimObject *obj) override; - bool reOrder(SimObject* obj, SimObject* target = 0); + bool reOrder(SimObject* obj, SimObject* target = 0) override; static void initPersistFields(); DECLARE_CONOBJECT(GuiControlArrayControl); diff --git a/Engine/source/gui/containers/guiDragAndDropCtrl.h b/Engine/source/gui/containers/guiDragAndDropCtrl.h index a9806a7ee..74d9e298a 100644 --- a/Engine/source/gui/containers/guiDragAndDropCtrl.h +++ b/Engine/source/gui/containers/guiDragAndDropCtrl.h @@ -72,9 +72,9 @@ class GuiDragAndDropControl : public GuiControl void startDragging(Point2I offset = Point2I(0, 0)); // GuiControl. - virtual void onMouseDown(const GuiEvent& event); - virtual void onMouseDragged(const GuiEvent& event); - virtual void onMouseUp(const GuiEvent& event); + void onMouseDown(const GuiEvent& event) override; + void onMouseDragged(const GuiEvent& event) override; + void onMouseUp(const GuiEvent& event) override; static void initPersistFields(); diff --git a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h index 8a39b1872..4dcca66d7 100644 --- a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h +++ b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h @@ -47,14 +47,14 @@ public: static void initPersistFields(); // SimObject - void inspectPostApply(); + void inspectPostApply() override; // SimSet - void addObject(SimObject *obj); + void addObject(SimObject *obj) override; // GuiControl - bool resize(const Point2I &newPosition, const Point2I &newExtent); - void childResized(GuiControl *child); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void childResized(GuiControl *child) override; // GuiDynamicCtrlArrayCtrl void refresh(); diff --git a/Engine/source/gui/containers/guiFormCtrl.h b/Engine/source/gui/containers/guiFormCtrl.h index 255053127..c33596220 100644 --- a/Engine/source/gui/containers/guiFormCtrl.h +++ b/Engine/source/gui/containers/guiFormCtrl.h @@ -95,21 +95,21 @@ public: void setCaption( const char* caption ) { mCaption = caption; } void setHasMenu( bool value ); - bool resize(const Point2I &newPosition, const Point2I &newExtent); - void onRender(Point2I offset, const RectI &updateRect); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void onRender(Point2I offset, const RectI &updateRect) override; - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; - virtual void addObject( SimObject *object ); - virtual void removeObject( SimObject* object ); - virtual bool acceptsAsChild( SimObject* object ) const; + void addObject( SimObject *object ) override; + void removeObject( SimObject* object ) override; + bool acceptsAsChild( SimObject* object ) const override; - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseMove(const GuiEvent &event); - void onMouseLeave(const GuiEvent &event); - void onMouseEnter(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; U32 getMenuBarID(); diff --git a/Engine/source/gui/containers/guiFrameCtrl.h b/Engine/source/gui/containers/guiFrameCtrl.h index 8f5ff99db..52357cb58 100644 --- a/Engine/source/gui/containers/guiFrameCtrl.h +++ b/Engine/source/gui/containers/guiFrameCtrl.h @@ -99,17 +99,17 @@ public: GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[] = NULL, const U32 rowOffsets[] = NULL); virtual ~GuiFrameSetCtrl(); - void addObject(SimObject *obj); - void removeObject(SimObject *obj); + void addObject(SimObject *obj) override; + void removeObject(SimObject *obj) override; - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; - bool onAdd(); - void onRender(Point2I offset, const RectI &updateRect ); + bool onAdd() override; + void onRender(Point2I offset, const RectI &updateRect ) override; protected: /* member variables */ Vector mColumnOffsets; @@ -133,7 +133,7 @@ protected: bool hitVerticalDivider(S32 x, const Point2I &point); bool hitHorizontalDivider(S32 y, const Point2I &point); - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; void rebalance(const Point2I &newExtent); void computeSizes(bool balanceFrames = false); @@ -159,7 +159,7 @@ public: void balanceFrames() { computeSizes(true); } void updateSizes() { computeSizes(); } - bool onWake(); + bool onWake() override; private: GuiFrameSetCtrl(const GuiFrameSetCtrl &); diff --git a/Engine/source/gui/containers/guiPaneCtrl.h b/Engine/source/gui/containers/guiPaneCtrl.h index aaec12d29..9a3bd0901 100644 --- a/Engine/source/gui/containers/guiPaneCtrl.h +++ b/Engine/source/gui/containers/guiPaneCtrl.h @@ -97,16 +97,16 @@ class GuiPaneControl : public GuiControl virtual void setCaptionID(const char *id); // GuiControl. - virtual bool onWake(); + bool onWake() override; - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseMove(const GuiEvent &event); - virtual void onMouseLeave(const GuiEvent &event); - virtual void onMouseEnter(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); diff --git a/Engine/source/gui/containers/guiPanel.h b/Engine/source/gui/containers/guiPanel.h index da75a6175..ac9bc0693 100644 --- a/Engine/source/gui/containers/guiPanel.h +++ b/Engine/source/gui/containers/guiPanel.h @@ -52,8 +52,8 @@ public: DECLARE_CONOBJECT(GuiPanel); // GuiControl - void onRender(Point2I offset, const RectI &updateRect); - void setVisible(bool value) { Parent::setVisible(value); setUpdateLayout( updateParent ); } + void onRender(Point2I offset, const RectI &updateRect) override; + void setVisible(bool value) override { Parent::setVisible(value); setUpdateLayout( updateParent ); } }; /// @} diff --git a/Engine/source/gui/containers/guiRolloutCtrl.h b/Engine/source/gui/containers/guiRolloutCtrl.h index 3d48c49b9..f9706fd6a 100644 --- a/Engine/source/gui/containers/guiRolloutCtrl.h +++ b/Engine/source/gui/containers/guiRolloutCtrl.h @@ -118,7 +118,7 @@ class GuiRolloutCtrl : public GuiTickCtrl DECLARE_CALLBACK( void, onCollapsed, () ); /// @} - virtual void processTick(); + void processTick() override; public: @@ -134,20 +134,20 @@ class GuiRolloutCtrl : public GuiTickCtrl static void initPersistFields(); // Control Events - bool onWake(); - void addObject(SimObject *obj); - void removeObject(SimObject *obj); - virtual void childResized(GuiControl *child); + bool onWake() override; + void addObject(SimObject *obj) override; + void removeObject(SimObject *obj) override; + void childResized(GuiControl *child) override; // Mouse Events - virtual void onMouseDown( const GuiEvent& event ); - virtual void onMouseUp( const GuiEvent& event ); - virtual void onRightMouseUp( const GuiEvent& event ); - virtual bool onMouseUpEditor( const GuiEvent& event, Point2I offset ); + void onMouseDown( const GuiEvent& event ) override; + void onMouseUp( const GuiEvent& event ) override; + void onRightMouseUp( const GuiEvent& event ) override; + bool onMouseUpEditor( const GuiEvent& event, Point2I offset ) override; // Sizing Helpers virtual void calculateHeights(); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; virtual void sizeToContents(); inline bool isExpanded() const { return mIsExpanded; } @@ -172,8 +172,8 @@ class GuiRolloutCtrl : public GuiTickCtrl void setCanCollapse( bool value ) { mCanCollapse = value; } // Control Rendering - virtual void onRender(Point2I offset, const RectI &updateRect); - bool onAdd(); + void onRender(Point2I offset, const RectI &updateRect) override; + bool onAdd() override; }; #endif // _GUI_ROLLOUTCTRL_H_ \ No newline at end of file diff --git a/Engine/source/gui/containers/guiScrollCtrl.h b/Engine/source/gui/containers/guiScrollCtrl.h index 6ca280d04..2a13c4094 100644 --- a/Engine/source/gui/containers/guiScrollCtrl.h +++ b/Engine/source/gui/containers/guiScrollCtrl.h @@ -219,9 +219,9 @@ class GuiScrollCtrl : public GuiContainer // you can change the bitmap array dynamically. void loadBitmapArray(); - void addObject(SimObject *obj); - bool resize(const Point2I &newPosition, const Point2I &newExtent); - void childResized(GuiControl *child); + void addObject(SimObject *obj) override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void childResized(GuiControl *child) override; Point2I getChildPos() { return mChildPos; } Point2I getChildRelPos() { return mChildRelPos; }; Point2I getChildExtent() { return mChildExt; } @@ -244,24 +244,24 @@ class GuiScrollCtrl : public GuiContainer Region getCurHitRegion(void) { return mHitRegion; } // GuiControl - virtual bool onKeyDown(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual bool onMouseDownEditor( const GuiEvent& event, Point2I offset ); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual bool onMouseWheelUp(const GuiEvent &event); - virtual bool onMouseWheelDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + bool onMouseDownEditor( const GuiEvent& event, Point2I offset ) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; - virtual bool onWake(); - virtual void onSleep(); + bool onWake() override; + void onSleep() override; - virtual void onPreRender(); - virtual void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; virtual void drawBorder(const Point2I &offset, bool isFirstResponder); virtual void drawVScrollBar(const Point2I &offset); virtual void drawHScrollBar(const Point2I &offset); virtual void drawScrollCorner(const Point2I &offset); - virtual GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1); + GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override; static void initPersistFields(); diff --git a/Engine/source/gui/containers/guiSplitContainer.h b/Engine/source/gui/containers/guiSplitContainer.h index ab78fb0ff..3ac1c108e 100644 --- a/Engine/source/gui/containers/guiSplitContainer.h +++ b/Engine/source/gui/containers/guiSplitContainer.h @@ -68,24 +68,24 @@ public: // ConsoleObject static void initPersistFields(); - virtual bool onAdd(); + bool onAdd() override; // GuiControl - virtual bool onWake(); - virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); - virtual void onRender(Point2I offset, const RectI &updateRect); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); + bool onWake() override; + void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override; + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; + void onRender(Point2I offset, const RectI &updateRect) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; - virtual bool layoutControls( RectI &clientRect ); - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + bool layoutControls( RectI &clientRect ) override; + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; virtual inline Point2I getSplitPoint() { return mSplitPoint; }; /// The Splitters entire Client Rectangle, this takes into account padding of this control virtual inline RectI getSplitRect() { return mSplitRect; }; virtual void solvePanelConstraints(Point2I newDragPos, GuiContainer * firstPanel, GuiContainer * secondPanel, const RectI& clientRect); - virtual Point2I getMinExtent() const; + Point2I getMinExtent() const override; //Set the positin of the split handler void setSplitPoint(Point2I splitPoint); diff --git a/Engine/source/gui/containers/guiStackCtrl.h b/Engine/source/gui/containers/guiStackCtrl.h index 9b3209ddb..38ee859b1 100644 --- a/Engine/source/gui/containers/guiStackCtrl.h +++ b/Engine/source/gui/containers/guiStackCtrl.h @@ -73,14 +73,14 @@ public: vertStackBottom, ///< Stack from bottom to top when vertical }; - bool resize(const Point2I &newPosition, const Point2I &newExtent); - void childResized(GuiControl *child); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void childResized(GuiControl *child) override; bool isFrozen() { return mResizing; }; /// prevent resizing. useful when adding many items. void freeze(bool); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; void updatePanes(); @@ -89,10 +89,10 @@ public: S32 getCount() { return size(); }; /// Returns the number of children in the stack - void addObject(SimObject *obj); - void removeObject(SimObject *obj); + void addObject(SimObject *obj) override; + void removeObject(SimObject *obj) override; - bool reOrder(SimObject* obj, SimObject* target = 0); + bool reOrder(SimObject* obj, SimObject* target = 0) override; static void initPersistFields(); diff --git a/Engine/source/gui/containers/guiTabBookCtrl.h b/Engine/source/gui/containers/guiTabBookCtrl.h index 38ae2c69d..12140587f 100644 --- a/Engine/source/gui/containers/guiTabBookCtrl.h +++ b/Engine/source/gui/containers/guiTabBookCtrl.h @@ -133,18 +133,18 @@ class GuiTabBookCtrl : public GuiContainer /// @name Control Events /// @{ - bool onWake(); - void onRender( Point2I offset, const RectI &updateRect ); + bool onWake() override; + void onRender( Point2I offset, const RectI &updateRect ) override; /// @} /// @name Child events /// @{ - void onChildRemoved( GuiControl* child ); - void onChildAdded( GuiControl *child ); - bool reOrder(SimObject* obj, SimObject* target); - bool acceptsAsChild( SimObject* object ) const; + void onChildRemoved( GuiControl* child ) override; + void onChildAdded( GuiControl *child ) override; + bool reOrder(SimObject* obj, SimObject* target) override; + bool acceptsAsChild( SimObject* object ) const override; /// @} @@ -203,7 +203,7 @@ class GuiTabBookCtrl : public GuiContainer /// @{ /// Update ourselves by hooking common GuiControl functionality. - void setUpdate(); + void setUpdate() override; /// Balance a top/bottom tab row void balanceRow( S32 row, S32 totalTabWidth ); @@ -218,7 +218,7 @@ class GuiTabBookCtrl : public GuiContainer void calculatePageTabs(); /// Get client area of tab book - virtual const RectI getClientRect(); + const RectI getClientRect() override; /// Find the tab that was hit by the current event, if any /// @param event The GuiEvent that caused this function call @@ -240,7 +240,7 @@ class GuiTabBookCtrl : public GuiContainer /// /// @param newPosition The new position of the control /// @param newExtent The new extent of the control - bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; /// Called when a child page is resized /// This method is overridden so that we may handle resizing of our child tab @@ -248,23 +248,23 @@ class GuiTabBookCtrl : public GuiContainer /// This ensures we keep our sizing in sync when we our children are sized or moved. /// /// @param child A pointer to the child control that has been resized - void childResized(GuiControl *child); + void childResized(GuiControl *child) override; /// @} - virtual bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; /// @name Mouse Events /// @{ - virtual void onMouseDown( const GuiEvent &event ); - virtual void onMouseUp( const GuiEvent &event ); - virtual void onMouseDragged( const GuiEvent &event ); - virtual void onMouseMove( const GuiEvent &event ); - virtual void onMouseLeave( const GuiEvent &event ); - virtual bool onMouseDownEditor( const GuiEvent &event, Point2I offset ); - virtual void onRightMouseUp( const GuiEvent& event ); + void onMouseDown( const GuiEvent &event ) override; + void onMouseUp( const GuiEvent &event ) override; + void onMouseDragged( const GuiEvent &event ) override; + void onMouseMove( const GuiEvent &event ) override; + void onMouseLeave( const GuiEvent &event ) override; + bool onMouseDownEditor( const GuiEvent &event, Point2I offset ) override; + void onRightMouseUp( const GuiEvent& event ) override; /// @} }; diff --git a/Engine/source/gui/containers/guiWindowCtrl.h b/Engine/source/gui/containers/guiWindowCtrl.h index 294ff7a9e..79d6f090a 100644 --- a/Engine/source/gui/containers/guiWindowCtrl.h +++ b/Engine/source/gui/containers/guiWindowCtrl.h @@ -214,26 +214,26 @@ class GuiWindowCtrl : public GuiContainer bool isMinimized(S32 &index); - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; void setFont(S32 fntTag); void setCloseCommand(const char *newCmd); - GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 ); + GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 ) override; S32 findHitEdges( const Point2I &globalPoint ); void getSnappableWindows( Vector &windowOutVector, bool canCollapse = false ); - bool resize( const Point2I &newPosition, const Point2I &newExtent ); + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; //only cycle tabs through the current window, so overwrite the method - GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true); - GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true); + GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override; + GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override; S32 getTabIndex(void) { return mTabIndex; } void selectWindow(void); //// - const RectI getClientRect(); + const RectI getClientRect() override; /// Mutators for window properties from code. /// Using setDataField is a bit overkill. @@ -271,15 +271,15 @@ class GuiWindowCtrl : public GuiContainer /// @} // GuiContainer. - virtual bool onWake(); - virtual void onSleep(); - virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseMove(const GuiEvent &event); - virtual bool onKeyDown(const GuiEvent &event); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onSleep() override; + void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + bool onKeyDown(const GuiEvent &event) override; + void onRender(Point2I offset, const RectI &updateRect) override; DECLARE_CONOBJECT( GuiWindowCtrl ); DECLARE_DESCRIPTION( "A control that shows an independent window inside the canvas." ); diff --git a/Engine/source/gui/controls/gui3DProjectionCtrl.h b/Engine/source/gui/controls/gui3DProjectionCtrl.h index b2d1949b0..939a28f92 100644 --- a/Engine/source/gui/controls/gui3DProjectionCtrl.h +++ b/Engine/source/gui/controls/gui3DProjectionCtrl.h @@ -57,12 +57,12 @@ public: Point2I mUseEyePoint; /// optionally use the eye point. x != 0 -> horiz. y != 0 -> vert. - virtual void onRender (Point2I offset, const RectI &updateRect); + void onRender (Point2I offset, const RectI &updateRect) override; virtual void resizeDuringRender (); - virtual bool onWake (); - virtual void onSleep (); - virtual void onDeleteNotify (SimObject *object); + bool onWake () override; + void onSleep () override; + void onDeleteNotify (SimObject *object) override; void doPositioning (); void doProjection (); diff --git a/Engine/source/gui/controls/guiAnimBitmapCtrl.h b/Engine/source/gui/controls/guiAnimBitmapCtrl.h index ba50649f2..e7cf08754 100644 --- a/Engine/source/gui/controls/guiAnimBitmapCtrl.h +++ b/Engine/source/gui/controls/guiAnimBitmapCtrl.h @@ -54,10 +54,10 @@ protected: public: guiAnimBitmapCtrl(); ~guiAnimBitmapCtrl(); - bool onAdd(); + bool onAdd() override; static void initPersistFields(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; DECLARE_CONOBJECT(guiAnimBitmapCtrl); DECLARE_CATEGORY("Gui Images"); DECLARE_DESCRIPTION("A control that clips a bitmap based on %."); diff --git a/Engine/source/gui/controls/guiBackgroundCtrl.h b/Engine/source/gui/controls/guiBackgroundCtrl.h index 931d8c246..2c744fa64 100644 --- a/Engine/source/gui/controls/guiBackgroundCtrl.h +++ b/Engine/source/gui/controls/guiBackgroundCtrl.h @@ -42,7 +42,7 @@ public: GuiBackgroundCtrl(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; }; #endif diff --git a/Engine/source/gui/controls/guiBitmapBarCtrl.h b/Engine/source/gui/controls/guiBitmapBarCtrl.h index 5450e0df0..b98df4863 100644 --- a/Engine/source/gui/controls/guiBitmapBarCtrl.h +++ b/Engine/source/gui/controls/guiBitmapBarCtrl.h @@ -39,7 +39,7 @@ protected: public: GuiBitmapBarCtrl(); static void initPersistFields(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; DECLARE_CONOBJECT(GuiBitmapBarCtrl); DECLARE_CATEGORY("Gui Images"); diff --git a/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp b/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp index 0d3cd3c96..05d0fea47 100644 --- a/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp +++ b/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp @@ -55,9 +55,9 @@ public: static void initPersistFields(); - bool onWake(); - void onSleep(); - void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onSleep() override; + void onRender(Point2I offset, const RectI &updateRect) override; DECLARE_CONOBJECT(GuiBitmapBorderCtrl); DECLARE_CATEGORY( "Gui Images" ); DECLARE_DESCRIPTION( "A control that renders a skinned border." ); diff --git a/Engine/source/gui/controls/guiBitmapCtrl.h b/Engine/source/gui/controls/guiBitmapCtrl.h index 44a6a18ed..b641fd5a2 100644 --- a/Engine/source/gui/controls/guiBitmapCtrl.h +++ b/Engine/source/gui/controls/guiBitmapCtrl.h @@ -63,13 +63,13 @@ class GuiBitmapCtrl : public GuiControl void setBitmapHandle(GFXTexHandle handle, bool resize = false); // GuiControl. - bool onWake(); - void onSleep(); - void inspectPostApply(); + bool onWake() override; + void onSleep() override; + void inspectPostApply() override; void updateSizing(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; void setValue(S32 x, S32 y); DECLARE_CONOBJECT( GuiBitmapCtrl ); diff --git a/Engine/source/gui/controls/guiColorPicker.h b/Engine/source/gui/controls/guiColorPicker.h index 58dee46e5..ad6c52d0f 100644 --- a/Engine/source/gui/controls/guiColorPicker.h +++ b/Engine/source/gui/controls/guiColorPicker.h @@ -119,7 +119,7 @@ class GuiColorPickerCtrl : public GuiControl ~GuiColorPickerCtrl(); static void initPersistFields(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; bool mShowReticle; ///< Show reticle on render /// @name Color Value Functions /// @{ @@ -127,8 +127,8 @@ class GuiColorPickerCtrl : public GuiControl void setValue(LinearColorF &value) {mBaseColor = value;} /// NOTE: getValue() returns baseColor if pallet (since pallet controls can't "pick" colours themselves) LinearColorF getValue() { return mDisplayMode == pPallet ? mBaseColor : mPickColor; } - const char *getScriptValue(); - void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; void updateColor() {mPositionChanged = true;} /// @} @@ -141,13 +141,13 @@ class GuiColorPickerCtrl : public GuiControl /// @name Input Events /// @{ - void onMouseDown(const GuiEvent &); - void onMouseUp(const GuiEvent &); - void onMouseMove(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); + void onMouseDown(const GuiEvent &) override; + void onMouseUp(const GuiEvent &) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; - void onMouseEnter(const GuiEvent &); - void onMouseLeave(const GuiEvent &); + void onMouseEnter(const GuiEvent &) override; + void onMouseLeave(const GuiEvent &) override; /// @} }; diff --git a/Engine/source/gui/controls/guiConsole.h b/Engine/source/gui/controls/guiConsole.h index 2ef9eb7c8..e4c0abe24 100644 --- a/Engine/source/gui/controls/guiConsole.h +++ b/Engine/source/gui/controls/guiConsole.h @@ -59,7 +59,7 @@ class GuiConsole : public GuiArrayCtrl /// @} // GuiArrayCtrl. - virtual void onCellSelected( Point2I cell ); + void onCellSelected( Point2I cell ) override; public: GuiConsole(); @@ -68,9 +68,9 @@ class GuiConsole : public GuiArrayCtrl DECLARE_DESCRIPTION( "Control that displays the console log text." ); // GuiArrayCtrl. - virtual bool onWake(); - virtual void onPreRender(); - virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + bool onWake() override; + void onPreRender() override; + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; void setDisplayFilters(bool errors, bool warns, bool normal); bool getErrorFilter() { return mDisplayErrors; } diff --git a/Engine/source/gui/controls/guiConsoleEditCtrl.h b/Engine/source/gui/controls/guiConsoleEditCtrl.h index af1648649..e37a6f836 100644 --- a/Engine/source/gui/controls/guiConsoleEditCtrl.h +++ b/Engine/source/gui/controls/guiConsoleEditCtrl.h @@ -50,7 +50,7 @@ public: static void initPersistFields(); - bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; }; #endif //_GUI_TEXTEDIT_CTRL_H diff --git a/Engine/source/gui/controls/guiConsoleTextCtrl.h b/Engine/source/gui/controls/guiConsoleTextCtrl.h index 689b62534..47351cd31 100644 --- a/Engine/source/gui/controls/guiConsoleTextCtrl.h +++ b/Engine/source/gui/controls/guiConsoleTextCtrl.h @@ -62,8 +62,8 @@ public: static void initPersistFields(); //Parental methods - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; //text methods virtual void setText( const char *txt = NULL ); @@ -71,12 +71,12 @@ public: //rendering methods void calcResize(); - void onPreRender(); // do special pre render processing - void onRender( Point2I offset, const RectI &updateRect ); + void onPreRender() override; // do special pre render processing + void onRender( Point2I offset, const RectI &updateRect ) override; //Console methods - const char* getScriptValue(); - void setScriptValue( const char *value ); + const char* getScriptValue() override; + void setScriptValue( const char *value ) override; }; #endif //_GUI_TEXT_CONTROL_H_ diff --git a/Engine/source/gui/controls/guiDecoyCtrl.h b/Engine/source/gui/controls/guiDecoyCtrl.h index d1d194b56..f1171b169 100644 --- a/Engine/source/gui/controls/guiDecoyCtrl.h +++ b/Engine/source/gui/controls/guiDecoyCtrl.h @@ -48,22 +48,22 @@ public: Point2I mMouseDownPosition; - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseMove(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseEnter(const GuiEvent &event); - virtual void onMouseLeave(const GuiEvent &event); + void onMouseUp(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; - virtual bool onMouseWheelUp(const GuiEvent &event); - virtual bool onMouseWheelDown(const GuiEvent &event); + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; - virtual void onRightMouseDown(const GuiEvent &event); - virtual void onRightMouseUp(const GuiEvent &event); - virtual void onRightMouseDragged(const GuiEvent &event); + void onRightMouseDown(const GuiEvent &event) override; + void onRightMouseUp(const GuiEvent &event) override; + void onRightMouseDragged(const GuiEvent &event) override; - virtual void onMiddleMouseDown(const GuiEvent &event); - virtual void onMiddleMouseUp(const GuiEvent &event); - virtual void onMiddleMouseDragged(const GuiEvent &event); + void onMiddleMouseDown(const GuiEvent &event) override; + void onMiddleMouseUp(const GuiEvent &event) override; + void onMiddleMouseDragged(const GuiEvent &event) override; }; #endif diff --git a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h index 391ed591a..46462504d 100644 --- a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h +++ b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h @@ -72,8 +72,8 @@ public: /// Get the currently selected file's name StringTableEntry getSelectedFileName(); - virtual void onMouseDown(const GuiEvent &event); - virtual bool onWake(); + void onMouseDown(const GuiEvent &event) override; + bool onWake() override; }; #endif diff --git a/Engine/source/gui/controls/guiFileTreeCtrl.h b/Engine/source/gui/controls/guiFileTreeCtrl.h index e0e8c054e..49871b3a7 100644 --- a/Engine/source/gui/controls/guiFileTreeCtrl.h +++ b/Engine/source/gui/controls/guiFileTreeCtrl.h @@ -57,9 +57,9 @@ public: GuiFileTreeCtrl(); - bool onWake(); - bool onVirtualParentExpand(Item *item); - void onItemSelected( Item *item ); + bool onWake() override; + bool onVirtualParentExpand(Item *item) override; + void onItemSelected( Item *item ) override; const String& getSelectedPath() { return mSelPath; } bool setSelectedPath( const char* path ); diff --git a/Engine/source/gui/controls/guiGameListMenuCtrl.h b/Engine/source/gui/controls/guiGameListMenuCtrl.h index 3e6c3c7b0..fd71490e3 100644 --- a/Engine/source/gui/controls/guiGameListMenuCtrl.h +++ b/Engine/source/gui/controls/guiGameListMenuCtrl.h @@ -266,7 +266,7 @@ public: GuiGameListMenuCtrl(); ~GuiGameListMenuCtrl(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; void onRenderListOption(Row* row, Point2I currentOffset); void onRenderSliderOption(Row* row, Point2I currentOffset); @@ -276,67 +276,67 @@ public: /// Callback when the object is registered with the sim. /// /// \return True if the profile was successfully added, false otherwise. - bool onAdd(); + bool onAdd() override; /// Callback when the control wakes up. - bool onWake(); + bool onWake() override; /// Callback when a key is pressed. /// /// \param event The event that triggered this callback. - bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; /// Callback when a key is repeating. /// /// \param event The event that triggered this callback. - bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); } + bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); } /// Callback when the mouse button is clicked on the control. /// /// \param event A reference to the event that triggered the callback. - void onMouseDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; /// Callback when the mouse is dragged on the control. /// /// \param event A reference to the event that triggered the callback. - void onMouseDragged(const GuiEvent &event){ onMouseDown(event); } + void onMouseDragged(const GuiEvent &event) override{ onMouseDown(event); } /// Callback when the mouse leaves the control. /// /// \param event A reference to the event that triggered the callback. - void onMouseLeave(const GuiEvent &event); + void onMouseLeave(const GuiEvent &event) override; /// Callback when the mouse is moving over this control /// /// \param event A reference to the event that triggered the callback. - void onMouseMove(const GuiEvent &event); + void onMouseMove(const GuiEvent &event) override; /// Callback when the mouse button is released. /// /// \param event A reference to the event that triggered the callback. - void onMouseUp(const GuiEvent &event); + void onMouseUp(const GuiEvent &event) override; - virtual bool onInputEvent(const InputEventInfo& event); + bool onInputEvent(const InputEventInfo& event) override; /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisUp(const GuiEvent & event); + bool onGamepadAxisUp(const GuiEvent & event) override; /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisDown(const GuiEvent & event); + bool onGamepadAxisDown(const GuiEvent & event) override; /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisLeft(const GuiEvent& event); + bool onGamepadAxisLeft(const GuiEvent& event) override; /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisRight(const GuiEvent& event); + bool onGamepadAxisRight(const GuiEvent& event) override; void clearRows(); @@ -458,7 +458,7 @@ private: private: /// Recalculates the height of this control based on the stored row height and /// and padding on the rows. - virtual Point2I getMinExtent() const; + Point2I getMinExtent() const override; /// Makes sure the height will allow all rows to be displayed without being /// truncated. @@ -537,7 +537,7 @@ public: /// Callback when the object is registered with the sim. /// /// \return True if the profile was successfully added, false otherwise. - bool onAdd(); + bool onAdd() override; Point2I mHitAreaUpperLeft; ///< Offset for the upper left corner of the hit area Point2I mHitAreaLowerRight; ///< Offset for the lower right corner of the hit area diff --git a/Engine/source/gui/controls/guiGameListOptionsCtrl.h b/Engine/source/gui/controls/guiGameListOptionsCtrl.h index f72c44c0b..e78b8d974 100644 --- a/Engine/source/gui/controls/guiGameListOptionsCtrl.h +++ b/Engine/source/gui/controls/guiGameListOptionsCtrl.h @@ -93,32 +93,32 @@ public: /// \param enabled [optional] If this row is initially enabled. Default true. void addRow(const char* label, const char* optionsList, bool wrapOptions, const char* callback, S32 icon = -1, S32 yPad = 0, bool enabled = true); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; /// Callback when the mouse button is released. /// /// \param event A reference to the event that triggered the callback. - void onMouseUp(const GuiEvent &event); + void onMouseUp(const GuiEvent &event) override; /// Callback when a key is pressed. /// /// \param event The event that triggered this callback. - bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; /// Callback when a key is repeating. /// /// \param event The event that triggered this callback. - bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); } + bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); } /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisLeft(const GuiEvent &event); + bool onGamepadAxisLeft(const GuiEvent &event) override; /// Callback when the gamepad axis is activated. /// /// \param event A reference to the event that triggered the callback. - virtual bool onGamepadAxisRight(const GuiEvent &event); + bool onGamepadAxisRight(const GuiEvent &event) override; virtual void clearRows(); @@ -128,7 +128,7 @@ public: DECLARE_CONOBJECT(GuiGameListOptionsCtrl); DECLARE_DESCRIPTION( "A control for showing pages of options that are gamepad friendly." ); - virtual bool onAdd(); + bool onAdd() override; /// Initializes fields accessible through the console. static void initPersistFields(); @@ -140,15 +140,15 @@ protected: /// /// \return True if the profile is of type GuiGameListOptionsProfile or false /// if the profile is of any other type. - bool hasValidProfile() const; + bool hasValidProfile() const override; /// Enforces the validity of the fields on this control and its profile (if the /// profile is valid, see: hasValidProfile). - void enforceConstraints(); + void enforceConstraints() override; /// Adds lines around the column divisions to the feedback already provided /// in the Parent. - void onDebugRender(Point2I offset); + void onDebugRender(Point2I offset) override; private: /// Performs a click on the current option row. The x position is used to @@ -183,7 +183,7 @@ class GuiGameListOptionsProfile : public GuiGameListMenuProfile public: /// Enforces range constraints on all required fields. - void enforceConstraints(); + void enforceConstraints() override; GuiGameListOptionsProfile(); diff --git a/Engine/source/gui/controls/guiGameSettingsCtrl.h b/Engine/source/gui/controls/guiGameSettingsCtrl.h index 8a6a730dc..737761745 100644 --- a/Engine/source/gui/controls/guiGameSettingsCtrl.h +++ b/Engine/source/gui/controls/guiGameSettingsCtrl.h @@ -230,7 +230,7 @@ public: GuiGameSettingsCtrl(); ~GuiGameSettingsCtrl(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; void onRenderListOption(Point2I currentOffset); void onRenderSliderOption(Point2I currentOffset); @@ -240,17 +240,17 @@ public: /// Callback when the object is registered with the sim. /// /// \return True if the profile was successfully added, false otherwise. - bool onAdd(); + bool onAdd() override; /// Callback when the control wakes up. - bool onWake(); + bool onWake() override; - void onSleep(); + void onSleep() override; - void clear(); + void clear() override; - virtual void onMouseMove(const GuiEvent& event); - virtual void onMouseUp(const GuiEvent& event); + void onMouseMove(const GuiEvent& event) override; + void onMouseUp(const GuiEvent& event) override; DECLARE_CONOBJECT(GuiGameSettingsCtrl); DECLARE_CATEGORY( "Gui Game" ); diff --git a/Engine/source/gui/controls/guiGradientCtrl.h b/Engine/source/gui/controls/guiGradientCtrl.h index 75f3f85ef..2d4ab01bb 100644 --- a/Engine/source/gui/controls/guiGradientCtrl.h +++ b/Engine/source/gui/controls/guiGradientCtrl.h @@ -42,11 +42,11 @@ public: DECLARE_CALLBACK( void, onMouseDown, ()); DECLARE_CALLBACK( void, onDoubleClick, ()); GuiGradientSwatchCtrl(); - void onMouseDown(const GuiEvent &); - void onRightMouseDown(const GuiEvent &); - void onMouseDragged(const GuiEvent &event); - void onRender(Point2I offset, const RectI &updateRect); - bool onWake(); + void onMouseDown(const GuiEvent &) override; + void onRightMouseDown(const GuiEvent &) override; + void onMouseDragged(const GuiEvent &event) override; + void onRender(Point2I offset, const RectI &updateRect) override; + bool onWake() override; protected: StringTableEntry mColorFunction; }; @@ -121,7 +121,7 @@ public: GuiGradientCtrl(); static void initPersistFields(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; bool mShowReticle; ///< Show reticle on render /// @name Color Value Functions /// @{ @@ -134,19 +134,19 @@ public: /// @name Input Events /// @{ - void onMouseDown(const GuiEvent &); - void onMouseUp(const GuiEvent &); + void onMouseDown(const GuiEvent &) override; + void onMouseUp(const GuiEvent &) override; - void onMouseEnter(const GuiEvent &); - void onMouseLeave(const GuiEvent &); + void onMouseEnter(const GuiEvent &) override; + void onMouseLeave(const GuiEvent &) override; /// @} void addColorRange(ColorI color); void setupDefaultRange(); - bool onAdd(); - void inspectPreApply(); - void inspectPostApply(); + bool onAdd() override; + void inspectPreApply() override; + void inspectPostApply() override; void reInitSwatches( GuiGradientCtrl::PickMode ); void addColorRange(Point2I pos, const LinearColorF& color); void removeColorRange( GuiGradientSwatchCtrl* swatch ); diff --git a/Engine/source/gui/controls/guiListBoxCtrl.h b/Engine/source/gui/controls/guiListBoxCtrl.h index 1c0159205..12a213452 100644 --- a/Engine/source/gui/controls/guiListBoxCtrl.h +++ b/Engine/source/gui/controls/guiListBoxCtrl.h @@ -123,21 +123,21 @@ public: // Sizing void updateSize(); - virtual void parentResized(const RectI& oldParentRect, const RectI& newParentRect); - virtual bool onWake(); + void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override; + bool onWake() override; // Rendering - virtual void onRender( Point2I offset, const RectI &updateRect ); + void onRender( Point2I offset, const RectI &updateRect ) override; virtual void onRenderItem(const RectI& itemRect, LBItem *item); void drawBox( const Point2I &box, S32 size, ColorI &outlineColor, ColorI &boxColor ); bool renderTooltip( const Point2I &hoverPos, const Point2I& cursorPos, const char* tipText ); void addFilteredItem( String item ); void removeFilteredItem( String item ); // Mouse/Key Events - virtual void onMouseDown( const GuiEvent &event ); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp( const GuiEvent& event ); - virtual bool onKeyDown( const GuiEvent &event ); + void onMouseDown( const GuiEvent &event ) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp( const GuiEvent& event ) override; + bool onKeyDown( const GuiEvent &event ) override; // String Utility static U32 getStringElementCount( const char *string ); diff --git a/Engine/source/gui/controls/guiMLTextCtrl.h b/Engine/source/gui/controls/guiMLTextCtrl.h index 57360a6b2..fb825a451 100644 --- a/Engine/source/gui/controls/guiMLTextCtrl.h +++ b/Engine/source/gui/controls/guiMLTextCtrl.h @@ -167,8 +167,8 @@ class GuiMLTextCtrl : public GuiControl static void initPersistFields(); - void setScriptValue(const char *value); - const char *getScriptValue(); + void setScriptValue(const char *value) override; + const char *getScriptValue() override; static char *stripControlChars(const char *inString); @@ -291,30 +291,30 @@ class GuiMLTextCtrl : public GuiControl S32 getTextPosition(const Point2I& localPosition); // Gui control overrides - bool onWake(); - void onSleep(); - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onSleep() override; + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; void getCursorPositionAndColor(Point2I &cursorTop, Point2I &cursorBottom, ColorI &color); - void inspectPostApply(); - void parentResized(const RectI& oldParentRect, const RectI& newParentRect); - bool onKeyDown(const GuiEvent& event); - void onMouseDown(const GuiEvent&); - void onMouseDragged(const GuiEvent&); - void onMouseUp(const GuiEvent&); + void inspectPostApply() override; + void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override; + bool onKeyDown(const GuiEvent& event) override; + void onMouseDown(const GuiEvent&) override; + void onMouseDragged(const GuiEvent&) override; + void onMouseUp(const GuiEvent&) override; - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; public: // Gui control overrides - bool onAdd(); + bool onAdd() override; void setSelectionStart( U32 start ) { clearSelection(); mSelectionStart = start; }; void setSelectionEnd( U32 end ) { mSelectionEnd = end;}; void setSelectionActive(bool active) { mSelectionActive = active; }; S32 getCursorPosition() { return( mCursorPosition ); } - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; bool isTypingOut(); }; diff --git a/Engine/source/gui/controls/guiMLTextEditCtrl.h b/Engine/source/gui/controls/guiMLTextEditCtrl.h index c4611cef8..5e8d5411f 100644 --- a/Engine/source/gui/controls/guiMLTextEditCtrl.h +++ b/Engine/source/gui/controls/guiMLTextEditCtrl.h @@ -36,24 +36,24 @@ class GuiMLTextEditCtrl : public GuiMLTextCtrl StringTableEntry mEscapeCommand; // Events - bool onKeyDown(const GuiEvent&event); + bool onKeyDown(const GuiEvent&event) override; // Event forwards void handleMoveKeys(const GuiEvent&); void handleDeleteKeys(const GuiEvent&); // rendering - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; public: GuiMLTextEditCtrl(); ~GuiMLTextEditCtrl(); - virtual void setFirstResponder(); - virtual void onLoseFirstResponder(); + void setFirstResponder() override; + void onLoseFirstResponder() override; - bool onWake(); - bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool onWake() override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; DECLARE_CONOBJECT(GuiMLTextEditCtrl); DECLARE_DESCRIPTION( "A control that allows to edit multiple lines of text." ); diff --git a/Engine/source/gui/controls/guiMaterialCtrl.h b/Engine/source/gui/controls/guiMaterialCtrl.h index ff0b44efa..8a9ea343b 100644 --- a/Engine/source/gui/controls/guiMaterialCtrl.h +++ b/Engine/source/gui/controls/guiMaterialCtrl.h @@ -53,18 +53,18 @@ public: // ConsoleObject static void initPersistFields(); - void inspectPostApply(); + void inspectPostApply() override; DECLARE_CONOBJECT(GuiMaterialCtrl); DECLARE_CATEGORY( "Gui Editor" ); // GuiControl - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; bool setMaterial( const String &materialName ); - void onRender( Point2I offset, const RectI &updateRect ); + void onRender( Point2I offset, const RectI &updateRect ) override; }; #endif // _GUIMATERIALCTRL_H_ diff --git a/Engine/source/gui/controls/guiPopUpCtrl.h b/Engine/source/gui/controls/guiPopUpCtrl.h index d208fbfd2..40b129274 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.h +++ b/Engine/source/gui/controls/guiPopUpCtrl.h @@ -50,7 +50,7 @@ protected: GuiPopupTextListCtrl *mTextList; public: GuiPopUpBackgroundCtrl(GuiPopUpMenuCtrl *ctrl, GuiPopupTextListCtrl* textList); - void onMouseDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; }; class GuiPopupTextListCtrl : public GuiTextListCtrl @@ -66,12 +66,12 @@ public: GuiPopupTextListCtrl(GuiPopUpMenuCtrl *ctrl); // GuiArrayCtrl overload: - void onCellSelected(Point2I cell); + void onCellSelected(Point2I cell) override; // GuiControl overloads: - bool onKeyDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + bool onKeyDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; }; class GuiPopUpMenuCtrl : public GuiTextCtrl @@ -141,26 +141,26 @@ public: GuiPopUpMenuCtrl(void); ~GuiPopUpMenuCtrl(); GuiScrollCtrl::Region mScrollDir; - bool onWake(); // Added - bool onAdd(); - void onSleep(); + bool onWake() override; // Added + bool onAdd() override; + void onSleep() override; void setBitmap(const char *name); // Added void sort(); void sortID(); // Added void addEntry(const char *buf, S32 id = -1, U32 scheme = 0); void addScheme(U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL); - void onRender(Point2I offset, const RectI &updateRect); - void onAction(); + void onRender(Point2I offset, const RectI &updateRect) override; + void onAction() override; virtual void closePopUp(); - void clear(); + void clear() override; void clearEntry( S32 entry ); // Added - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseEnter(const GuiEvent &event); // Added - void onMouseLeave(const GuiEvent &); // Added + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; // Added + void onMouseLeave(const GuiEvent &) override; // Added void setupAutoScroll(const GuiEvent &event); void autoScroll(); - bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; void reverseTextList(); bool getFontColor(ColorI &fontColor, S32 id, bool selected, bool mouseOver); bool getColoredBox(ColorI &boxColor, S32 id); // Added @@ -170,7 +170,7 @@ public: void setSelected(S32 id, bool bNotifyScript = true); void setFirstSelected(bool bNotifyScript = true); // Added void setNoneSelected(); // Added - const char *getScriptValue(); + const char *getScriptValue() override; const char *getTextById(S32 id); S32 findText( const char* text ); S32 getNumEntries() { return( mEntries.size() ); } diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.h b/Engine/source/gui/controls/guiPopUpCtrlEx.h index e1136626c..5a361565b 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.h +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.h @@ -48,7 +48,7 @@ protected: GuiPopupTextListCtrlEx *mTextList; public: GuiPopUpBackgroundCtrlEx(GuiPopUpMenuCtrlEx *ctrl, GuiPopupTextListCtrlEx* textList); - void onMouseDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; }; class GuiPopupTextListCtrlEx : public GuiTextListCtrl @@ -66,13 +66,13 @@ class GuiPopupTextListCtrlEx : public GuiTextListCtrl GuiPopupTextListCtrlEx(GuiPopUpMenuCtrlEx *ctrl); // GuiArrayCtrl overload: - void onCellSelected(Point2I cell); + void onCellSelected(Point2I cell) override; // GuiControl overloads: - bool onKeyDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseMove(const GuiEvent &event); - void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + bool onKeyDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; }; class GuiPopUpMenuCtrlEx : public GuiTextCtrl @@ -150,10 +150,10 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl GuiPopUpMenuCtrlEx(void); ~GuiPopUpMenuCtrlEx(); GuiScrollCtrl::Region mScrollDir; - virtual bool onWake(); // Added - virtual void onRemove(); - virtual bool onAdd(); - virtual void onSleep(); + bool onWake() override; // Added + void onRemove() override; + bool onAdd() override; + void onSleep() override; void setBitmap(const char *name); // Added void sort(); void sortID(); // Added @@ -163,18 +163,18 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl addEntry(buf, -2, 0); } void addScheme(U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL); - void onRender(Point2I offset, const RectI &updateRect); - void onAction(); + void onRender(Point2I offset, const RectI &updateRect) override; + void onAction() override; virtual void closePopUp(); - void clear(); + void clear() override; void clearEntry( S32 entry ); // Added - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseEnter(const GuiEvent &event); // Added - void onMouseLeave(const GuiEvent &); // Added + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; // Added + void onMouseLeave(const GuiEvent &) override; // Added void setupAutoScroll(const GuiEvent &event); void autoScroll(); - bool onKeyDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; void reverseTextList(); bool getFontColor(ColorI &fontColor, S32 id, bool selected, bool mouseOver); bool getColoredBox(ColorI &boxColor, S32 id); // Added @@ -183,7 +183,7 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl void setSelected(S32 id, bool bNotifyScript = true); void setFirstSelected(bool bNotifyScript = true); // Added void setNoneSelected(); // Added - const char *getScriptValue(); + const char *getScriptValue() override; const char *getTextById(S32 id); S32 findText( const char* text ); S32 getNumEntries() { return( mEntries.size() ); } diff --git a/Engine/source/gui/controls/guiSliderCtrl.h b/Engine/source/gui/controls/guiSliderCtrl.h index a8f8b667c..c3ab1dc64 100644 --- a/Engine/source/gui/controls/guiSliderCtrl.h +++ b/Engine/source/gui/controls/guiSliderCtrl.h @@ -87,26 +87,26 @@ class GuiSliderCtrl : public GuiControl const Point2F& getRange() const { return mRange; } // GuiControl. - bool onWake(); + bool onWake() override; - void onMouseDown(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onMouseUp(const GuiEvent &); - void onMouseLeave(const GuiEvent &); - void onMouseEnter(const GuiEvent &); - bool onMouseWheelUp(const GuiEvent &event); - bool onMouseWheelDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &) override; + void onMouseLeave(const GuiEvent &) override; + void onMouseEnter(const GuiEvent &) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; - void setActive( bool value ); + void setActive( bool value ) override; F32 getValue() const { return mValue; } - void setScriptValue(const char *val) { setValue(dAtof(val)); } + void setScriptValue(const char *val) override { setValue(dAtof(val)); } void setValue(F32 val, bool doCallback=false); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; - virtual bool resize( const Point2I& newSize, const Point2I& newExtent ); - virtual void parentResized( const RectI& oldParentRect, const RectI& newParentRect ); + bool resize( const Point2I& newSize, const Point2I& newExtent ) override; + void parentResized( const RectI& oldParentRect, const RectI& newParentRect ) override; static void initPersistFields(); diff --git a/Engine/source/gui/controls/guiTabPageCtrl.h b/Engine/source/gui/controls/guiTabPageCtrl.h index 8b10718fd..b588ae5e8 100644 --- a/Engine/source/gui/controls/guiTabPageCtrl.h +++ b/Engine/source/gui/controls/guiTabPageCtrl.h @@ -44,29 +44,29 @@ class GuiTabPageCtrl : public GuiTextCtrl static void initPersistFields(); - bool onWake(); ///< The page awakens (becomes active)! - void onSleep(); ///< The page sleeps (zzzzZZ - becomes inactive) - void inspectPostApply(); + bool onWake() override; ///< The page awakens (becomes active)! + void onSleep() override; ///< The page sleeps (zzzzZZ - becomes inactive) + void inspectPostApply() override; bool getFitBook() { return mFitBook; } void setFitBook(bool state) { mFitBook = state; } - GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1); ///< Find which control is hit by the mouse starting at a specified layer + GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override; ///< Find which control is hit by the mouse starting at a specified layer - void onMouseDown(const GuiEvent &event); ///< Called when a mouseDown event occurs - bool onMouseDownEditor(const GuiEvent &event, Point2I offset ); ///< Called when a mouseDown event occurs and the GUI editor is active + void onMouseDown(const GuiEvent &event) override; ///< Called when a mouseDown event occurs + bool onMouseDownEditor(const GuiEvent &event, Point2I offset ) override; ///< Called when a mouseDown event occurs and the GUI editor is active S32 getTabIndex(void) { return mTabIndex; } ///< Get the tab index of this control //only cycle tabs through the current window, so overwrite the method - GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true); - GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true); + GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override; + GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override; void selectWindow(void); ///< Select this window - virtual void setText(const char *txt = NULL); ///< Override setText function to signal parent we need to update. + void setText(const char *txt = NULL) override; ///< Override setText function to signal parent we need to update. - void onRender(Point2I offset, const RectI &updateRect); ///< Called when it's time to render this page to the scene + void onRender(Point2I offset, const RectI &updateRect) override; ///< Called when it's time to render this page to the scene }; #endif //_GUI_WINDOW_CTRL_H diff --git a/Engine/source/gui/controls/guiTextCtrl.h b/Engine/source/gui/controls/guiTextCtrl.h index 5f1ac25dd..cdf56e199 100644 --- a/Engine/source/gui/controls/guiTextCtrl.h +++ b/Engine/source/gui/controls/guiTextCtrl.h @@ -59,8 +59,8 @@ public: static void initPersistFields(); //Parental methods - bool onAdd(); - virtual bool onWake(); + bool onAdd() override; + bool onWake() override; //text methods virtual void setText(const char *txt = NULL); @@ -75,18 +75,18 @@ public: { return static_cast(obj)->getText(); } - void inspectPostApply(); + void inspectPostApply() override; //rendering methods - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; void displayText( S32 xOffset, S32 yOffset ); // resizing void autoResize(); //Console methods - const char *getScriptValue(); - void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; }; #endif //_GUI_TEXT_CONTROL_H_ diff --git a/Engine/source/gui/controls/guiTextEditCtrl.h b/Engine/source/gui/controls/guiTextEditCtrl.h index 8e7bd93ad..5d09a5605 100644 --- a/Engine/source/gui/controls/guiTextEditCtrl.h +++ b/Engine/source/gui/controls/guiTextEditCtrl.h @@ -112,7 +112,7 @@ public: DECLARE_DESCRIPTION( "A control that allows to edit a single line of text. "); static void initPersistFields(); - bool onAdd(); + bool onAdd() override; /// Get the contents of the control. /// @@ -121,7 +121,7 @@ public: virtual void getRenderText(char *dest); void setText(S32 tag); - virtual void setText(const UTF8* txt); + void setText(const UTF8* txt) override; virtual void setText(const UTF16* txt); S32 getCursorPos() { return( mCursorPos ); } void setCursorPos( const S32 newPos ); @@ -136,30 +136,30 @@ public: void clearSelectedText(); void forceValidateText(); - const char *getScriptValue(); - void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; bool getSinkAllKeys() { return mSinkAllKeyEvents; } void setSinkAllKeys(bool state) { mSinkAllKeyEvents = state; } - virtual bool onKeyDown(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; void onCopy(bool andCut); void onPaste(); void onUndo(); - virtual void setFirstResponder(); - virtual void onLoseFirstResponder(); + void setFirstResponder() override; + void onLoseFirstResponder() override; bool hasText(); - void onStaticModified(const char* slotName, const char* newValue = NULL); + void onStaticModified(const char* slotName, const char* newValue = NULL) override; - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; virtual void drawText( const RectI &drawRect, bool isFocused ); bool dealWithEnter( bool clearResponder ); diff --git a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h index ebe35530a..76fd67735 100644 --- a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h +++ b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h @@ -56,23 +56,23 @@ public: virtual void getText(char *dest); // dest must be of size // StructDes::MAX_STRING_LEN + 1 - virtual void setText(const char *txt); + void setText(const char *txt) override; void setValue(); void checkRange(); void checkIncValue(); void timeInc(U32 elapseTime); - virtual bool onKeyDown(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual bool onMouseWheelUp(const GuiEvent &event); - virtual bool onMouseWheelDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; - bool onWake(); - virtual void onPreRender(); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; void setBitmap(const char *name); diff --git a/Engine/source/gui/controls/guiTextEditSliderCtrl.h b/Engine/source/gui/controls/guiTextEditSliderCtrl.h index 24986dd9b..9b348b5ea 100644 --- a/Engine/source/gui/controls/guiTextEditSliderCtrl.h +++ b/Engine/source/gui/controls/guiTextEditSliderCtrl.h @@ -57,22 +57,22 @@ public: virtual void getText(char *dest); // dest must be of size // StructDes::MAX_STRING_LEN + 1 - virtual void setText(const char *txt); + void setText(const char *txt) override; void setValue(); void checkRange(); void checkIncValue(); void timeInc(U32 elapseTime); - virtual bool onKeyDown(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); - virtual bool onMouseWheelUp(const GuiEvent &event); - virtual bool onMouseWheelDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; - virtual void onPreRender(); - virtual void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; protected: diff --git a/Engine/source/gui/controls/guiTextListCtrl.h b/Engine/source/gui/controls/guiTextListCtrl.h index 6612e3f16..39d5df642 100644 --- a/Engine/source/gui/controls/guiTextListCtrl.h +++ b/Engine/source/gui/controls/guiTextListCtrl.h @@ -59,8 +59,8 @@ class GuiTextListCtrl : public GuiArrayCtrl S32 mRowHeightPadding; U32 getRowWidth(Entry *row); - bool cellSelected(Point2I cell); - void onCellSelected(Point2I cell); + bool cellSelected(Point2I cell) override; + void onCellSelected(Point2I cell) override; public: GuiTextListCtrl(); @@ -77,12 +77,12 @@ class GuiTextListCtrl : public GuiArrayCtrl virtual void setCellSize( const Point2I &size ){ mCellSize = size; } virtual void getCellSize( Point2I &size ){ size = mCellSize; } - const char *getScriptValue(); - void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; U32 getNumEntries(); - void clear(); + void clear() override; virtual void addEntry(U32 id, const char *text); virtual void insertEntry(U32 id, const char *text, S32 index); void setEntry(U32 id, const char *text); @@ -93,7 +93,7 @@ class GuiTextListCtrl : public GuiArrayCtrl U32 getEntryId(U32 index); - bool onWake(); + bool onWake() override; void removeEntry(U32 id); virtual void removeEntryByIndex(S32 id); virtual void sort(U32 column, bool increasing = true); @@ -103,14 +103,14 @@ class GuiTextListCtrl : public GuiArrayCtrl U32 getSelectedRow(); const char *getSelectedText(); - bool onKeyDown(const GuiEvent &event); - bool onGamepadAxisUp(const GuiEvent& event); - bool onGamepadAxisDown(const GuiEvent& event); + bool onKeyDown(const GuiEvent &event) override; + bool onGamepadAxisUp(const GuiEvent& event) override; + bool onGamepadAxisDown(const GuiEvent& event) override; - virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; - void setSize(Point2I newSize); - void onRemove(); + void setSize(Point2I newSize) override; + void onRemove() override; void addColumnOffset(S32 offset) { mColumnOffsets.push_back(offset); } void clearColumnOffsets() { mColumnOffsets.clear(); } }; diff --git a/Engine/source/gui/controls/guiTreeViewCtrl.h b/Engine/source/gui/controls/guiTreeViewCtrl.h index 6a3f2b39b..6b531185f 100644 --- a/Engine/source/gui/controls/guiTreeViewCtrl.h +++ b/Engine/source/gui/controls/guiTreeViewCtrl.h @@ -596,20 +596,20 @@ class GuiTreeViewCtrl : public GuiArrayCtrl /// @} // GuiControl - bool onAdd(); - bool onWake(); - void onSleep(); - void onPreRender(); - bool onKeyDown( const GuiEvent &event ); - void onMouseDown(const GuiEvent &event); - void onMiddleMouseDown(const GuiEvent &event); - void onMouseMove(const GuiEvent &event); - void onMouseEnter(const GuiEvent &event); - void onMouseLeave(const GuiEvent &event); - void onRightMouseDown(const GuiEvent &event); - void onRightMouseUp(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - virtual void onMouseUp(const GuiEvent &event); + bool onAdd() override; + bool onWake() override; + void onSleep() override; + void onPreRender() override; + bool onKeyDown( const GuiEvent &event ) override; + void onMouseDown(const GuiEvent &event) override; + void onMiddleMouseDown(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onRightMouseDown(const GuiEvent &event) override; + void onRightMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; /// Returns false if the object is a child of one of the inner items. bool childSearch(Item * item, SimObject *obj, bool yourBaby); @@ -622,8 +622,8 @@ class GuiTreeViewCtrl : public GuiArrayCtrl bool objectSearch( const SimObject *object, Item **item ); // GuiArrayCtrl - void onRenderCell(Point2I offset, Point2I cell, bool, bool); - void onRender(Point2I offset, const RectI &updateRect); + void onRenderCell(Point2I offset, Point2I cell, bool, bool) override; + void onRender(Point2I offset, const RectI &updateRect) override; bool renderTooltip( const Point2I &hoverPos, const Point2I& cursorPos, const char* tipText ); diff --git a/Engine/source/gui/core/guiArrayCtrl.h b/Engine/source/gui/core/guiArrayCtrl.h index 2a7810b27..09d3baff7 100644 --- a/Engine/source/gui/core/guiArrayCtrl.h +++ b/Engine/source/gui/core/guiArrayCtrl.h @@ -64,8 +64,8 @@ public: GuiArrayCtrl(); DECLARE_CONOBJECT(GuiArrayCtrl); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; /// @name Array attribute methods /// @{ @@ -89,19 +89,19 @@ public: virtual void onRenderColumnHeaders(Point2I offset, Point2I parentOffset, Point2I headerDim); virtual void onRenderRowHeader(Point2I offset, Point2I parentOffset, Point2I headerDim, Point2I cell); virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; /// @} /// @name Mouse input methods /// @{ - void onMouseDown( const GuiEvent &event ); - void onMouseUp( const GuiEvent &event ); - void onMouseMove( const GuiEvent &event ); - void onMouseDragged( const GuiEvent &event ); - void onMouseEnter( const GuiEvent &event ); - void onMouseLeave( const GuiEvent &event ); - bool onKeyDown( const GuiEvent &event ); - void onRightMouseDown( const GuiEvent &event ); + void onMouseDown( const GuiEvent &event ) override; + void onMouseUp( const GuiEvent &event ) override; + void onMouseMove( const GuiEvent &event ) override; + void onMouseDragged( const GuiEvent &event ) override; + void onMouseEnter( const GuiEvent &event ) override; + void onMouseLeave( const GuiEvent &event ) override; + bool onKeyDown( const GuiEvent &event ) override; + void onRightMouseDown( const GuiEvent &event ) override; /// @} }; diff --git a/Engine/source/gui/core/guiCanvas.h b/Engine/source/gui/core/guiCanvas.h index e9ef1b728..cc28bd2ca 100644 --- a/Engine/source/gui/core/guiCanvas.h +++ b/Engine/source/gui/core/guiCanvas.h @@ -220,8 +220,8 @@ public: GuiCanvas(); virtual ~GuiCanvas(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; #ifdef TORQUE_TOOLS void setMenuBar(SimObject *obj); SimObject* getMenuBar() { return mMenuBarCtrl; } @@ -373,7 +373,7 @@ public: /// Processes an input event /// @see InputEvent /// @param event Input event to process - virtual bool processInputEvent(InputEventInfo &inputEvent); + bool processInputEvent(InputEventInfo &inputEvent) override; /// @} /// @name Mouse Methods @@ -450,7 +450,7 @@ public: /// Sets the first responder. /// @param firstResponder Control to designate as first responder - virtual void setFirstResponder(GuiControl *firstResponder); + void setFirstResponder(GuiControl *firstResponder) override; /// This is used to toggle processing of native OS accelerators, not /// to be confused with the Torque accelerator key system, to keep them diff --git a/Engine/source/gui/core/guiControl.h b/Engine/source/gui/core/guiControl.h index fdd987468..1cdeb4bab 100644 --- a/Engine/source/gui/core/guiControl.h +++ b/Engine/source/gui/core/guiControl.h @@ -327,7 +327,7 @@ class GuiControl : public SimGroup void setSizing(S32 horz, S32 vert); /// Overrides Parent Serialization to allow specific controls to not be saved (Dynamic Controls, etc) - void write(Stream &stream, U32 tabStop, U32 flags); + void write(Stream &stream, U32 tabStop, U32 flags) override; /// Returns boolean as to whether any parent of this control has the 'no serialization' flag set. bool getCanSaveParent(); @@ -343,7 +343,7 @@ class GuiControl : public SimGroup GuiControl(); virtual ~GuiControl(); - virtual bool processArguments(S32 argc, ConsoleValue *argv); + bool processArguments(S32 argc, ConsoleValue *argv) override; static void initPersistFields(); static void consoleInit(); @@ -382,8 +382,8 @@ class GuiControl : public SimGroup /// @param value True if object should be visible virtual void setVisible(bool value); inline bool isVisible() const { return mVisible; } ///< Returns true if the object is visible - virtual bool isHidden() const { return !isVisible(); } - virtual void setHidden( bool state ) { setVisible( !state ); } + bool isHidden() const override { return !isVisible(); } + void setHidden( bool state ) override { setVisible( !state ); } void setCanHit( bool value ) { mCanHit = value; } @@ -413,18 +413,18 @@ class GuiControl : public SimGroup /// Adds an object as a child of this object. /// @param obj New child object of this control - void addObject(SimObject *obj); + void addObject(SimObject *obj) override; /// Removes a child object from this control. /// @param obj Object to remove from this control - void removeObject(SimObject *obj); + void removeObject(SimObject *obj) override; GuiControl *getParent(); ///< Returns the control which owns this one. GuiCanvas *getRoot(); ///< Returns the root canvas of this control. - virtual bool acceptsAsChild( SimObject* object ) const; + bool acceptsAsChild( SimObject* object ) const override; - virtual void onGroupRemove(); + void onGroupRemove() override; /// @} @@ -535,16 +535,16 @@ class GuiControl : public SimGroup virtual void onPreRender(); /// Called when this object is removed - virtual void onRemove(); + void onRemove() override; /// Called when one of this objects children is removed virtual void onChildRemoved( GuiControl *child ); /// Called when this object is added to the scene - virtual bool onAdd(); + bool onAdd() override; /// Called when the mProfile or mToolTipProfile is deleted - virtual void onDeleteNotify(SimObject *object); + void onDeleteNotify(SimObject *object) override; /// Called when this object has a new child virtual void onChildAdded( GuiControl *child ); @@ -828,8 +828,8 @@ class GuiControl : public SimGroup /// of the final clipped text in pixels. U32 clipText( String &inOutText, U32 width ) const; - void inspectPostApply(); - void inspectPreApply(); + void inspectPostApply() override; + void inspectPreApply() override; protected: F32 fade_amt; public: diff --git a/Engine/source/gui/core/guiOffscreenCanvas.h b/Engine/source/gui/core/guiOffscreenCanvas.h index 77c388a9e..0d7a79d35 100644 --- a/Engine/source/gui/core/guiOffscreenCanvas.h +++ b/Engine/source/gui/core/guiOffscreenCanvas.h @@ -19,18 +19,18 @@ public: GuiOffscreenCanvas(); ~GuiOffscreenCanvas(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - void renderFrame(bool preRenderOnly, bool bufferSwap); + void renderFrame(bool preRenderOnly, bool bufferSwap) override; virtual void onFrameRendered(); - Point2I getWindowSize(); + Point2I getWindowSize() override; - Point2I getCursorPos(); - void setCursorPos(const Point2I &pt); - void showCursor(bool state); - bool isCursorShown(); + Point2I getCursorPos() override; + void setCursorPos(const Point2I &pt) override; + void showCursor(bool state) override; + bool isCursorShown() override; void _onTextureEvent( GFXTexCallbackCode code ); diff --git a/Engine/source/gui/core/guiScriptNotifyControl.h b/Engine/source/gui/core/guiScriptNotifyControl.h index c94d3e283..29f658a9e 100644 --- a/Engine/source/gui/core/guiScriptNotifyControl.h +++ b/Engine/source/gui/core/guiScriptNotifyControl.h @@ -56,11 +56,11 @@ public: virtual ~GuiScriptNotifyCtrl(); static void initPersistFields(); - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; virtual void childResized(GuiScriptNotifyCtrl *child); - virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect); - virtual void onChildRemoved( GuiControl *child ); - virtual void onChildAdded( GuiControl *child ); + void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override; + void onChildRemoved( GuiControl *child ) override; + void onChildAdded( GuiControl *child ) override; DECLARE_CALLBACK(void, onResize, (SimObjectId ID) ); DECLARE_CALLBACK(void, onChildAdded, (SimObjectId ID, SimObjectId childID)); @@ -94,10 +94,10 @@ public: //virtual void onMouseDownEditor(const GuiEvent &event, Point2I offset); //virtual void onRightMouseDownEditor(const GuiEvent &event, Point2I offset); - virtual void setFirstResponder(GuiControl *firstResponder); - virtual void setFirstResponder(); + void setFirstResponder(GuiControl *firstResponder) override; + void setFirstResponder() override; void clearFirstResponder(); - virtual void onLoseFirstResponder(); + void onLoseFirstResponder() override; //virtual void acceleratorKeyPress(U32 index); //virtual void acceleratorKeyRelease(U32 index); @@ -107,8 +107,8 @@ public: virtual void onMessage(GuiScriptNotifyCtrl *sender, S32 msg); ///< Receive a message from another control - virtual void onDialogPush(); - virtual void onDialogPop(); + void onDialogPush() override; + void onDialogPop() override; }; diff --git a/Engine/source/gui/core/guiTypes.h b/Engine/source/gui/core/guiTypes.h index 44bce618f..a96dd92f1 100644 --- a/Engine/source/gui/core/guiTypes.h +++ b/Engine/source/gui/core/guiTypes.h @@ -364,8 +364,8 @@ public: ~GuiCursor(void); static void initPersistFields(); - bool onAdd(void); - void onRemove(); + bool onAdd(void) override; + void onRemove() override; void render(const Point2I &pos); void onImageChanged() {} @@ -601,12 +601,12 @@ public: ~GuiControlProfile(); static void initPersistFields(); - bool onAdd(); + bool onAdd() override; - void onStaticModified(const char* slotName, const char* newValue = NULL ); + void onStaticModified(const char* slotName, const char* newValue = NULL ) override; /// Called when mProfileForChildren is deleted - virtual void onDeleteNotify(SimObject *object); + void onDeleteNotify(SimObject *object) override; /// This method creates an array of bitmaps from one single bitmap with /// separator color. The separator color is whatever color is in pixel 0,0 diff --git a/Engine/source/gui/editor/guiDebugger.h b/Engine/source/gui/editor/guiDebugger.h index 9255cc4e9..3537ae759 100644 --- a/Engine/source/gui/editor/guiDebugger.h +++ b/Engine/source/gui/editor/guiDebugger.h @@ -75,9 +75,9 @@ class DbgFileView : public GuiArrayCtrl DECLARE_CONOBJECT(DbgFileView); DECLARE_CATEGORY( "Gui Editor" ); - bool onWake(); + bool onWake() override; - void clear(); + void clear() override; void clearBreakPositions(); void setCurrentLine(S32 lineNumber, bool setCurrentLine); @@ -90,12 +90,12 @@ class DbgFileView : public GuiArrayCtrl bool findString(const char *text); - void onMouseDown(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; - void onPreRender(); - void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + void onPreRender() override; + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; }; #endif //_GUI_DEBUGGER_H diff --git a/Engine/source/gui/editor/guiEaseViewCtrl.h b/Engine/source/gui/editor/guiEaseViewCtrl.h index 28737f33a..937ad2371 100644 --- a/Engine/source/gui/editor/guiEaseViewCtrl.h +++ b/Engine/source/gui/editor/guiEaseViewCtrl.h @@ -49,10 +49,10 @@ class GuiEaseViewCtrl : public GuiControl GuiEaseViewCtrl(); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; - void onRender( Point2I, const RectI &); + void onRender( Point2I, const RectI &) override; static void initPersistFields(); DECLARE_CONOBJECT( GuiEaseViewCtrl ); diff --git a/Engine/source/gui/editor/guiEditCtrl.cpp b/Engine/source/gui/editor/guiEditCtrl.cpp index c47529da3..c30dab15d 100644 --- a/Engine/source/gui/editor/guiEditCtrl.cpp +++ b/Engine/source/gui/editor/guiEditCtrl.cpp @@ -2834,7 +2834,7 @@ class GuiEditorRuler : public GuiControl return ORIENTATION_Vertical; } - bool onWake() + bool onWake() override { if( !Parent::onWake() ) return false; @@ -2848,12 +2848,12 @@ class GuiEditorRuler : public GuiControl return true; } - void onPreRender() + void onPreRender() override { setUpdate(); } - void onMouseDown( const GuiEvent& event ) + void onMouseDown( const GuiEvent& event ) override { if( !mEditCtrl ) return; @@ -2872,7 +2872,7 @@ class GuiEditorRuler : public GuiControl mEditCtrl->startMouseGuideDrag( axis, guideIndex ); } - void onRender(Point2I offset, const RectI &updateRect) + void onRender(Point2I offset, const RectI &updateRect) override { GFX->getDrawUtil()->drawRectFill(updateRect, ColorI::DARK); diff --git a/Engine/source/gui/editor/guiEditCtrl.h b/Engine/source/gui/editor/guiEditCtrl.h index 38a1ddf34..3e1fbb4d3 100644 --- a/Engine/source/gui/editor/guiEditCtrl.h +++ b/Engine/source/gui/editor/guiEditCtrl.h @@ -246,8 +246,8 @@ class GuiEditCtrl : public GuiControl DECLARE_CATEGORY( "Gui Editor" ); DECLARE_DESCRIPTION( "Implements the framework for the GUI editor." ); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; static void initPersistFields(); @@ -258,8 +258,8 @@ class GuiEditCtrl : public GuiControl void getDragRect(RectI &b); void drawNut(const Point2I &nut, ColorI &outlineColor, ColorI &nutColor); void drawNuts(RectI &box, ColorI &outlineColor, ColorI &nutColor); - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; void addNewControl(GuiControl *ctrl); void setCurrentAddSet(GuiControl *ctrl, bool clearSelection = true); GuiControl* getCurrentAddSet(); @@ -314,7 +314,7 @@ class GuiEditCtrl : public GuiControl void controlInspectPostApply(GuiControl* object); // Sizing Cursors - void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; U32 getSelectionSize() const { return mSelectedControls.size(); } const Vector& getSelected() const { return mSelectedControls; } @@ -322,16 +322,16 @@ class GuiEditCtrl : public GuiControl SimGroup* getTrash() { return mTrash; } GuiControl* getAddSet() const { return mCurrentAddSet; }; //JDD - bool onKeyDown(const GuiEvent &event); - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onRightMouseDown(const GuiEvent &event); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onRightMouseDown(const GuiEvent &event) override; mouseModes getMouseMode() const { return mMouseDownMode; } - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; void setSnapToGrid(U32 gridsize); }; diff --git a/Engine/source/gui/editor/guiFilterCtrl.h b/Engine/source/gui/editor/guiFilterCtrl.h index b40dee26b..7f5a92101 100644 --- a/Engine/source/gui/editor/guiFilterCtrl.h +++ b/Engine/source/gui/editor/guiFilterCtrl.h @@ -66,11 +66,11 @@ public: static void initPersistFields(); //Parental methods - bool onWake(); + bool onWake() override; - void onMouseDown(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onMouseUp(const GuiEvent &); + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &) override; F32 getValue(S32 n); const Filter* get() { return &mFilter; } @@ -78,8 +78,8 @@ public: S32 getNumControlPoints() {return mFilter.size(); } void identity(); - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect ); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect ) override; }; diff --git a/Engine/source/gui/editor/guiGraphCtrl.h b/Engine/source/gui/editor/guiGraphCtrl.h index 99139fbd7..72c367cfe 100644 --- a/Engine/source/gui/editor/guiGraphCtrl.h +++ b/Engine/source/gui/editor/guiGraphCtrl.h @@ -73,7 +73,7 @@ class GuiGraphCtrl : public GuiControl void setMax( S32 plotID, F32 max ) { mGraphMax[ plotID ] = max; } // GuiControl. - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; DECLARE_CONOBJECT(GuiGraphCtrl); DECLARE_CATEGORY( "Gui Other" ); diff --git a/Engine/source/gui/editor/guiInspector.h b/Engine/source/gui/editor/guiInspector.h index 0bbc40885..3b473829b 100644 --- a/Engine/source/gui/editor/guiInspector.h +++ b/Engine/source/gui/editor/guiInspector.h @@ -51,18 +51,18 @@ public: static void initPersistFields(); // SimObject - virtual void onRemove(); - virtual void onDeleteNotify( SimObject *object ); + void onRemove() override; + void onDeleteNotify( SimObject *object ) override; // GuiControl - virtual void parentResized( const RectI &oldParentRect, const RectI &newParentRect ); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); - virtual GuiControl* findHitControl( const Point2I &pt, S32 initialLayer ); - virtual void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent ); - virtual void onMouseMove( const GuiEvent &event ); - virtual void onMouseDown( const GuiEvent &event ); - virtual void onMouseUp( const GuiEvent &event ); - virtual void onMouseDragged( const GuiEvent &event ); + void parentResized( const RectI &oldParentRect, const RectI &newParentRect ) override; + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; + GuiControl* findHitControl( const Point2I &pt, S32 initialLayer ) override; + void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent ) override; + void onMouseMove( const GuiEvent &event ) override; + void onMouseDown( const GuiEvent &event ) override; + void onMouseUp( const GuiEvent &event ) override; + void onMouseDragged( const GuiEvent &event ) override; // GuiInspector diff --git a/Engine/source/gui/editor/guiInspectorTypes.h b/Engine/source/gui/editor/guiInspectorTypes.h index 2f9e26b31..12ce20c68 100644 --- a/Engine/source/gui/editor/guiInspectorTypes.h +++ b/Engine/source/gui/editor/guiInspectorTypes.h @@ -62,8 +62,8 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual void setValue( StringTableEntry newValue ); + GuiControl* constructEditControl() override; + void setValue( StringTableEntry newValue ) override; virtual void _populateMenu( GuiPopUpMenuCtrlEx *menu ); }; @@ -78,7 +78,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeEnum); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; //----------------------------------------------------------------------------- @@ -92,7 +92,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeCubemapName); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; //-------------------------------------------------------------------------------- @@ -119,8 +119,8 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; class GuiInspectorTypeRegularMaterialName : public GuiInspectorTypeMaterialName @@ -150,7 +150,7 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; //-------------------------------------------------------------------------------- @@ -170,7 +170,7 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; //----------------------------------------------------------------------------- @@ -184,7 +184,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeGuiProfile); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; //----------------------------------------------------------------------------- @@ -198,7 +198,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeActionMap); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx * menu); + void _populateMenu(GuiPopUpMenuCtrlEx * menu) override; }; //----------------------------------------------------------------------------- @@ -215,9 +215,9 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual void setValue( StringTableEntry newValue ); - virtual const char* getValue(); + GuiControl* constructEditControl() override; + void setValue( StringTableEntry newValue ) override; + const char* getValue() override; }; //----------------------------------------------------------------------------- @@ -237,8 +237,8 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual void setValue( StringTableEntry data ); + GuiControl* constructEditControl() override; + void setValue( StringTableEntry data ) override; }; //----------------------------------------------------------------------------- @@ -258,10 +258,10 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); - virtual bool updateRects(); - virtual void updateValue(); + GuiControl* constructEditControl() override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + bool updateRects() override; + void updateValue() override; }; @@ -276,7 +276,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeImageFileName); static void consoleInit(); - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; bool renderTooltip( const Point2I &hoverPos, const Point2I &cursorPos, const char *tipText = NULL ); }; @@ -298,8 +298,8 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -328,9 +328,9 @@ class GuiInspectorTypeEaseF : public GuiInspectorField //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -344,7 +344,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypePrefabFilename); static void consoleInit(); - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; //----------------------------------------------------------------------------- @@ -360,8 +360,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeShapeFilename); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -394,9 +394,9 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -408,7 +408,7 @@ class GuiInspectorTypeColorI : public GuiInspectorTypeColor protected: - virtual const char* _getColorConversionFunction() const { return "ColorFloatToInt"; } + const char* _getColorConversionFunction() const override { return "ColorFloatToInt"; } public: @@ -417,7 +417,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeColorI); static void consoleInit(); - void setValue( StringTableEntry newValue ); + void setValue( StringTableEntry newValue ) override; }; //----------------------------------------------------------------------------- @@ -434,7 +434,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeColorF); static void consoleInit(); - void setValue( StringTableEntry newValue ); + void setValue( StringTableEntry newValue ) override; }; /* NOTE: Evidently this isn't used anywhere (or implemented) so i commented it out @@ -469,8 +469,8 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeS32); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual void setValue( StringTableEntry newValue ); + GuiControl* constructEditControl() override; + void setValue( StringTableEntry newValue ) override; }; @@ -492,16 +492,16 @@ public: DECLARE_CONOBJECT( GuiInspectorTypeBitMask32 ); // ConsoleObject - bool onAdd(); + bool onAdd() override; static void consoleInit(); // GuiInspectorField - virtual void childResized( GuiControl *child ); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); - virtual bool updateRects(); - virtual void updateData(); - virtual StringTableEntry getValue(); - virtual void setValue( StringTableEntry value ); + void childResized( GuiControl *child ) override; + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; + bool updateRects() override; + void updateData() override; + StringTableEntry getValue() override; + void setValue( StringTableEntry value ) override; protected: @@ -529,10 +529,10 @@ public: //----------------------------------------------------------------------------- // Override able methods for custom edit fields //----------------------------------------------------------------------------- - virtual GuiControl* constructEditControl(); - virtual bool resize( const Point2I &newPosition, const Point2I &newExtent ); - virtual bool updateRects(); - virtual void setValue( StringTableEntry value ); + GuiControl* constructEditControl() override; + bool resize( const Point2I &newPosition, const Point2I &newExtent ) override; + bool updateRects() override; + void setValue( StringTableEntry value ) override; }; @@ -547,7 +547,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeName); static void consoleInit(); - virtual bool verifyData( StringTableEntry data ); + bool verifyData( StringTableEntry data ) override; }; @@ -562,7 +562,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeSFXParameterName); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; @@ -577,7 +577,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeSFXStateName); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; @@ -592,7 +592,7 @@ public: DECLARE_CONOBJECT(GuiInspectorTypeSFXSourceName); static void consoleInit(); - virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu ); + void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override; }; //----------------------------------------------------------------------------- @@ -620,9 +620,9 @@ public: GuiButtonCtrl* mPasteButton; virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width); - virtual void updateValue(); - virtual bool resize(const Point2I& newPosition, const Point2I& newExtent); - virtual bool updateRects(); + void updateValue() override; + bool resize(const Point2I& newPosition, const Point2I& newExtent) override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -641,10 +641,10 @@ protected: public: GuiTextCtrl* mDimensionLabelZ; - virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width); - virtual void updateValue(); - virtual bool resize(const Point2I& newPosition, const Point2I& newExtent); - virtual bool updateRects(); + void constructEditControlChildren(GuiControl* retCtrl, S32 width) override; + void updateValue() override; + bool resize(const Point2I& newPosition, const Point2I& newExtent) override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -661,10 +661,10 @@ protected: public: GuiTextCtrl* mDimensionLabelW; - virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width); - virtual void updateValue(); - virtual bool resize(const Point2I& newPosition, const Point2I& newExtent); - virtual bool updateRects(); + void constructEditControlChildren(GuiControl* retCtrl, S32 width) override; + void updateValue() override; + bool resize(const Point2I& newPosition, const Point2I& newExtent) override; + bool updateRects() override; }; //----------------------------------------------------------------------------- @@ -678,7 +678,7 @@ private: public: DECLARE_CONOBJECT(GuiInspectorTypePoint2F); static void consoleInit(); - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; class GuiInspectorTypePoint2I : public GuiInspectorTypePoint2F @@ -688,7 +688,7 @@ private: public: DECLARE_CONOBJECT(GuiInspectorTypePoint2I); static void consoleInit(); - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; @@ -704,7 +704,7 @@ private: public: DECLARE_CONOBJECT(GuiInspectorTypePoint3F); static void consoleInit(); - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; }; //----------------------------------------------------------------------------- @@ -721,16 +721,16 @@ public: EulerF eulAng; DECLARE_CONOBJECT(GuiInspectorTypeMatrixRotation); static void consoleInit(); - virtual GuiControl* constructEditControl(); - virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width); - virtual void updateValue(); - virtual bool resize(const Point2I& newPosition, const Point2I& newExtent); - virtual bool updateRects(); + GuiControl* constructEditControl() override; + void constructEditControlChildren(GuiControl* retCtrl, S32 width) override; + void updateValue() override; + bool resize(const Point2I& newPosition, const Point2I& newExtent) override; + bool updateRects() override; void updateAng(AngAxisF newAngAx); void updateEul(EulerF newEul); - virtual void updateData(); - virtual StringTableEntry getValue(); + void updateData() override; + StringTableEntry getValue() override; }; #endif // _GUI_INSPECTOR_TYPES_H_ diff --git a/Engine/source/gui/editor/guiMenuBar.h b/Engine/source/gui/editor/guiMenuBar.h index d52672392..600f92a91 100644 --- a/Engine/source/gui/editor/guiMenuBar.h +++ b/Engine/source/gui/editor/guiMenuBar.h @@ -81,33 +81,33 @@ public: GuiMenuBar(); - void onRemove(); - bool onWake(); - void onSleep(); + void onRemove() override; + bool onWake() override; + void onSleep() override; - virtual void addObject(SimObject* object); + void addObject(SimObject* object) override; MenuEntry *findHitMenu(Point2I mousePoint); - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; void checkMenuMouseMove(const GuiEvent &event); - void onMouseMove(const GuiEvent &event); - void onMouseEnter(const GuiEvent &event); - void onMouseLeave(const GuiEvent &event); - void onMouseDown(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); + void onMouseMove(const GuiEvent &event) override; + void onMouseEnter(const GuiEvent &event) override; + void onMouseLeave(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; - void onAction(); + void onAction() override; void closeMenu(); void buildWindowAcceleratorMap( WindowInputGenerator &inputGenerator ); void removeWindowAcceleratorMap( WindowInputGenerator &inputGenerator ); - void acceleratorKeyPress(U32 index); + void acceleratorKeyPress(U32 index) override; // Added to support 'ticks' - void processTick(); + void processTick() override; void insert(SimObject* pObject, S32 pos); void remove(SimObject* pObject); diff --git a/Engine/source/gui/editor/guiParticleGraphCtrl.h b/Engine/source/gui/editor/guiParticleGraphCtrl.h index 4ee59b98a..b61157021 100644 --- a/Engine/source/gui/editor/guiParticleGraphCtrl.h +++ b/Engine/source/gui/editor/guiParticleGraphCtrl.h @@ -99,18 +99,18 @@ public: GuiParticleGraphCtrl(); virtual ~GuiParticleGraphCtrl() { }; - void onMouseMove(const GuiEvent &event); - void onMouseDown( const GuiEvent &event ); - void onMouseUp( const GuiEvent &event ); - void onMouseDragged( const GuiEvent &event ); - void onRightMouseDown( const GuiEvent &event ); - void onRightMouseUp( const GuiEvent &event ); - void onRightMouseDragged( const GuiEvent &event ); + void onMouseMove(const GuiEvent &event) override; + void onMouseDown( const GuiEvent &event ) override; + void onMouseUp( const GuiEvent &event ) override; + void onMouseDragged( const GuiEvent &event ) override; + void onRightMouseDown( const GuiEvent &event ) override; + void onRightMouseUp( const GuiEvent &event ) override; + void onRightMouseDragged( const GuiEvent &event ) override; //Parental methods - bool onWake(); + bool onWake() override; - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; bool renderGraphTooltip(Point2I cursorPos, StringTableEntry tooltip); // Graph interface diff --git a/Engine/source/gui/editor/guiPopupMenuCtrl.h b/Engine/source/gui/editor/guiPopupMenuCtrl.h index 54632a009..f54fa8d8c 100644 --- a/Engine/source/gui/editor/guiPopupMenuCtrl.h +++ b/Engine/source/gui/editor/guiPopupMenuCtrl.h @@ -61,12 +61,12 @@ public: GuiPopupMenuTextListCtrl(); // GuiControl overloads: - bool onKeyDown(const GuiEvent &event); - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver); + bool onKeyDown(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override; - virtual void onCellHighlighted(Point2I cell); // Added + void onCellHighlighted(Point2I cell) override; // Added }; class GuiPopupMenuBackgroundCtrl : public GuiControl @@ -75,10 +75,10 @@ class GuiPopupMenuBackgroundCtrl : public GuiControl public: GuiPopupMenuBackgroundCtrl(); - void onMouseDown(const GuiEvent &event); - void onMouseUp(const GuiEvent &event); - void onMouseMove(const GuiEvent &event); - void onMouseDragged(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; + void onMouseUp(const GuiEvent &event) override; + void onMouseMove(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; void close(); diff --git a/Engine/source/gui/editor/guiRectHandles.h b/Engine/source/gui/editor/guiRectHandles.h index b9a3f7551..fb6cd18d5 100644 --- a/Engine/source/gui/editor/guiRectHandles.h +++ b/Engine/source/gui/editor/guiRectHandles.h @@ -49,11 +49,11 @@ public: static void initPersistFields(); - virtual void onMouseUp(const GuiEvent &event); - virtual void onMouseDown(const GuiEvent &event); - virtual void onMouseDragged(const GuiEvent &event); + void onMouseUp(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; + void onMouseDragged(const GuiEvent &event) override; - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; }; #endif diff --git a/Engine/source/gui/editor/guiSeparatorCtrl.h b/Engine/source/gui/editor/guiSeparatorCtrl.h index beca62033..a5938dccb 100644 --- a/Engine/source/gui/editor/guiSeparatorCtrl.h +++ b/Engine/source/gui/editor/guiSeparatorCtrl.h @@ -58,7 +58,7 @@ public: static void initPersistFields(); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; }; typedef GuiSeparatorCtrl::separatorTypeOptions GuiSeparatorType; diff --git a/Engine/source/gui/editor/guiShapeEdPreview.h b/Engine/source/gui/editor/guiShapeEdPreview.h index ba42d7265..36cad41aa 100644 --- a/Engine/source/gui/editor/guiShapeEdPreview.h +++ b/Engine/source/gui/editor/guiShapeEdPreview.h @@ -163,7 +163,7 @@ protected: void updateThreads(F32 delta); // Rendering - void renderGrid(); + void renderGrid() override; void renderNodes() const; void renderNodeAxes(S32 index, const LinearColorF& nodeColor) const; void renderNodeName(S32 index, const LinearColorF& textColor) const; @@ -171,27 +171,27 @@ protected: void renderCollisionMeshes() const; public: - bool onWake(); + bool onWake() override; - void setDisplayType(S32 type); + void setDisplayType(S32 type) override; /// @name Mouse event handlers ///@{ - void onMouseDown(const GuiEvent& event) { handleMouseDown(event, NoneMode); } - void onMouseUp(const GuiEvent& event) { handleMouseUp(event, NoneMode); } - void onMouseMove(const GuiEvent& event) { handleMouseMove(event, NoneMode); } - void onMouseDragged(const GuiEvent& event) { handleMouseDragged(event, NoneMode); } + void onMouseDown(const GuiEvent& event) override { handleMouseDown(event, NoneMode); } + void onMouseUp(const GuiEvent& event) override { handleMouseUp(event, NoneMode); } + void onMouseMove(const GuiEvent& event) override { handleMouseMove(event, NoneMode); } + void onMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, NoneMode); } - void onMiddleMouseDown(const GuiEvent& event) { handleMouseDown(event, MoveMode); } - void onMiddleMouseUp(const GuiEvent& event) { handleMouseUp(event, MoveMode); } - void onMiddleMouseDragged(const GuiEvent& event) { handleMouseDragged(event, MoveMode); } + void onMiddleMouseDown(const GuiEvent& event) override { handleMouseDown(event, MoveMode); } + void onMiddleMouseUp(const GuiEvent& event) override { handleMouseUp(event, MoveMode); } + void onMiddleMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, MoveMode); } - void onRightMouseDown(const GuiEvent& event) { handleMouseDown(event, RotateMode); } - void onRightMouseUp(const GuiEvent& event) { handleMouseUp(event, RotateMode); } - void onRightMouseDragged(const GuiEvent& event) { handleMouseDragged(event, RotateMode); } + void onRightMouseDown(const GuiEvent& event) override { handleMouseDown(event, RotateMode); } + void onRightMouseUp(const GuiEvent& event) override { handleMouseUp(event, RotateMode); } + void onRightMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, RotateMode); } - void on3DMouseWheelUp(const Gui3DMouseEvent& event); - void on3DMouseWheelDown(const Gui3DMouseEvent& event); + void on3DMouseWheelUp(const Gui3DMouseEvent& event) override; + void on3DMouseWheelDown(const Gui3DMouseEvent& event) override; ///@} // Setters/Getters @@ -234,7 +234,7 @@ public: void refreshShape(); void updateNodeTransforms(); - void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_); + void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_) override; void fitToShape(); void setOrbitPos( const Point3F& pos ); @@ -243,15 +243,15 @@ public: /// @name Rendering ///@{ - bool getCameraTransform(MatrixF* cameraMatrix); - void computeSceneBounds(Box3F& bounds); + bool getCameraTransform(MatrixF* cameraMatrix) override; + void computeSceneBounds(Box3F& bounds) override; bool getMeshHidden(const char* name) const; void setMeshHidden(const char* name, bool hidden); void setAllMeshesHidden(bool hidden); - void renderWorld(const RectI& updateRect); - void renderGui(Point2I offset, const RectI& updateRect); + void renderWorld(const RectI& updateRect) override; + void renderGui(Point2I offset, const RectI& updateRect) override; ///@} DECLARE_CONOBJECT(GuiShapeEdPreview); diff --git a/Engine/source/gui/editor/inspector/customField.h b/Engine/source/gui/editor/inspector/customField.h index 27cbd231b..41b70c382 100644 --- a/Engine/source/gui/editor/inspector/customField.h +++ b/Engine/source/gui/editor/inspector/customField.h @@ -38,27 +38,27 @@ public: DECLARE_CONOBJECT( GuiInspectorCustomField ); - virtual void setData( const char* data, bool callbacks = true ); - virtual const char* getData( U32 inspectObjectIndex = 0 ); - virtual void updateValue(); - virtual StringTableEntry getFieldName() { return StringTable->EmptyString(); } + void setData( const char* data, bool callbacks = true ) override; + const char* getData( U32 inspectObjectIndex = 0 ) override; + void updateValue() override; + StringTableEntry getFieldName() override { return StringTable->EmptyString(); } virtual void setDoc( const char* doc ); virtual void setToolTip( StringTableEntry data ); - virtual bool onAdd(); + bool onAdd() override; - virtual void setInspectorField( AbstractClassRep::Field *field, + void setInspectorField( AbstractClassRep::Field *field, StringTableEntry caption = NULL, - const char *arrayIndex = NULL ); + const char *arrayIndex = NULL ) override; - virtual GuiControl* constructEditControl(); + GuiControl* constructEditControl() override; - virtual void setValue( const char* newValue ); + void setValue( const char* newValue ) override; protected: - virtual void _executeSelectedCallback(); + void _executeSelectedCallback() override; protected: diff --git a/Engine/source/gui/editor/inspector/datablockField.h b/Engine/source/gui/editor/inspector/datablockField.h index b12224766..6c635b1ab 100644 --- a/Engine/source/gui/editor/inspector/datablockField.h +++ b/Engine/source/gui/editor/inspector/datablockField.h @@ -44,9 +44,9 @@ class GuiInspectorDatablockField : public GuiInspectorTypeMenuBase RectI mBrowseRect; virtual SimSet* _getDatablockSet() const { return Sim::getDataBlockSet(); } - virtual void _populateMenu( GuiPopUpMenuCtrlEx* menu ); - virtual GuiControl* constructEditControl(); - virtual bool updateRects(); + void _populateMenu( GuiPopUpMenuCtrlEx* menu ) override; + GuiControl* constructEditControl() override; + bool updateRects() override; public: @@ -69,7 +69,7 @@ class GuiInspectorTypeSFXDescriptionName : public GuiInspectorDatablockField protected: - virtual SimSet* _getDatablockSet() const { return Sim::getSFXDescriptionSet(); } + SimSet* _getDatablockSet() const override { return Sim::getSFXDescriptionSet(); } public: @@ -89,7 +89,7 @@ class GuiInspectorTypeSFXTrackName : public GuiInspectorDatablockField protected: - virtual SimSet* _getDatablockSet() const { return Sim::getSFXTrackSet(); } + SimSet* _getDatablockSet() const override { return Sim::getSFXTrackSet(); } public: @@ -109,7 +109,7 @@ class GuiInspectorTypeSFXEnvironmentName : public GuiInspectorDatablockField protected: - virtual SimSet* _getDatablockSet() const { return Sim::getSFXEnvironmentSet(); } + SimSet* _getDatablockSet() const override { return Sim::getSFXEnvironmentSet(); } public: DECLARE_CONOBJECT(GuiInspectorTypeSFXEnvironmentName); @@ -128,7 +128,7 @@ class GuiInspectorTypeSFXAmbienceName : public GuiInspectorDatablockField protected: - virtual SimSet* _getDatablockSet() const { return Sim::getSFXAmbienceSet(); } + SimSet* _getDatablockSet() const override { return Sim::getSFXAmbienceSet(); } public: diff --git a/Engine/source/gui/editor/inspector/dynamicField.h b/Engine/source/gui/editor/inspector/dynamicField.h index 477873395..cca4845e6 100644 --- a/Engine/source/gui/editor/inspector/dynamicField.h +++ b/Engine/source/gui/editor/inspector/dynamicField.h @@ -39,24 +39,24 @@ public: DECLARE_CONOBJECT( GuiInspectorDynamicField ); - virtual void setData( const char* data, bool callbacks = true ); - virtual const char* getData( U32 inspectObjectIndex = 0 ); - virtual StringTableEntry getFieldName() { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); } - virtual StringTableEntry getRawFieldName() { return getFieldName(); } + void setData( const char* data, bool callbacks = true ) override; + const char* getData( U32 inspectObjectIndex = 0 ) override; + StringTableEntry getFieldName() override { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); } + StringTableEntry getRawFieldName() override { return getFieldName(); } - virtual bool onAdd(); + bool onAdd() override; void renameField( const char* newFieldName ); GuiControl* constructRenameControl(); - virtual bool updateRects(); - virtual void setInspectorField( AbstractClassRep::Field *field, + bool updateRects() override; + void setInspectorField( AbstractClassRep::Field *field, StringTableEntry caption = NULL, - const char *arrayIndex = NULL ); + const char *arrayIndex = NULL ) override; protected: - virtual void _executeSelectedCallback(); + void _executeSelectedCallback() override; protected: diff --git a/Engine/source/gui/editor/inspector/dynamicGroup.h b/Engine/source/gui/editor/inspector/dynamicGroup.h index fdc8d19c2..ddfe8ab78 100644 --- a/Engine/source/gui/editor/inspector/dynamicGroup.h +++ b/Engine/source/gui/editor/inspector/dynamicGroup.h @@ -45,8 +45,8 @@ public: // inspectGroup is overridden in GuiInspectorDynamicGroup to inspect an // objects FieldDictionary (dynamic fields) instead of regular persistent // fields. - bool inspectGroup(); - virtual void updateAllFields(); + bool inspectGroup() override; + void updateAllFields() override; // For scriptable dynamic field additions void addDynamicField(); @@ -58,7 +58,7 @@ public: virtual SimFieldDictionary::Entry* findDynamicFieldInDictionary( StringTableEntry fieldName ); protected: // create our inner controls when we add - virtual bool createContent(); + bool createContent() override; }; diff --git a/Engine/source/gui/editor/inspector/field.h b/Engine/source/gui/editor/inspector/field.h index 67412cd44..e04e9231b 100644 --- a/Engine/source/gui/editor/inspector/field.h +++ b/Engine/source/gui/editor/inspector/field.h @@ -202,12 +202,12 @@ class GuiInspectorField : public GuiControl GuiInspector* getInspector() const { return mInspector; } // GuiControl. - virtual bool onAdd(); - virtual bool resize(const Point2I &newPosition, const Point2I &newExtent); - virtual void onRender(Point2I offset, const RectI &updateRect); - virtual void setFirstResponder( GuiControl *firstResponder ); - virtual void onMouseDown( const GuiEvent &event ); - virtual void onRightMouseUp( const GuiEvent &event ); + bool onAdd() override; + bool resize(const Point2I &newPosition, const Point2I &newExtent) override; + void onRender(Point2I offset, const RectI &updateRect) override; + void setFirstResponder( GuiControl *firstResponder ) override; + void onMouseDown( const GuiEvent &event ) override; + void onRightMouseUp( const GuiEvent &event ) override; void setTargetObject(SimObject* obj) { mTargetObject = obj; } SimObject* getTargetObject() { return mTargetObject; } diff --git a/Engine/source/gui/editor/inspector/group.h b/Engine/source/gui/editor/inspector/group.h index 5cb7caab7..1d9c55dc9 100644 --- a/Engine/source/gui/editor/inspector/group.h +++ b/Engine/source/gui/editor/inspector/group.h @@ -70,7 +70,7 @@ public: const String& getGroupName() const { return mCaption; }; SimObjectPtr getInspector() { return mParent; }; - bool onAdd(); + bool onAdd() override; virtual bool inspectGroup(); virtual void animateToContents(); diff --git a/Engine/source/gui/editor/inspector/variableField.h b/Engine/source/gui/editor/inspector/variableField.h index 8bb382a58..694ef379e 100644 --- a/Engine/source/gui/editor/inspector/variableField.h +++ b/Engine/source/gui/editor/inspector/variableField.h @@ -45,15 +45,15 @@ public: DECLARE_CONOBJECT( GuiInspectorVariableField ); DECLARE_CATEGORY( "Gui Editor" ); - virtual bool onAdd(); + bool onAdd() override; - virtual void setValue( const char* newValue ); - virtual const char* getValue() { return NULL; } - virtual void updateValue(); - virtual void setData( const char* data, bool callbacks = true ); - virtual const char* getData( U32 inspectObjectIndex = 0 ); - virtual void updateData() {}; + void setValue( const char* newValue ) override; + const char* getValue() override { return NULL; } + void updateValue() override; + void setData( const char* data, bool callbacks = true ) override; + const char* getData( U32 inspectObjectIndex = 0 ) override; + void updateData() override {}; protected: StringTableEntry mVariableName; diff --git a/Engine/source/gui/editor/inspector/variableGroup.h b/Engine/source/gui/editor/inspector/variableGroup.h index 0711933a0..e6f53d719 100644 --- a/Engine/source/gui/editor/inspector/variableGroup.h +++ b/Engine/source/gui/editor/inspector/variableGroup.h @@ -67,9 +67,9 @@ public: DECLARE_CONOBJECT(GuiInspectorVariableGroup); DECLARE_CATEGORY( "Gui Editor" ); - virtual GuiInspectorField* constructField( S32 fieldType ); + GuiInspectorField* constructField( S32 fieldType ) override; - virtual bool inspectGroup(); + bool inspectGroup() override; void clearFields(); void addField(VariableField* field); diff --git a/Engine/source/gui/editor/inspector/variableInspector.h b/Engine/source/gui/editor/inspector/variableInspector.h index 2488e8206..563a74caf 100644 --- a/Engine/source/gui/editor/inspector/variableInspector.h +++ b/Engine/source/gui/editor/inspector/variableInspector.h @@ -43,7 +43,7 @@ public: DECLARE_CONOBJECT( GuiVariableInspector ); DECLARE_CATEGORY( "Gui Editor" ); - virtual void inspectObject( SimObject *object ) {} + void inspectObject( SimObject *object ) override {} virtual void loadVars( String searchString ); diff --git a/Engine/source/gui/editor/popupMenu.cpp b/Engine/source/gui/editor/popupMenu.cpp index b5dc3cb69..783453f02 100644 --- a/Engine/source/gui/editor/popupMenu.cpp +++ b/Engine/source/gui/editor/popupMenu.cpp @@ -35,7 +35,7 @@ bool PopupMenu::smSelectionEventHandled = false; class PopUpNotifyRemoveEvent : public SimEvent { public: - void process(SimObject *object) + void process(SimObject *object) override { PopupMenu::smPopupMenuEvent.remove((PopupMenu *)object, &PopupMenu::handleSelectEvent); } diff --git a/Engine/source/gui/editor/popupMenu.h b/Engine/source/gui/editor/popupMenu.h index 2925b8ace..265523a79 100644 --- a/Engine/source/gui/editor/popupMenu.h +++ b/Engine/source/gui/editor/popupMenu.h @@ -97,8 +97,8 @@ public: static void initPersistFields(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static PopupMenuEvent smPopupMenuEvent; static bool smSelectionEventHandled; /// Set to true if any menu or submenu handles a selection event @@ -181,8 +181,8 @@ public: /// it should work regardless of platform. void handleSelectEvent(U32 popID, U32 command); - virtual bool onMessageReceived(StringTableEntry queue, const char* event, const char* data ); - virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg ); + bool onMessageReceived(StringTableEntry queue, const char* event, const char* data ) override; + bool onMessageObjectReceived(StringTableEntry queue, Message *msg ) override; bool isVisible() { return mVisible; } void setVisible(bool isVis) { mVisible = isVis; } diff --git a/Engine/source/gui/game/guiChunkedBitmapCtrl.h b/Engine/source/gui/game/guiChunkedBitmapCtrl.h index f5d3405b8..08db54166 100644 --- a/Engine/source/gui/game/guiChunkedBitmapCtrl.h +++ b/Engine/source/gui/game/guiChunkedBitmapCtrl.h @@ -32,12 +32,12 @@ public: static void initPersistFields(); //Parental methods - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; void setBitmap(const char *name); - void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; void onImageChanged() {} }; diff --git a/Engine/source/gui/game/guiFadeinBitmapCtrl.h b/Engine/source/gui/game/guiFadeinBitmapCtrl.h index b6b3e0b77..b4c991430 100644 --- a/Engine/source/gui/game/guiFadeinBitmapCtrl.h +++ b/Engine/source/gui/game/guiFadeinBitmapCtrl.h @@ -69,12 +69,12 @@ class GuiFadeinBitmapCtrl : public GuiBitmapCtrl GuiFadeinBitmapCtrl(); // GuiControl. - virtual void onPreRender(); - virtual void onMouseDown(const GuiEvent &); - virtual bool onKeyDown(const GuiEvent &); - virtual bool onGamepadButtonDown(const GuiEvent& event); - virtual bool onWake(); - virtual void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onMouseDown(const GuiEvent &) override; + bool onKeyDown(const GuiEvent &) override; + bool onGamepadButtonDown(const GuiEvent& event) override; + bool onWake() override; + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); diff --git a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp index 27c53721f..55a0891d6 100644 --- a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp +++ b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp @@ -53,21 +53,21 @@ public: doFadeIn = false; doFadeOut = false; } - void onPreRender() + void onPreRender() override { Parent::onPreRender(); setUpdate(); } - void onMouseDown(const GuiEvent &) + void onMouseDown(const GuiEvent &) override { Con::executef(this, "click"); } - bool onKeyDown(const GuiEvent &) + bool onKeyDown(const GuiEvent &) override { Con::executef(this, "click"); return true; } - bool onWake() + bool onWake() override { if(!Parent::onWake()) return false; @@ -91,7 +91,7 @@ public: done = false; } - void onRender(Point2I offset, const RectI &updateRect) + void onRender(Point2I offset, const RectI &updateRect) override { U32 elapsed = Platform::getRealMilliseconds() - wakeTime; diff --git a/Engine/source/gui/game/guiMessageVectorCtrl.h b/Engine/source/gui/game/guiMessageVectorCtrl.h index 05d4ffc7c..a98baf23e 100644 --- a/Engine/source/gui/game/guiMessageVectorCtrl.h +++ b/Engine/source/gui/game/guiMessageVectorCtrl.h @@ -63,17 +63,17 @@ class GuiMessageVectorCtrl : public GuiControl // Gui control overrides protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - bool onWake(); - void onSleep(); - void onRender(Point2I offset, const RectI &updateRect); - void inspectPostApply(); - void parentResized(const RectI& oldParentRect, const RectI& newParentRect); + bool onWake() override; + void onSleep() override; + void onRender(Point2I offset, const RectI &updateRect) override; + void inspectPostApply() override; + void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override; - void onMouseUp(const GuiEvent &event); - void onMouseDown(const GuiEvent &event); + void onMouseUp(const GuiEvent &event) override; + void onMouseDown(const GuiEvent &event) override; // void onMouseMove(const GuiEvent &event); // Overrideables diff --git a/Engine/source/gui/game/guiProgressBitmapCtrl.h b/Engine/source/gui/game/guiProgressBitmapCtrl.h index fba8aaa3c..54c702f19 100644 --- a/Engine/source/gui/game/guiProgressBitmapCtrl.h +++ b/Engine/source/gui/game/guiProgressBitmapCtrl.h @@ -70,13 +70,13 @@ class GuiProgressBitmapCtrl : public GuiTextCtrl void setBitmap( const char* name ); //console related methods - virtual const char *getScriptValue(); - virtual void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; // GuiTextCtrl. - virtual void onPreRender(); - virtual void onRender( Point2I offset, const RectI &updateRect ); - virtual bool onWake(); + void onPreRender() override; + void onRender( Point2I offset, const RectI &updateRect ) override; + bool onWake() override; DECLARE_CONOBJECT( GuiProgressBitmapCtrl ); DECLARE_CATEGORY( "Gui Values" ); diff --git a/Engine/source/gui/game/guiProgressCtrl.h b/Engine/source/gui/game/guiProgressCtrl.h index 9d1aacca2..a4885224d 100644 --- a/Engine/source/gui/game/guiProgressCtrl.h +++ b/Engine/source/gui/game/guiProgressCtrl.h @@ -48,11 +48,11 @@ public: GuiProgressCtrl(); //console related methods - virtual const char *getScriptValue(); - virtual void setScriptValue(const char *value); + const char *getScriptValue() override; + void setScriptValue(const char *value) override; - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; }; #endif diff --git a/Engine/source/gui/shaderEditor/guiShaderEditor.h b/Engine/source/gui/shaderEditor/guiShaderEditor.h index a853951a4..1d79af328 100644 --- a/Engine/source/gui/shaderEditor/guiShaderEditor.h +++ b/Engine/source/gui/shaderEditor/guiShaderEditor.h @@ -111,26 +111,26 @@ public: DECLARE_CATEGORY("Shader Editor"); DECLARE_DESCRIPTION("Implements a shader node based editor."); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; static void initPersistFields(); - virtual bool onAdd() override; - virtual void onRemove() override; + bool onAdd() override; + void onRemove() override; - virtual void onPreRender() override; + void onPreRender() override; void drawThickLine(const Point2I& pt1, const Point2I& pt2, U32 thickness = 2, ColorI col1 = ColorI(255, 255, 255), ColorI col2 = ColorI(255, 255, 255)); - virtual void onRender(Point2I offset, const RectI& updateRect) override; + void onRender(Point2I offset, const RectI& updateRect) override; // interaction - virtual bool onKeyDown(const GuiEvent& event) override; - virtual void onMouseDown(const GuiEvent& event) override; - virtual void onMouseUp(const GuiEvent& event) override; - virtual void onMouseDragged(const GuiEvent& event) override; - virtual void onMiddleMouseDown(const GuiEvent& event) override; - virtual void onMiddleMouseUp(const GuiEvent& event) override; - virtual void onMiddleMouseDragged(const GuiEvent& event) override; - virtual bool onMouseWheelUp(const GuiEvent& event) override; - virtual bool onMouseWheelDown(const GuiEvent& event) override; + bool onKeyDown(const GuiEvent& event) override; + void onMouseDown(const GuiEvent& event) override; + void onMouseUp(const GuiEvent& event) override; + void onMouseDragged(const GuiEvent& event) override; + void onMiddleMouseDown(const GuiEvent& event) override; + void onMiddleMouseUp(const GuiEvent& event) override; + void onMiddleMouseDragged(const GuiEvent& event) override; + bool onMouseWheelUp(const GuiEvent& event) override; + bool onMouseWheelDown(const GuiEvent& event) override; RectI getSelectionBounds(); void deleteSelection(); diff --git a/Engine/source/gui/shaderEditor/guiShaderNode.h b/Engine/source/gui/shaderEditor/guiShaderNode.h index 0ab409ca9..630b2c8a1 100644 --- a/Engine/source/gui/shaderEditor/guiShaderNode.h +++ b/Engine/source/gui/shaderEditor/guiShaderNode.h @@ -138,15 +138,15 @@ public: GuiShaderNode(); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; static void initPersistFields(); - virtual bool onAdd() override; - virtual void onRemove() override; + bool onAdd() override; + void onRemove() override; void renderNode(Point2I offset, const RectI& updateRect, const S32 nodeSize); // Serialization functions - void write(Stream& stream, U32 tabStop = 0, U32 flags = 0); + void write(Stream& stream, U32 tabStop = 0, U32 flags = 0) override; void read(Stream& stream); // is the parent that all other nodes are derived from. diff --git a/Engine/source/gui/shiny/guiAudioCtrl.h b/Engine/source/gui/shiny/guiAudioCtrl.h index 906fd7bf9..32a674cf6 100644 --- a/Engine/source/gui/shiny/guiAudioCtrl.h +++ b/Engine/source/gui/shiny/guiAudioCtrl.h @@ -58,9 +58,9 @@ private: protected: // So this can be instantiated and not be a pure virtual class - void interpolateTick( F32 delta ) {}; - void processTick(); - void advanceTime( F32 timeDelta ) {}; + void interpolateTick( F32 delta ) override {}; + void processTick() override; + void advanceTime( F32 timeDelta ) override {}; S32 mTickPeriodMS; U32 mLastThink; @@ -89,9 +89,9 @@ public: GuiAudioCtrl(); ~GuiAudioCtrl(); // GuiControl. - bool onWake(); - void onSleep(); - void setActive(bool value) {}; + bool onWake() override; + void onSleep() override; + void setActive(bool value) override {}; bool testCondition(); static void initPersistFields(); DECLARE_CONOBJECT(GuiAudioCtrl); diff --git a/Engine/source/gui/shiny/guiTickCtrl.h b/Engine/source/gui/shiny/guiTickCtrl.h index 066a069a8..ea35c0660 100644 --- a/Engine/source/gui/shiny/guiTickCtrl.h +++ b/Engine/source/gui/shiny/guiTickCtrl.h @@ -53,9 +53,9 @@ private: protected: // So this can be instantiated and not be a pure virtual class - virtual void interpolateTick( F32 delta ) {}; - virtual void processTick() {}; - virtual void advanceTime( F32 timeDelta ) {}; + void interpolateTick( F32 delta ) override {}; + void processTick() override {}; + void advanceTime( F32 timeDelta ) override {}; public: DECLARE_CONOBJECT( GuiTickCtrl ); diff --git a/Engine/source/gui/theora/guiTheoraCtrl.h b/Engine/source/gui/theora/guiTheoraCtrl.h index 9946e442f..8209f3cd9 100644 --- a/Engine/source/gui/theora/guiTheoraCtrl.h +++ b/Engine/source/gui/theora/guiTheoraCtrl.h @@ -110,10 +110,10 @@ class GuiTheoraCtrl : public GuiControl } // GuiControl. - virtual bool onWake(); - virtual void onSleep(); - virtual void onRender( Point2I offset, const RectI &updateRect ); - virtual void inspectPostApply(); + bool onWake() override; + void onSleep() override; + void onRender( Point2I offset, const RectI &updateRect ) override; + void inspectPostApply() override; static void initPersistFields(); diff --git a/Engine/source/gui/utility/guiBubbleTextCtrl.h b/Engine/source/gui/utility/guiBubbleTextCtrl.h index c8175d0f7..5e0a668ac 100644 --- a/Engine/source/gui/utility/guiBubbleTextCtrl.h +++ b/Engine/source/gui/utility/guiBubbleTextCtrl.h @@ -54,7 +54,7 @@ class GuiBubbleTextCtrl : public GuiTextCtrl GuiBubbleTextCtrl() :mInAction(false), mDlg(NULL), mPopup(NULL), mMLText(NULL) {} - virtual void onMouseDown(const GuiEvent &event); + void onMouseDown(const GuiEvent &event) override; }; #endif /* _GUI_BUBBLE_TEXT_CONTROL_H_ */ diff --git a/Engine/source/gui/utility/guiInputCtrl.h b/Engine/source/gui/utility/guiInputCtrl.h index 5b87cc53f..62de1ea25 100644 --- a/Engine/source/gui/utility/guiInputCtrl.h +++ b/Engine/source/gui/utility/guiInputCtrl.h @@ -48,10 +48,10 @@ public: GuiInputCtrl(); // GuiControl. - virtual bool onWake(); - virtual void onSleep(); + bool onWake() override; + void onSleep() override; - virtual bool onInputEvent( const InputEventInfo &event ); + bool onInputEvent( const InputEventInfo &event ) override; static void initPersistFields(); diff --git a/Engine/source/gui/utility/guiMouseEventCtrl.h b/Engine/source/gui/utility/guiMouseEventCtrl.h index dfb21482d..91f01aeae 100644 --- a/Engine/source/gui/utility/guiMouseEventCtrl.h +++ b/Engine/source/gui/utility/guiMouseEventCtrl.h @@ -52,15 +52,15 @@ class GuiMouseEventCtrl : public GuiControl DECLARE_CALLBACK( void, onRightMouseDragged, ( S32 modifier, Point2I mousePoint, S32 mouseClickCount )); // GuiControl - void onMouseDown(const GuiEvent & event); - void onMouseUp(const GuiEvent & event); - void onMouseMove(const GuiEvent & event); - void onMouseDragged(const GuiEvent & event); - void onMouseEnter(const GuiEvent & event); - void onMouseLeave(const GuiEvent & event); - void onRightMouseDown(const GuiEvent & event); - void onRightMouseUp(const GuiEvent & event); - void onRightMouseDragged(const GuiEvent & event); + void onMouseDown(const GuiEvent & event) override; + void onMouseUp(const GuiEvent & event) override; + void onMouseMove(const GuiEvent & event) override; + void onMouseDragged(const GuiEvent & event) override; + void onMouseEnter(const GuiEvent & event) override; + void onMouseLeave(const GuiEvent & event) override; + void onRightMouseDown(const GuiEvent & event) override; + void onRightMouseUp(const GuiEvent & event) override; + void onRightMouseDragged(const GuiEvent & event) override; static void initPersistFields(); diff --git a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h index e44d6c2f1..72c70fd7f 100644 --- a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h +++ b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h @@ -49,8 +49,8 @@ class GuiRenderTargetVizCtrl : public GuiControl public: DECLARE_CONOBJECT(GuiRenderTargetVizCtrl); GuiRenderTargetVizCtrl(); - bool onWake(); - void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onRender(Point2I offset, const RectI &updateRect) override; static void initPersistFields(); }; diff --git a/Engine/source/gui/utility/messageVector.h b/Engine/source/gui/utility/messageVector.h index 2169dd04f..fc5450d43 100644 --- a/Engine/source/gui/utility/messageVector.h +++ b/Engine/source/gui/utility/messageVector.h @@ -91,8 +91,8 @@ class MessageVector : public SimObject //-------------------------------------- Internal interface protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; private: struct SpectatorRef { diff --git a/Engine/source/gui/worldEditor/creator.h b/Engine/source/gui/worldEditor/creator.h index 074f34ad4..a2facfaac 100644 --- a/Engine/source/gui/worldEditor/creator.h +++ b/Engine/source/gui/worldEditor/creator.h @@ -98,20 +98,20 @@ class CreatorTree : public GuiArrayCtrl // void sort(); - void clear(); + void clear() override; S32 mTabSize; S32 mMaxWidth; S32 mTxtOffset; // GuiControl - void onMouseDown(const GuiEvent & event); - void onMouseDragged(const GuiEvent & event); - void onMouseUp(const GuiEvent & event); - bool onWake(); + void onMouseDown(const GuiEvent & event) override; + void onMouseDragged(const GuiEvent & event) override; + void onMouseUp(const GuiEvent & event) override; + bool onWake() override; // GuiArrayCtrl - void onRenderCell(Point2I offset, Point2I cell, bool, bool); + void onRenderCell(Point2I offset, Point2I cell, bool, bool) override; DECLARE_CONOBJECT(CreatorTree); DECLARE_CATEGORY( "Gui Editor" ); diff --git a/Engine/source/gui/worldEditor/editTSCtrl.h b/Engine/source/gui/worldEditor/editTSCtrl.h index 70ee00705..ca526f78d 100644 --- a/Engine/source/gui/worldEditor/editTSCtrl.h +++ b/Engine/source/gui/worldEditor/editTSCtrl.h @@ -48,22 +48,22 @@ class EditTSCtrl : public GuiTSCtrl void make3DMouseEvent(Gui3DMouseEvent & gui3Devent, const GuiEvent &event); // GuiControl - virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent); - virtual void onMouseUp(const GuiEvent & event); - virtual void onMouseDown(const GuiEvent & event); - virtual void onMouseMove(const GuiEvent & event); - virtual void onMouseDragged(const GuiEvent & event); - virtual void onMouseEnter(const GuiEvent & event); - virtual void onMouseLeave(const GuiEvent & event); - virtual void onRightMouseDown(const GuiEvent & event); - virtual void onRightMouseUp(const GuiEvent & event); - virtual void onRightMouseDragged(const GuiEvent & event); - virtual void onMiddleMouseDown(const GuiEvent & event); - virtual void onMiddleMouseUp(const GuiEvent & event); - virtual void onMiddleMouseDragged(const GuiEvent & event); - virtual bool onInputEvent(const InputEventInfo & event); - virtual bool onMouseWheelUp(const GuiEvent &event); - virtual bool onMouseWheelDown(const GuiEvent &event); + void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override; + void onMouseUp(const GuiEvent & event) override; + void onMouseDown(const GuiEvent & event) override; + void onMouseMove(const GuiEvent & event) override; + void onMouseDragged(const GuiEvent & event) override; + void onMouseEnter(const GuiEvent & event) override; + void onMouseLeave(const GuiEvent & event) override; + void onRightMouseDown(const GuiEvent & event) override; + void onRightMouseUp(const GuiEvent & event) override; + void onRightMouseDragged(const GuiEvent & event) override; + void onMiddleMouseDown(const GuiEvent & event) override; + void onMiddleMouseUp(const GuiEvent & event) override; + void onMiddleMouseDragged(const GuiEvent & event) override; + bool onInputEvent(const InputEventInfo & event) override; + bool onMouseWheelUp(const GuiEvent &event) override; + bool onMouseWheelDown(const GuiEvent &event) override; virtual void updateGuiInfo() {}; @@ -73,7 +73,7 @@ class EditTSCtrl : public GuiTSCtrl virtual void renderGrid(); // GuiTSCtrl - void renderWorld(const RectI & updateRect); + void renderWorld(const RectI & updateRect) override; void _renderScene(ObjectRenderInst*, SceneRenderState *state, BaseMatInstance*); @@ -124,8 +124,8 @@ class EditTSCtrl : public GuiTSCtrl ~EditTSCtrl(); // SimObject - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; // bool mRenderMissionArea; @@ -172,10 +172,10 @@ class EditTSCtrl : public GuiTSCtrl // GuiTSCtrl virtual bool getCameraTransform(MatrixF* cameraMatrix); virtual void computeSceneBounds(Box3F& bounds); - bool processCameraQuery(CameraQuery * query); + bool processCameraQuery(CameraQuery * query) override; // guiControl - virtual void onRender(Point2I offset, const RectI &updateRect); + void onRender(Point2I offset, const RectI &updateRect) override; virtual void on3DMouseUp(const Gui3DMouseEvent &){}; virtual void on3DMouseDown(const Gui3DMouseEvent &){}; virtual void on3DMouseMove(const Gui3DMouseEvent &){}; @@ -191,7 +191,7 @@ class EditTSCtrl : public GuiTSCtrl virtual bool isMiddleMouseDown() {return mMiddleMouseDown;} - virtual bool resize(const Point2I& newPosition, const Point2I& newExtent); + bool resize(const Point2I& newPosition, const Point2I& newExtent) override; S32 getDisplayType() const {return mDisplayType;} virtual void setDisplayType(S32 type); diff --git a/Engine/source/gui/worldEditor/editor.h b/Engine/source/gui/worldEditor/editor.h index 7ab4da857..e4150d3d8 100644 --- a/Engine/source/gui/worldEditor/editor.h +++ b/Engine/source/gui/worldEditor/editor.h @@ -43,11 +43,11 @@ class EditManager : public GuiControl EditManager(); ~EditManager(); - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; // SimObject - bool onAdd(); + bool onAdd() override; /// Perform the onEditorEnabled callback on all SimObjects /// and set gEditingMission true. diff --git a/Engine/source/gui/worldEditor/gizmo.h b/Engine/source/gui/worldEditor/gizmo.h index 5cc64514a..f0075f662 100644 --- a/Engine/source/gui/worldEditor/gizmo.h +++ b/Engine/source/gui/worldEditor/gizmo.h @@ -80,7 +80,7 @@ public: DECLARE_CONOBJECT( GizmoProfile ); - virtual bool onAdd(); + bool onAdd() override; static void initPersistFields(); static void consoleInit(); @@ -192,8 +192,8 @@ public: DECLARE_CONOBJECT( Gizmo ); // SimObject - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); // Mutators diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h index 1c64e964a..3a6c99577 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h @@ -55,29 +55,29 @@ public: DECLARE_CONOBJECT( GuiConvexEditorCtrl ); // SimObject - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); // GuiControl - virtual bool onWake(); - virtual void onSleep(); - virtual void setVisible(bool value); + bool onWake() override; + void onSleep() override; + void setVisible(bool value) override; // EditTSCtrl - bool onKeyDown( const GuiEvent &event ); - bool onKeyUp( 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 renderScene(const RectI & updateRect); - void updateGizmo(); + bool onKeyDown( const GuiEvent &event ) override; + bool onKeyUp( 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 renderScene(const RectI & updateRect) override; + void updateGizmo() override; void updateShape( ConvexShape *shape, S32 offsetFace = -1 ); static void synchClientObject( const ConvexShape *serverConvex ); @@ -260,8 +260,8 @@ public: MatrixF mSavedObjToWorld; Point3F mSavedScale; - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; class ConvexEditorTool @@ -311,15 +311,15 @@ public: ConvexEditorCreateTool( GuiConvexEditorCtrl *editor ); virtual ~ConvexEditorCreateTool() {} - virtual void onActivated( ConvexEditorTool *prevTool ); - virtual void onDeactivated( ConvexEditorTool *newTool ); + void onActivated( ConvexEditorTool *prevTool ) override; + void onDeactivated( ConvexEditorTool *newTool ) override; - virtual EventResult on3DMouseDown( const Gui3DMouseEvent &event ); - virtual EventResult on3DMouseUp( const Gui3DMouseEvent &event ); - virtual EventResult on3DMouseMove( const Gui3DMouseEvent &event ); - virtual EventResult on3DMouseDragged( const Gui3DMouseEvent &event ); + EventResult on3DMouseDown( const Gui3DMouseEvent &event ) override; + EventResult on3DMouseUp( const Gui3DMouseEvent &event ) override; + EventResult on3DMouseMove( const Gui3DMouseEvent &event ) override; + EventResult on3DMouseDragged( const Gui3DMouseEvent &event ) override; - virtual void renderScene(const RectI & updateRect); + void renderScene(const RectI & updateRect) override; ConvexShape* extrudeShapeFromFace( ConvexShape *shape, S32 face ); diff --git a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h index 06903e049..b555418c0 100644 --- a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h @@ -51,29 +51,29 @@ class GuiDecalEditorCtrl : public EditTSCtrl DECLARE_CONOBJECT(GuiDecalEditorCtrl); // SimObject - bool onAdd(); + bool onAdd() override; static void initPersistFields(); static void consoleInit(); - void onEditorDisable(); + void onEditorDisable() override; // GuiControl - virtual bool onWake(); - virtual void onSleep(); - virtual void onRender(Point2I offset, const RectI &updateRect); + bool onWake() override; + void onSleep() override; + void onRender(Point2I offset, const RectI &updateRect) override; // EditTSCtrl - 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); + 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; /// Find clicked point on "static collision" objects. bool getRayInfo( const Gui3DMouseEvent &event, RayInfo *rInfo ); @@ -132,8 +132,8 @@ public: void addDecal(const DecalInstance& decal); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; //Decal Instance Delete Undo Actions @@ -162,8 +162,8 @@ public: void deleteDecal(const DecalInstance& decal); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; //Decal Datablock Delete Undo Actions @@ -191,8 +191,8 @@ public: void deleteDecal(const DecalInstance& decal); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; //Decal Datablock Retarget Undo Actions @@ -221,8 +221,8 @@ public: void retargetDecal( DecalInstance* decal ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; #endif // _GUIDECALEDITORCTRL_H_ diff --git a/Engine/source/gui/worldEditor/guiMissionArea.h b/Engine/source/gui/worldEditor/guiMissionArea.h index 947cd5a8c..97c9013c5 100644 --- a/Engine/source/gui/worldEditor/guiMissionArea.h +++ b/Engine/source/gui/worldEditor/guiMissionArea.h @@ -119,20 +119,20 @@ public: DECLARE_CONOBJECT(GuiMissionAreaCtrl); // SimObject - bool onAdd(); + bool onAdd() override; static void initPersistFields(); // GuiControl - void onRender(Point2I offset, const RectI &updateRect); - bool onWake(); - void onSleep(); + void onRender(Point2I offset, const RectI &updateRect) override; + bool onWake() override; + void onSleep() override; - virtual void onMouseUp(const GuiEvent & event); - virtual void onMouseDown(const GuiEvent & event); - virtual void onMouseMove(const GuiEvent & event); - virtual void onMouseDragged(const GuiEvent & event); - virtual void onMouseEnter(const GuiEvent & event); - virtual void onMouseLeave(const GuiEvent & event); + void onMouseUp(const GuiEvent & event) override; + void onMouseDown(const GuiEvent & event) override; + void onMouseMove(const GuiEvent & event) override; + void onMouseDragged(const GuiEvent & event) override; + void onMouseEnter(const GuiEvent & event) override; + void onMouseLeave(const GuiEvent & event) override; void setMissionArea( MissionArea* area ); void updateTerrain(); @@ -154,8 +154,8 @@ class GuiMissionAreaUndoAction : public UndoAction SimObjectId mObjId; RectI mArea; - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; #endif // _GUIMISSIONAREA_H_ diff --git a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h b/Engine/source/gui/worldEditor/guiMissionAreaEditor.h index c934897a6..23f695efd 100644 --- a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h +++ b/Engine/source/gui/worldEditor/guiMissionAreaEditor.h @@ -44,11 +44,11 @@ public: DECLARE_CONOBJECT(GuiMissionAreaEditorCtrl); // SimObject - bool onAdd(); + bool onAdd() override; static void initPersistFields(); // EditTSCtrl - void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ); + void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override; void setSelectedMissionArea( MissionArea *missionArea ); MissionArea* getSelectedMissionArea() { return mSelMissionArea; }; diff --git a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h index 68f670f82..0b2bdc3c8 100644 --- a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h +++ b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h @@ -65,9 +65,9 @@ public: static void initPersistFields(); //Parental methods - bool onWake(); - void onSleep(); - bool onAdd(); + bool onWake() override; + void onSleep() override; + bool onAdd() override; void setBitmap(const GFXTexHandle&); @@ -80,8 +80,8 @@ public: //void setValue(const Point2F *center, const Point2F *camera); //const char *getScriptValue(); - void onPreRender(); - void onRender(Point2I offset, const RectI &updateRect); + void onPreRender() override; + void onRender(Point2I offset, const RectI &updateRect) override; }; diff --git a/Engine/source/gui/worldEditor/terrainActions.h b/Engine/source/gui/worldEditor/terrainActions.h index 2fc0b2df5..2d965c643 100644 --- a/Engine/source/gui/worldEditor/terrainActions.h +++ b/Engine/source/gui/worldEditor/terrainActions.h @@ -66,28 +66,28 @@ class SelectAction : public TerrainAction { public: SelectAction(TerrainEditor * editor) : TerrainAction(editor){}; - StringTableEntry getName(){return("select");} + StringTableEntry getName() override{return("select");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; class DeselectAction : public TerrainAction { public: DeselectAction(TerrainEditor * editor) : TerrainAction(editor){}; - StringTableEntry getName(){return("deselect");} + StringTableEntry getName() override{return("deselect");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; class ClearAction : public TerrainAction { public: ClearAction(TerrainEditor * editor) : TerrainAction(editor){}; - StringTableEntry getName(){return("clear");} + StringTableEntry getName() override{return("clear");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) {}; - bool useMouseBrush() { mTerrainEditor->getCurrentSel()->reset(); return true; } + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override {}; + bool useMouseBrush() override { mTerrainEditor->getCurrentSel()->reset(); return true; } }; @@ -95,9 +95,9 @@ class SoftSelectAction : public TerrainAction { public: SoftSelectAction(TerrainEditor * editor) : TerrainAction(editor){}; - StringTableEntry getName(){return("softSelect");} + StringTableEntry getName() override{return("softSelect");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; Filter mFilter; }; @@ -108,10 +108,10 @@ class OutlineSelectAction : public TerrainAction { public: OutlineSelectAction(TerrainEditor * editor) : TerrainAction(editor){}; - StringTableEntry getName(){return("outlineSelect");} + StringTableEntry getName() override{return("outlineSelect");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); - bool useMouseBrush() { return(false); } + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; + bool useMouseBrush() override { return(false); } private: @@ -124,9 +124,9 @@ class PaintMaterialAction : public TerrainAction { public: PaintMaterialAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("paintMaterial");} + StringTableEntry getName() override{return("paintMaterial");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -135,9 +135,9 @@ class ClearMaterialsAction : public TerrainAction { public: ClearMaterialsAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("clearMaterials");} + StringTableEntry getName() override{return("clearMaterials");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -146,9 +146,9 @@ class RaiseHeightAction : public TerrainAction { public: RaiseHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("raiseHeight");} + StringTableEntry getName() override{return("raiseHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -157,9 +157,9 @@ class LowerHeightAction : public TerrainAction { public: LowerHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("lowerHeight");} + StringTableEntry getName() override{return("lowerHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -168,9 +168,9 @@ class SetHeightAction : public TerrainAction { public: SetHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("setHeight");} + StringTableEntry getName() override{return("setHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -179,9 +179,9 @@ class SetEmptyAction : public TerrainAction { public: SetEmptyAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("setEmpty");} + StringTableEntry getName() override{return("setEmpty");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -190,9 +190,9 @@ class ClearEmptyAction : public TerrainAction { public: ClearEmptyAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("clearEmpty");} + StringTableEntry getName() override{return("clearEmpty");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -201,9 +201,9 @@ class ScaleHeightAction : public TerrainAction { public: ScaleHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("scaleHeight");} + StringTableEntry getName() override{return("scaleHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; //------------------------------------------------------------------------------ @@ -212,9 +212,9 @@ class BrushAdjustHeightAction : public TerrainAction { public: BrushAdjustHeightAction(TerrainEditor* editor) : TerrainAction(editor) { mPreviousZ = 0.0f; } - StringTableEntry getName(){return("brushAdjustHeight");} + StringTableEntry getName() override{return("brushAdjustHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; private: PlaneF mIntersectionPlane; @@ -226,10 +226,10 @@ class AdjustHeightAction : public BrushAdjustHeightAction { public: AdjustHeightAction(TerrainEditor * editor); - StringTableEntry getName(){return("adjustHeight");} + StringTableEntry getName() override{return("adjustHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); - bool useMouseBrush() { return(false); } + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; + bool useMouseBrush() override { return(false); } private: // @@ -244,27 +244,27 @@ class FlattenHeightAction : public TerrainAction { public: FlattenHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("flattenHeight");} + StringTableEntry getName() override{return("flattenHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; class SmoothHeightAction : public TerrainAction { public: SmoothHeightAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("smoothHeight");} + StringTableEntry getName() override{return("smoothHeight");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; class SmoothSlopeAction : public TerrainAction { public: SmoothSlopeAction(TerrainEditor * editor) : TerrainAction(editor){} - StringTableEntry getName(){return("smoothSlope");} + StringTableEntry getName() override{return("smoothSlope");} - void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); + void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override; }; class PaintNoiseAction : public TerrainAction @@ -285,9 +285,9 @@ class PaintNoiseAction : public TerrainAction mScale = 1.5f / ( mMinMaxNoise.x - mMinMaxNoise.y); } - StringTableEntry getName() { return "paintNoise"; } + StringTableEntry getName() override { return "paintNoise"; } - void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type ); + void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type ) override; protected: @@ -348,8 +348,8 @@ public: static void initPersistFields(); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; /// Performs the initial smoothing and stores /// the heighfield state for later undo. diff --git a/Engine/source/gui/worldEditor/terrainEditor.cpp b/Engine/source/gui/worldEditor/terrainEditor.cpp index 3eb896f28..5a26dc1ff 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.cpp +++ b/Engine/source/gui/worldEditor/terrainEditor.cpp @@ -1741,7 +1741,7 @@ public: { mSequence = seq; } - void process(SimObject *object) + void process(SimObject *object) override { ((TerrainEditor *) object)->processActionTick(mSequence); } diff --git a/Engine/source/gui/worldEditor/terrainEditor.h b/Engine/source/gui/worldEditor/terrainEditor.h index a2ed6b6de..27de51a6b 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.h +++ b/Engine/source/gui/worldEditor/terrainEditor.h @@ -143,12 +143,12 @@ public: BoxBrush(TerrainEditor * editor) : Brush(editor){} - const char *getType() const { return "box"; } - void rebuild(); + const char *getType() const override { return "box"; } + void rebuild() override; protected: - void _renderOutline(); + void _renderOutline() override; }; class EllipseBrush : public Brush @@ -157,12 +157,12 @@ public: EllipseBrush(TerrainEditor * editor) : Brush(editor){} - const char *getType() const { return "ellipse"; } - void rebuild(); + const char *getType() const override { return "ellipse"; } + void rebuild() override; protected: - void _renderOutline(); + void _renderOutline() override; }; class SelectionBrush : public Brush @@ -171,14 +171,14 @@ public: SelectionBrush(TerrainEditor * editor); - const char *getType() const { return "selection"; } - void rebuild(); + const char *getType() const override { return "selection"; } + void rebuild() override; void render(Vector & vertexBuffer, S32 & verts, S32 & elems, S32 & prims, const LinearColorF & inColorFull, const LinearColorF & inColorNone, const LinearColorF & outColorFull, const LinearColorF & outColorNone) const; - void setSize(const Point2I &){} + void setSize(const Point2I &) override{} protected: - void _renderOutline() {} + void _renderOutline() override {} }; @@ -217,7 +217,7 @@ class TerrainEditor : public EditTSCtrl void mirrorTerrain(S32 mirrorIndex); - TerrainBlock* getActiveTerrain() { return mActiveTerrain; }; + TerrainBlock* getActiveTerrain() override { return mActiveTerrain; }; void scheduleGridUpdate() { mNeedsGridUpdate = true; } void scheduleMaterialUpdate() { mNeedsMaterialUpdate = true; } @@ -291,8 +291,8 @@ class TerrainEditor : public EditTSCtrl Selection *mSel; - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; void submitUndo( Selection *sel ); @@ -315,8 +315,8 @@ class TerrainEditor : public EditTSCtrl Vector mLayerMap; Vector mMaterials; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; bool mIsDirty; // dirty flag for writing terrain. @@ -452,28 +452,28 @@ class TerrainEditor : public EditTSCtrl public: // SimObject - bool onAdd(); - void onDeleteNotify(SimObject * object); + bool onAdd() override; + void onDeleteNotify(SimObject * object) override; static void initPersistFields(); // GuiControl - bool onWake(); - void onSleep(); + bool onWake() override; + void onSleep() override; // EditTSCtrl - bool onInputEvent( const InputEventInfo & evt ); - void on3DMouseUp( const Gui3DMouseEvent & evt ); - void on3DMouseDown( const Gui3DMouseEvent & evt ); - void on3DMouseMove( const Gui3DMouseEvent & evt ); - void on3DMouseDragged( const Gui3DMouseEvent & evt ); - bool onMouseWheelUp( const GuiEvent & evt ); - bool onMouseWheelDown( const GuiEvent & evt ); - void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt ); - void onPreRender(); - void renderScene(const RectI & updateRect); - void renderGui( Point2I offset, const RectI &updateRect ); - void updateGuiInfo(); + bool onInputEvent( const InputEventInfo & evt ) override; + void on3DMouseUp( const Gui3DMouseEvent & evt ) override; + void on3DMouseDown( const Gui3DMouseEvent & evt ) override; + void on3DMouseMove( const Gui3DMouseEvent & evt ) override; + void on3DMouseDragged( const Gui3DMouseEvent & evt ) override; + bool onMouseWheelUp( const GuiEvent & evt ) override; + bool onMouseWheelDown( const GuiEvent & evt ) override; + void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt ) override; + void onPreRender() override; + void renderScene(const RectI & updateRect) override; + void renderGui( Point2I offset, const RectI &updateRect ) override; + void updateGuiInfo() override; // Determine if the given grid point is valid within a non-wrap // around terrain. diff --git a/Engine/source/gui/worldEditor/tools/editorTool.h b/Engine/source/gui/worldEditor/tools/editorTool.h index 4b872fe6b..cb1ac690c 100644 --- a/Engine/source/gui/worldEditor/tools/editorTool.h +++ b/Engine/source/gui/worldEditor/tools/editorTool.h @@ -53,8 +53,8 @@ public: DECLARE_CONOBJECT(EditorTool); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; //Called when the tool is activated on the World Editor virtual void onActivated(WorldEditor*); diff --git a/Engine/source/gui/worldEditor/undoActions.h b/Engine/source/gui/worldEditor/undoActions.h index 48475647c..e11d52446 100644 --- a/Engine/source/gui/worldEditor/undoActions.h +++ b/Engine/source/gui/worldEditor/undoActions.h @@ -67,8 +67,8 @@ public: void addObject( SimObject *object ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; @@ -106,8 +106,8 @@ public: void deleteObject( const Vector &objectList ); // UndoAction - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; }; class InspectorFieldUndoAction : public UndoAction @@ -130,8 +130,8 @@ public: String mData; // UndoAction - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; #endif // _GUI_WORLDEDITOR_UNDOACTIONS_H_ diff --git a/Engine/source/gui/worldEditor/worldEditor.h b/Engine/source/gui/worldEditor/worldEditor.h index a94fe068d..3cac2d0ce 100644 --- a/Engine/source/gui/worldEditor/worldEditor.h +++ b/Engine/source/gui/worldEditor/worldEditor.h @@ -150,8 +150,8 @@ class WorldEditor : public EditTSCtrl Vector mEntries; - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; void submitUndo( Selection* sel, const UTF8* label="World Editor Action" ); @@ -389,7 +389,7 @@ class WorldEditor : public EditTSCtrl S32 mCurrentCursor; void setCursor(U32 cursor); - void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event); + void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event) override; public: @@ -399,23 +399,23 @@ class WorldEditor : public EditTSCtrl void setDirty() { mIsDirty = true; } // SimObject - virtual bool onAdd(); - virtual void onEditorEnable(); + bool onAdd() override; + void onEditorEnable() override; // EditTSCtrl - void on3DMouseMove(const Gui3DMouseEvent & event); - void on3DMouseDown(const Gui3DMouseEvent & event); - void on3DMouseUp(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 on3DMouseMove(const Gui3DMouseEvent & event) override; + void on3DMouseDown(const Gui3DMouseEvent & event) override; + void on3DMouseUp(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(); + void updateGuiInfo() override; // - void renderScene(const RectI & updateRect); + void renderScene(const RectI & updateRect) override; static void initPersistFields(); diff --git a/Engine/source/gui/worldEditor/worldEditorSelection.h b/Engine/source/gui/worldEditor/worldEditorSelection.h index 9ff9eef9c..f42b2ebfd 100644 --- a/Engine/source/gui/worldEditor/worldEditorSelection.h +++ b/Engine/source/gui/worldEditor/worldEditorSelection.h @@ -137,9 +137,9 @@ class WorldEditorSelection : public SimPersistSet void invalidateCentroid() { mCentroidValid = false; } // SimSet. - virtual void addObject( SimObject* ); - virtual void removeObject( SimObject* ); - virtual void setCanSave( bool value ); + void addObject( SimObject* ) override; + void removeObject( SimObject* ) override; + void setCanSave( bool value ) override; static void initPersistFields(); diff --git a/Engine/source/lighting/advanced/advancedLightBinManager.h b/Engine/source/lighting/advanced/advancedLightBinManager.h index 71131a1d3..aad445f03 100644 --- a/Engine/source/lighting/advanced/advancedLightBinManager.h +++ b/Engine/source/lighting/advanced/advancedLightBinManager.h @@ -72,8 +72,8 @@ protected: public: LightMatInstance(Material &mat) : Parent(mat), mLightMapParamsSC(NULL), mInternalPass(false), mSpecialLight(false) {} - virtual bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat ); - virtual bool setupPass( SceneRenderState *state, const SceneData &sgData ); + bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat ) override; + bool setupPass( SceneRenderState *state, const SceneData &sgData ) override; bool mSpecialLight; }; @@ -127,9 +127,9 @@ public: static void consoleInit(); // RenderBinManager - virtual void render(SceneRenderState *); - virtual void clear() {} - virtual void sort() {} + void render(SceneRenderState *) override; + void clear() override {} + void sort() override {} // Add a light to the bins void addLight( LightInfo *light ); diff --git a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h index 26e32c2b8..f0c010d5d 100644 --- a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h +++ b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h @@ -48,7 +48,7 @@ public: virtual ~AdvancedLightBufferConditioner(); - virtual String getName() + String getName() override { return String("Light Buffer Conditioner ") + String( mColorFormat == RGB ? "[RGB]" : "[LUV]" ); } @@ -56,10 +56,10 @@ public: protected: ColorFormat mColorFormat; - virtual Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta ); - virtual Var *_unconditionInput( Var *conditionedInput, MultiLine *meta ); - virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ); - virtual void printMethodFooter( MethodType methodType, Var *retVar, Stream &stream, MultiLine *meta ); + Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override; + Var *_unconditionInput( Var *conditionedInput, MultiLine *meta ) override; + Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override; + void printMethodFooter( MethodType methodType, Var *retVar, Stream &stream, MultiLine *meta ) override; }; #endif // _ADVANCED_LIGHTBUFFER_CONDITIONER_H_ \ No newline at end of file diff --git a/Engine/source/lighting/advanced/advancedLightManager.h b/Engine/source/lighting/advanced/advancedLightManager.h index ae3945876..95f0ec5fc 100644 --- a/Engine/source/lighting/advanced/advancedLightManager.h +++ b/Engine/source/lighting/advanced/advancedLightManager.h @@ -74,22 +74,22 @@ public: RenderDeferredMgr* getDeferredRenderBin() { return mDeferredRenderBin; } // LightManager - virtual bool isCompatible() const; - virtual void activate( SceneManager *sceneManager ); - virtual void deactivate(); - virtual void registerGlobalLight(LightInfo *light, SimObject *obj); - virtual void unregisterAllLights(); - virtual void setLightInfo( ProcessedMaterial *pmat, + bool isCompatible() const override; + void activate( SceneManager *sceneManager ) override; + void deactivate() override; + void registerGlobalLight(LightInfo *light, SimObject *obj) override; + void unregisterAllLights() override; + void setLightInfo( ProcessedMaterial *pmat, const Material *mat, const SceneData &sgData, const SceneRenderState *state, U32 pass, - GFXShaderConstBuffer *shaderConsts ); - virtual bool setTextureStage( const SceneData &sgData, + GFXShaderConstBuffer *shaderConsts ) override; + bool setTextureStage( const SceneData &sgData, const U32 currTexFlag, const U32 textureSlot, GFXShaderConstBuffer *shaderConsts, - ShaderConstHandles *handles ); + ShaderConstHandles *handles ) override; typedef GFXVertexPC LightVertex; @@ -105,8 +105,8 @@ public: protected: // LightManager - virtual void _addLightInfoEx( LightInfo *lightInfo ); - virtual void _initLightFields(); + void _addLightInfoEx( LightInfo *lightInfo ) override; + void _initLightFields() override; /// A simple protected singleton. Use LightManager::findByName() /// to access this light manager. diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h index f59231f2a..199d7b3c2 100644 --- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h +++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h @@ -48,25 +48,25 @@ protected: public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPixMacros( Vector ¯os, - const MaterialFeatureData &fd ); + void processPixMacros( Vector ¯os, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Deferred RT Lighting"; } @@ -79,22 +79,22 @@ class DeferredBumpFeatGLSL : public BumpFeatGLSL typedef BumpFeatGLSL Parent; public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Bumpmap [Deferred]"; } @@ -106,22 +106,22 @@ class DeferredMinnaertGLSL : public ShaderFeatureGLSL typedef ShaderFeatureGLSL Parent; public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPixMacros( Vector ¯os, - const MaterialFeatureData &fd ); + void processPixMacros( Vector ¯os, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Minnaert Shading [Deferred]"; } @@ -134,10 +134,10 @@ class DeferredSubSurfaceGLSL : public ShaderFeatureGLSL typedef ShaderFeatureGLSL Parent; public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Sub-Surface Approximation [Deferred]"; } diff --git a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h index 3d8c46be6..d876cef3a 100644 --- a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h +++ b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h @@ -30,63 +30,63 @@ class DeferredOrmMapGLSL : public ShaderFeatureGLSL { public: - virtual String getName() { return "Deferred Shading: PBR Config Map"; } + String getName() override { return "Deferred Shading: PBR Config Map"; } - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; }; class MatInfoFlagsGLSL : public ShaderFeatureGLSL { public: - virtual String getName() { return "Deferred Shading: Mat Info Flags"; } + String getName() override { return "Deferred Shading: Mat Info Flags"; } - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; }; class ORMConfigVarsGLSL : public ShaderFeatureGLSL { public: - virtual String getName() { return "Deferred Shading: PBR Config Explicit Numbers"; } + String getName() override { return "Deferred Shading: PBR Config Explicit Numbers"; } - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; }; class GlowMapGLSL : public ShaderFeatureGLSL { public: - virtual String getName() { return "Glow Map"; } + String getName() override { return "Glow Map"; } - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual Resources getResources(const MaterialFeatureData& fd); + Resources getResources(const MaterialFeatureData& fd) override; // Sets textures and texture flags for current pass - virtual void setTexData(Material::StageData& stageDat, + void setTexData(Material::StageData& stageDat, const MaterialFeatureData& fd, RenderPassData& passData, - U32& texIndex); + U32& texIndex) override; }; #endif diff --git a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h index 640891824..d818c10d5 100644 --- a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h +++ b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h @@ -63,19 +63,19 @@ public: virtual ~GBufferConditionerGLSL(); - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "GBuffer Conditioner"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "GBuffer Conditioner"; } protected: - virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ); + Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override; virtual GenOp* _posnegEncode( GenOp *val ); virtual GenOp* _posnegDecode( GenOp *val ); - virtual Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ); - virtual Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ); + Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override; + Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ) override; }; #endif // _GBUFFER_CONDITIONER_GLSL_H_ diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h index 1ab4225a4..17dd9b86d 100644 --- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h @@ -48,25 +48,25 @@ protected: public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPixMacros( Vector ¯os, - const MaterialFeatureData &fd ); + void processPixMacros( Vector ¯os, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Deferred RT Lighting"; } @@ -79,22 +79,22 @@ class DeferredBumpFeatHLSL : public BumpFeatHLSL typedef BumpFeatHLSL Parent; public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Bumpmap [Deferred]"; } @@ -107,22 +107,22 @@ class DeferredMinnaertHLSL : public ShaderFeatureHLSL typedef ShaderFeatureHLSL Parent; public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPixMacros( Vector ¯os, - const MaterialFeatureData &fd ); + void processPixMacros( Vector ¯os, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Minnaert Shading [Deferred]"; } @@ -135,10 +135,10 @@ class DeferredSubSurfaceHLSL : public ShaderFeatureHLSL typedef ShaderFeatureHLSL Parent; public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Sub-Surface Approximation [Deferred]"; } diff --git a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h index 5657c4d03..472f22115 100644 --- a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h @@ -29,64 +29,64 @@ class DeferredOrmMapHLSL : public ShaderFeatureHLSL { public: - virtual String getName() { return "Deferred Shading: PBR Config Map"; } + String getName() override { return "Deferred Shading: PBR Config Map"; } - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; }; class MatInfoFlagsHLSL : public ShaderFeatureHLSL { public: - virtual String getName() { return "Deferred Shading: Mat Info Flags"; } + String getName() override { return "Deferred Shading: Mat Info Flags"; } - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; }; class ORMConfigVarsHLSL : public ShaderFeatureHLSL { public: - virtual String getName() { return "Deferred Shading: PBR Config Explicit Numbers"; } + String getName() override { return "Deferred Shading: PBR Config Explicit Numbers"; } - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; }; class GlowMapHLSL : public ShaderFeatureHLSL { public: - virtual String getName() { return "Glow Map"; } + String getName() override { return "Glow Map"; } - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual U32 getOutputTargets(const MaterialFeatureData& fd) const; + U32 getOutputTargets(const MaterialFeatureData& fd) const override; - virtual Resources getResources(const MaterialFeatureData& fd); + Resources getResources(const MaterialFeatureData& fd) override; // Sets textures and texture flags for current pass - virtual void setTexData(Material::StageData& stageDat, + void setTexData(Material::StageData& stageDat, const MaterialFeatureData& fd, RenderPassData& passData, - U32& texIndex); + U32& texIndex) override; }; #endif diff --git a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h index b28a05d79..1c4fd9b4c 100644 --- a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h @@ -63,19 +63,19 @@ public: virtual ~GBufferConditionerHLSL(); - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "GBuffer Conditioner"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "GBuffer Conditioner"; } protected: - virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ); + Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override; virtual GenOp* _posnegEncode( GenOp *val ); virtual GenOp* _posnegDecode( GenOp *val ); - virtual Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ); - virtual Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ); + Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override; + Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ) override; }; #endif // _GBUFFER_CONDITIONER_HLSL_H_ diff --git a/Engine/source/lighting/basic/basicLightManager.h b/Engine/source/lighting/basic/basicLightManager.h index 1141f78f9..addda5556 100644 --- a/Engine/source/lighting/basic/basicLightManager.h +++ b/Engine/source/lighting/basic/basicLightManager.h @@ -56,19 +56,19 @@ class BasicLightManager : public LightManager public: // LightManager - virtual bool isCompatible() const; - virtual void activate( SceneManager *sceneManager ); - virtual void deactivate(); - virtual void setLightInfo(ProcessedMaterial* pmat, const Material* mat, const SceneData& sgData, const SceneRenderState *state, U32 pass, GFXShaderConstBuffer* shaderConsts); - virtual bool setTextureStage(const SceneData& sgData, const U32 currTexFlag, const U32 textureSlot, GFXShaderConstBuffer* shaderConsts, ShaderConstHandles* handles) { return false; } + bool isCompatible() const override; + void activate( SceneManager *sceneManager ) override; + void deactivate() override; + void setLightInfo(ProcessedMaterial* pmat, const Material* mat, const SceneData& sgData, const SceneRenderState *state, U32 pass, GFXShaderConstBuffer* shaderConsts) override; + bool setTextureStage(const SceneData& sgData, const U32 currTexFlag, const U32 textureSlot, GFXShaderConstBuffer* shaderConsts, ShaderConstHandles* handles) override { return false; } static F32 getShadowFilterDistance() { return smProjectedShadowFilterDistance; } protected: // LightManager - virtual void _addLightInfoEx( LightInfo *lightInfo ) { } - virtual void _initLightFields() { } + void _addLightInfoEx( LightInfo *lightInfo ) override { } + void _initLightFields() override { } void _onPreRender( SceneManager *sceneManger, const SceneRenderState *state ); diff --git a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h index ee7cac6fb..e241b16c5 100644 --- a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h +++ b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h @@ -63,10 +63,10 @@ public: virtual void renderShadow( SceneRenderState *state ); // Called by statics - virtual U32 packUpdate(SceneObject* obj, U32 checkMask, NetConnection *conn, U32 mask, BitStream *stream) { return 0; } - virtual void unpackUpdate(SceneObject* obj, NetConnection *conn, BitStream *stream) { } + U32 packUpdate(SceneObject* obj, U32 checkMask, NetConnection *conn, U32 mask, BitStream *stream) override { return 0; } + void unpackUpdate(SceneObject* obj, NetConnection *conn, BitStream *stream) override { } - virtual void reset(); + void reset() override; }; class BasicSceneObjectPluginFactory : public ManagedSingleton< BasicSceneObjectPluginFactory > diff --git a/Engine/source/lighting/basic/blTerrainSystem.cpp b/Engine/source/lighting/basic/blTerrainSystem.cpp index fc3d301b4..c52472091 100644 --- a/Engine/source/lighting/basic/blTerrainSystem.cpp +++ b/Engine/source/lighting/basic/blTerrainSystem.cpp @@ -44,8 +44,8 @@ struct blTerrainChunk : public PersistInfo::PersistChunk GBitmap *mLightmap; - bool read(Stream &); - bool write(Stream &); + bool read(Stream &) override; + bool write(Stream &) override; }; //------------------------------------------------------------------------------ @@ -134,18 +134,18 @@ public: bool getShadowedSquares(const Vector &, Vector &); // lighting - void init(); - bool preLight(LightInfo *); - void light(LightInfo *); + void init() override; + bool preLight(LightInfo *) override; + void light(LightInfo *) override; // persist - U32 getResourceCRC(); - bool setPersistInfo(PersistInfo::PersistChunk *); - bool getPersistInfo(PersistInfo::PersistChunk *); + U32 getResourceCRC() override; + bool setPersistInfo(PersistInfo::PersistChunk *) override; + bool getPersistInfo(PersistInfo::PersistChunk *) override; - virtual bool supportsShadowVolume(); - virtual void getClipPlanes(Vector& planes); - virtual void addToShadowVolume(ShadowVolumeBSP * shadowVolume, LightInfo * light, S32 level); + bool supportsShadowVolume() override; + void getClipPlanes(Vector& planes) override; + void addToShadowVolume(ShadowVolumeBSP * shadowVolume, LightInfo * light, S32 level) override; // events //virtual void processTGELightProcessEvent(U32 curr, U32 max, LightInfo* currlight); diff --git a/Engine/source/lighting/basic/blTerrainSystem.h b/Engine/source/lighting/basic/blTerrainSystem.h index 2098d43e5..6a1b65969 100644 --- a/Engine/source/lighting/basic/blTerrainSystem.h +++ b/Engine/source/lighting/basic/blTerrainSystem.h @@ -36,14 +36,14 @@ class blTerrainSystem : public SceneLightingInterface { public: - virtual void init(); - virtual U32 addObjectType(); - virtual SceneLighting::ObjectProxy* createObjectProxy(SceneObject* obj, SceneLighting::ObjectProxyList* sceneObjects); - virtual PersistInfo::PersistChunk* createPersistChunk(const U32 chunkType); - virtual bool createPersistChunkFromProxy(SceneLighting::ObjectProxy* objproxy, PersistInfo::PersistChunk **ret); + void init() override; + U32 addObjectType() override; + SceneLighting::ObjectProxy* createObjectProxy(SceneObject* obj, SceneLighting::ObjectProxyList* sceneObjects) override; + PersistInfo::PersistChunk* createPersistChunk(const U32 chunkType) override; + bool createPersistChunkFromProxy(SceneLighting::ObjectProxy* objproxy, PersistInfo::PersistChunk **ret) override; // Given a ray, this will return the color from the lightmap of this object, return true if handled - virtual bool getColorFromRayInfo(const RayInfo & collision, LinearColorF& result) const; + bool getColorFromRayInfo(const RayInfo & collision, LinearColorF& result) const override; }; #endif // !_BLTERRAINSYSTEM_H_ diff --git a/Engine/source/lighting/common/blobShadow.h b/Engine/source/lighting/common/blobShadow.h index a56f51dab..800d1ed78 100644 --- a/Engine/source/lighting/common/blobShadow.h +++ b/Engine/source/lighting/common/blobShadow.h @@ -76,9 +76,9 @@ public: bool shouldRender(F32 camDist); - void update( const SceneRenderState *state ) {} - void render( F32 camDist, const TSRenderState &rdata ); - U32 getLastRenderTime() const { return mLastRenderTime; } + void update( const SceneRenderState *state ) override {} + void render( F32 camDist, const TSRenderState &rdata ) override; + U32 getLastRenderTime() const override { return mLastRenderTime; } static void generateGenericShadowBitmap(S32 dim); static void deleteGenericShadowBitmap(); diff --git a/Engine/source/lighting/common/lightMapParams.h b/Engine/source/lighting/common/lightMapParams.h index 4d495537f..cc7ac8eb0 100644 --- a/Engine/source/lighting/common/lightMapParams.h +++ b/Engine/source/lighting/common/lightMapParams.h @@ -37,10 +37,10 @@ public: static LightInfoExType Type; // LightInfoEx - virtual void set( const LightInfoEx *ex ); - virtual const LightInfoExType& getType() const { return Type; } - virtual void packUpdate( BitStream *stream ) const; - virtual void unpackUpdate( BitStream *stream ); + void set( const LightInfoEx *ex ) override; + const LightInfoExType& getType() const override { return Type; } + void packUpdate( BitStream *stream ) const override; + void unpackUpdate( BitStream *stream ) override; public: // We're leaving these public for easy access diff --git a/Engine/source/lighting/common/projectedShadow.h b/Engine/source/lighting/common/projectedShadow.h index e43501a8d..a8195ae7d 100644 --- a/Engine/source/lighting/common/projectedShadow.h +++ b/Engine/source/lighting/common/projectedShadow.h @@ -115,12 +115,12 @@ public: ProjectedShadow( SceneObject *object ); virtual ~ProjectedShadow(); - bool shouldRender( const SceneRenderState *state ); + bool shouldRender( const SceneRenderState *state ) override; - void update( const SceneRenderState *state ); - void render( F32 camDist, const TSRenderState &rdata ); - U32 getLastRenderTime() const { return mLastRenderTime; } - const F32 getScore() const { return mScore; } + void update( const SceneRenderState *state ) override; + void render( F32 camDist, const TSRenderState &rdata ) override; + U32 getLastRenderTime() const override { return mLastRenderTime; } + const F32 getScore() const override { return mScore; } }; diff --git a/Engine/source/lighting/common/sceneLighting.h b/Engine/source/lighting/common/sceneLighting.h index 31bed91b5..475bac5ac 100644 --- a/Engine/source/lighting/common/sceneLighting.h +++ b/Engine/source/lighting/common/sceneLighting.h @@ -201,7 +201,7 @@ public: sgObjectIndex = objectIndex; sgEvent = event; } - void process(SimObject * object) + void process(SimObject * object) override { AssertFatal(object, "SceneLightingProcessEvent:: null event object!"); if(!object) diff --git a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h b/Engine/source/lighting/shadowMap/cubeLightShadowMap.h index 5b30a8d89..083182f33 100644 --- a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/cubeLightShadowMap.h @@ -40,12 +40,12 @@ public: CubeLightShadowMap( LightInfo *light ); // LightShadowMap - virtual bool hasShadowTex() const { return mCubemap.isValid(); } - virtual ShadowType getShadowType() const { return ShadowType_CubeMap; } - virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ); - virtual void setShaderParameters( GFXShaderConstBuffer* params, LightingShaderConstants* lsc ); - virtual void releaseTextures(); - virtual bool setTextureStage( U32 currTexFlag, LightingShaderConstants* lsc ); + bool hasShadowTex() const override { return mCubemap.isValid(); } + ShadowType getShadowType() const override { return ShadowType_CubeMap; } + void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override; + void setShaderParameters( GFXShaderConstBuffer* params, LightingShaderConstants* lsc ) override; + void releaseTextures() override; + bool setTextureStage( U32 currTexFlag, LightingShaderConstants* lsc ) override; protected: diff --git a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h index 0564c6451..343649c14 100644 --- a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h @@ -34,7 +34,7 @@ class DualParaboloidLightShadowMap : public ParaboloidLightShadowMap public: DualParaboloidLightShadowMap( LightInfo *light ); - virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ); + void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override; }; #endif // _DUALPARABOLOIDLIGHTSHADOWMAP_H_ \ No newline at end of file diff --git a/Engine/source/lighting/shadowMap/lightShadowMap.h b/Engine/source/lighting/shadowMap/lightShadowMap.h index a25ff7ec2..c8f566d50 100644 --- a/Engine/source/lighting/shadowMap/lightShadowMap.h +++ b/Engine/source/lighting/shadowMap/lightShadowMap.h @@ -280,10 +280,10 @@ public: static LightInfoExType Type; // LightInfoEx - virtual void set( const LightInfoEx *ex ); - virtual const LightInfoExType& getType() const { return Type; } - virtual void packUpdate( BitStream *stream ) const; - virtual void unpackUpdate( BitStream *stream ); + void set( const LightInfoEx *ex ) override; + const LightInfoExType& getType() const override { return Type; } + void packUpdate( BitStream *stream ) const override; + void unpackUpdate( BitStream *stream ) override; LightShadowMap* getShadowMap() const { return mShadowMap; } diff --git a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h index 917ab99bc..8b65b9f6d 100644 --- a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h @@ -36,9 +36,9 @@ public: ~ParaboloidLightShadowMap(); // LightShadowMap - virtual ShadowType getShadowType() const; - virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ); - virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc); + ShadowType getShadowType() const override; + void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override; + void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override; protected: Point2F mShadowMapScale; diff --git a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h index 8ee883018..986e25370 100644 --- a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h @@ -37,9 +37,9 @@ public: PSSMLightShadowMap( LightInfo *light ); // LightShadowMap - virtual ShadowType getShadowType() const { return ShadowType_PSSM; } - virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ); - virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc); + ShadowType getShadowType() const override { return ShadowType_PSSM; } + void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override; + void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override; /// Used to scale TSShapeInstance::smDetailAdjust to have /// objects lod quicker when in the PSSM shadow. diff --git a/Engine/source/lighting/shadowMap/shadowMapManager.h b/Engine/source/lighting/shadowMap/shadowMapManager.h index df9eb9024..7e3167aeb 100644 --- a/Engine/source/lighting/shadowMap/shadowMapManager.h +++ b/Engine/source/lighting/shadowMap/shadowMapManager.h @@ -70,8 +70,8 @@ public: ShadowMapPass* getShadowMapPass() const { return mShadowMapPass; } // Shadow manager - virtual void activate(); - virtual void deactivate(); + void activate() override; + void deactivate() override; GFXTextureObject* getTapRotationTex(); diff --git a/Engine/source/lighting/shadowMap/shadowMapPass.h b/Engine/source/lighting/shadowMap/shadowMapPass.h index 8e1fa0ef5..d16ec622f 100644 --- a/Engine/source/lighting/shadowMap/shadowMapPass.h +++ b/Engine/source/lighting/shadowMap/shadowMapPass.h @@ -122,7 +122,7 @@ public: ShadowRenderPassManager() : Parent() {} /// Add a RenderInstance to the list - virtual void addInst( RenderInst *inst ); + void addInst( RenderInst *inst ) override; }; #endif // _SHADOWMAPPASS_H_ diff --git a/Engine/source/lighting/shadowMap/shadowMatHook.h b/Engine/source/lighting/shadowMap/shadowMatHook.h index 4763d2f71..e62789eaf 100644 --- a/Engine/source/lighting/shadowMap/shadowMatHook.h +++ b/Engine/source/lighting/shadowMap/shadowMatHook.h @@ -45,7 +45,7 @@ public: ShadowMatInstance( Material *mat ); virtual ~ShadowMatInstance() {} - virtual bool setupPass( SceneRenderState *state, const SceneData &sgData ); + bool setupPass( SceneRenderState *state, const SceneData &sgData ) override; }; class ShadowMaterialHook : public MatInstanceHook @@ -56,7 +56,7 @@ public: // MatInstanceHook virtual ~ShadowMaterialHook(); - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// The material hook type. static const MatInstanceHookType Type; diff --git a/Engine/source/lighting/shadowMap/singleLightShadowMap.h b/Engine/source/lighting/shadowMap/singleLightShadowMap.h index bfe5ad627..2f26457c8 100644 --- a/Engine/source/lighting/shadowMap/singleLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/singleLightShadowMap.h @@ -37,9 +37,9 @@ public: ~SingleLightShadowMap(); // LightShadowMap - virtual ShadowType getShadowType() const { return ShadowType_Spot; } - virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ); - virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc); + ShadowType getShadowType() const override { return ShadowType_Spot; } + void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override; + void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override; }; diff --git a/Engine/source/materials/customMaterialDefinition.h b/Engine/source/materials/customMaterialDefinition.h index 879ffd6b8..640c376e8 100644 --- a/Engine/source/materials/customMaterialDefinition.h +++ b/Engine/source/materials/customMaterialDefinition.h @@ -58,8 +58,8 @@ public: // // SimObject interface // - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // // ConsoleObject interface @@ -72,7 +72,7 @@ protected: U32 mFlags[MAX_TEX_PER_PASS]; GFXStateBlockData* mStateBlockData; - virtual void _mapMaterial(); + void _mapMaterial() override; }; #endif diff --git a/Engine/source/materials/matInstance.cpp b/Engine/source/materials/matInstance.cpp index ab41a3892..f7c6918fd 100644 --- a/Engine/source/materials/matInstance.cpp +++ b/Engine/source/materials/matInstance.cpp @@ -49,9 +49,9 @@ public: void loadHandle(ProcessedMaterial* pmat); // MaterialParameterHandle interface - const String& getName() const { return mName; } - virtual bool isValid() const; - virtual S32 getSamplerRegister( U32 pass ) const; + const String& getName() const override { return mName; } + bool isValid() const override; + S32 getSamplerRegister( U32 pass ) const override; private: friend class MatInstParameters; String mName; diff --git a/Engine/source/materials/matInstance.h b/Engine/source/materials/matInstance.h index d16ca748d..1bdabf1c5 100644 --- a/Engine/source/materials/matInstance.h +++ b/Engine/source/materials/matInstance.h @@ -53,48 +53,48 @@ public: virtual ~MatInstance(); // BaseMatInstance - virtual bool init( const FeatureSet &features, - const GFXVertexFormat *vertexFormat ); - virtual bool reInit(); - virtual void addStateBlockDesc(const GFXStateBlockDesc& desc); - virtual void updateStateBlocks(); - virtual void addShaderMacro( const String &name, const String &value ); - virtual MaterialParameters* allocMaterialParameters(); - virtual void setMaterialParameters(MaterialParameters* param); - virtual MaterialParameters* getMaterialParameters(); - virtual MaterialParameterHandle* getMaterialParameterHandle(const String& name); - virtual bool setupPass(SceneRenderState *, const SceneData &sgData ); - virtual void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state); - virtual void setNodeTransforms(const MatrixF *address, const U32 numTransforms); - virtual void setCustomShaderData(Vector &shaderData); - virtual void setSceneInfo(SceneRenderState *, const SceneData& sgData); - virtual void setTextureStages(SceneRenderState * state, const SceneData &sgData ); - virtual void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer); - virtual bool isInstanced() const; - virtual bool stepInstance(); - virtual bool isForwardLit() const { return mIsForwardLit; } + bool init( const FeatureSet &features, + const GFXVertexFormat *vertexFormat ) override; + bool reInit() override; + void addStateBlockDesc(const GFXStateBlockDesc& desc) override; + void updateStateBlocks() override; + void addShaderMacro( const String &name, const String &value ) override; + MaterialParameters* allocMaterialParameters() override; + void setMaterialParameters(MaterialParameters* param) override; + MaterialParameters* getMaterialParameters() override; + MaterialParameterHandle* getMaterialParameterHandle(const String& name) override; + bool setupPass(SceneRenderState *, const SceneData &sgData ) override; + void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state) override; + void setNodeTransforms(const MatrixF *address, const U32 numTransforms) override; + void setCustomShaderData(Vector &shaderData) override; + void setSceneInfo(SceneRenderState *, const SceneData& sgData) override; + void setTextureStages(SceneRenderState * state, const SceneData &sgData ) override; + void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer) override; + bool isInstanced() const override; + bool stepInstance() override; + bool isForwardLit() const override { return mIsForwardLit; } virtual bool isHardwareSkinned() const { return mIsHardwareSkinned; } - virtual void setUserObject( SimObject *userObject ) { mUserObject = userObject; } - virtual SimObject* getUserObject() const { return mUserObject; } - virtual Material *getMaterial() { return mMaterial; } - virtual bool hasGlow(); - virtual bool hasAccumulation(); - virtual U32 getCurPass() { return getMax( mCurPass, 0 ); } - virtual U32 getCurStageNum(); - virtual RenderPassData *getPass(U32 pass); - virtual const MatStateHint& getStateHint() const; - virtual const GFXVertexFormat* getVertexFormat() const { return mVertexFormat; } - virtual const FeatureSet& getFeatures() const; - virtual const FeatureSet& getRequestedFeatures() const { return mFeatureList; } - virtual void dumpShaderInfo() const; - virtual void getShaderInfo(GuiTreeViewCtrl* tree, U32 item) const; + void setUserObject( SimObject *userObject ) override { mUserObject = userObject; } + SimObject* getUserObject() const override { return mUserObject; } + Material *getMaterial() override { return mMaterial; } + bool hasGlow() override; + bool hasAccumulation() override; + U32 getCurPass() override { return getMax( mCurPass, 0 ); } + U32 getCurStageNum() override; + RenderPassData *getPass(U32 pass) override; + const MatStateHint& getStateHint() const override; + const GFXVertexFormat* getVertexFormat() const override { return mVertexFormat; } + const FeatureSet& getFeatures() const override; + const FeatureSet& getRequestedFeatures() const override { return mFeatureList; } + void dumpShaderInfo() const override; + void getShaderInfo(GuiTreeViewCtrl* tree, U32 item) const override; ProcessedMaterial *getProcessedMaterial() const { return mProcessedMaterial; } - virtual const GFXStateBlockDesc &getUserStateBlock() const { return mUserDefinedState; } + const GFXStateBlockDesc &getUserStateBlock() const override { return mUserDefinedState; } - virtual bool isCustomMaterial() const { return mCreatedFromCustomMaterial; } + bool isCustomMaterial() const override { return mCreatedFromCustomMaterial; } protected: friend class Material; @@ -152,33 +152,33 @@ public: void loadParameters(ProcessedMaterial* pmat); /// Returns our list of shader constants, the material can get this and just set the constants it knows about - virtual const Vector& getShaderConstDesc() const; + const Vector& getShaderConstDesc() const override; /// @name Set shader constant values /// @{ /// Actually set shader constant values /// @param name Name of the constant, this should be a name contained in the array returned in getShaderConstDesc, /// if an invalid name is used, it is ignored. - virtual void set(MaterialParameterHandle* handle, const F32 f); - virtual void set(MaterialParameterHandle* handle, const Point2F& fv); - virtual void set(MaterialParameterHandle* handle, const Point3F& fv); - virtual void set(MaterialParameterHandle* handle, const Point4F& fv); - virtual void set(MaterialParameterHandle* handle, const LinearColorF& fv); - virtual void set(MaterialParameterHandle* handle, const S32 f); - virtual void set(MaterialParameterHandle* handle, const Point2I& fv); - virtual void set(MaterialParameterHandle* handle, const Point3I& fv); - virtual void set(MaterialParameterHandle* handle, const Point4I& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4); - virtual void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4); - virtual U32 getAlignmentValue(const GFXShaderConstType constType); + void set(MaterialParameterHandle* handle, const F32 f) override; + void set(MaterialParameterHandle* handle, const Point2F& fv) override; + void set(MaterialParameterHandle* handle, const Point3F& fv) override; + void set(MaterialParameterHandle* handle, const Point4F& fv) override; + void set(MaterialParameterHandle* handle, const LinearColorF& fv) override; + void set(MaterialParameterHandle* handle, const S32 f) override; + void set(MaterialParameterHandle* handle, const Point2I& fv) override; + void set(MaterialParameterHandle* handle, const Point3I& fv) override; + void set(MaterialParameterHandle* handle, const Point4I& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; + void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; + U32 getAlignmentValue(const GFXShaderConstType constType) override; private: MaterialParameters* mParameters; bool mOwnParameters; diff --git a/Engine/source/materials/materialDefinition.h b/Engine/source/materials/materialDefinition.h index 29996cf66..f3ef304e8 100644 --- a/Engine/source/materials/materialDefinition.h +++ b/Engine/source/materials/materialDefinition.h @@ -393,14 +393,14 @@ public: /// Allocates and returns a BaseMatInstance for this material. Caller is responsible /// for freeing the instance - virtual BaseMatInstance* createMatInstance(); - virtual bool isTranslucent() const { return mTranslucent && mTranslucentBlendOp != Material::None; } - virtual bool isAlphatest() const { return mAlphaTest; } - virtual bool isDoubleSided() const { return mDoubleSided; } + BaseMatInstance* createMatInstance() override; + bool isTranslucent() const override { return mTranslucent && mTranslucentBlendOp != Material::None; } + bool isAlphatest() const override { return mAlphaTest; } + bool isDoubleSided() const override { return mDoubleSided; } virtual bool isAutoGenerated() const { return mAutoGenerated; } virtual void setAutoGenerated(bool isAutoGenerated) { mAutoGenerated = isAutoGenerated; } - virtual bool isLightmapped() const; - virtual bool castsShadows() const { return mCastShadows; } + bool isLightmapped() const override; + bool castsShadows() const override { return mCastShadows; } const String& getPath() const { return mPath; } void flush(); @@ -414,10 +414,10 @@ public: void updateTimeBasedParams(); // SimObject - virtual bool onAdd(); - virtual void onRemove(); - virtual void inspectPostApply(); - virtual bool writeField(StringTableEntry fieldname, const char* value); + bool onAdd() override; + void onRemove() override; + void inspectPostApply() override; + bool writeField(StringTableEntry fieldname, const char* value) override; // // ConsoleObject interface diff --git a/Engine/source/materials/processedCustomMaterial.h b/Engine/source/materials/processedCustomMaterial.h index bcdbf239b..2294553bd 100644 --- a/Engine/source/materials/processedCustomMaterial.h +++ b/Engine/source/materials/processedCustomMaterial.h @@ -39,16 +39,16 @@ public: ProcessedCustomMaterial(Material &mat); ~ProcessedCustomMaterial(); - virtual bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass); - virtual bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat, const MatFeaturesDelegate &featuresDelegate ); - virtual void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ); - virtual MaterialParameters* allocMaterialParameters(); + bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass) override; + bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat, const MatFeaturesDelegate &featuresDelegate ) override; + void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ) override; + MaterialParameters* allocMaterialParameters() override; protected: - virtual void _setStageData(); - virtual bool _hasCubemap(U32 pass); - void _initPassStateBlock( RenderPassData *rpd, GFXStateBlockDesc &result ); + void _setStageData() override; + bool _hasCubemap(U32 pass) override; + void _initPassStateBlock( RenderPassData *rpd, GFXStateBlockDesc &result ) override; virtual void _initPassStateBlocks(); private: diff --git a/Engine/source/materials/processedShaderMaterial.h b/Engine/source/materials/processedShaderMaterial.h index e5edc7a7d..a1bde06f1 100644 --- a/Engine/source/materials/processedShaderMaterial.h +++ b/Engine/source/materials/processedShaderMaterial.h @@ -127,8 +127,8 @@ public: ShaderConstHandles shaderHandles; Vector featureShaderHandles; - virtual void reset(); - virtual String describeSelf() const; + void reset() override; + String describeSelf() const override; }; class ProcessedShaderMaterial : public ProcessedMaterial @@ -141,23 +141,23 @@ public: ~ProcessedShaderMaterial(); // ProcessedMaterial - virtual bool init( const FeatureSet &features, + bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat, - const MatFeaturesDelegate &featuresDelegate ); - virtual bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass); - virtual void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ); - virtual void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state, const U32 pass); - virtual void setNodeTransforms(const MatrixF *address, const U32 numTransforms, const U32 pass); - virtual void setCustomShaderData(Vector &shaderData, const U32 pass); - virtual void setSceneInfo(SceneRenderState *, const SceneData& sgData, U32 pass); - virtual void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer); - virtual bool stepInstance(); - virtual void dumpMaterialInfo(); - virtual void getMaterialInfo(GuiTreeViewCtrl* tree, U32 item); - virtual MaterialParameters* allocMaterialParameters(); - virtual MaterialParameters* getDefaultMaterialParameters() { return mDefaultParameters; } - virtual MaterialParameterHandle* getMaterialParameterHandle(const String& name); - virtual U32 getNumStages(); + const MatFeaturesDelegate &featuresDelegate ) override; + bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass) override; + void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ) override; + void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state, const U32 pass) override; + void setNodeTransforms(const MatrixF *address, const U32 numTransforms, const U32 pass) override; + void setCustomShaderData(Vector &shaderData, const U32 pass) override; + void setSceneInfo(SceneRenderState *, const SceneData& sgData, U32 pass) override; + void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer) override; + bool stepInstance() override; + void dumpMaterialInfo() override; + void getMaterialInfo(GuiTreeViewCtrl* tree, U32 item) override; + MaterialParameters* allocMaterialParameters() override; + MaterialParameters* getDefaultMaterialParameters() override { return mDefaultParameters; } + MaterialParameterHandle* getMaterialParameterHandle(const String& name) override; + U32 getNumStages() override; protected: diff --git a/Engine/source/materials/sceneData.h b/Engine/source/materials/sceneData.h index f27a49cea..67a521923 100644 --- a/Engine/source/materials/sceneData.h +++ b/Engine/source/materials/sceneData.h @@ -34,7 +34,7 @@ class GFXTexHandle; class GFXCubemap; -class CustomShaderBindingData; +struct CustomShaderBindingData; struct SceneData { diff --git a/Engine/source/materials/shaderData.h b/Engine/source/materials/shaderData.h index e07f513cf..2fa63271f 100644 --- a/Engine/source/materials/shaderData.h +++ b/Engine/source/materials/shaderData.h @@ -126,8 +126,8 @@ public: F32 getPixVersion() const { return mPixVersion; } // SimObject - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // ConsoleObject static void initPersistFields(); diff --git a/Engine/source/materials/shaderMaterialParameters.h b/Engine/source/materials/shaderMaterialParameters.h index 4a26251db..83f068c0d 100644 --- a/Engine/source/materials/shaderMaterialParameters.h +++ b/Engine/source/materials/shaderMaterialParameters.h @@ -40,13 +40,13 @@ public: ShaderMaterialParameterHandle(const String& name); ShaderMaterialParameterHandle(const String& name, Vector& shaders); - virtual const String& getName() const { return mName; } - virtual S32 getSamplerRegister( U32 pass ) const; + const String& getName() const override { return mName; } + S32 getSamplerRegister( U32 pass ) const override; // NOTE: We always return true here instead of querying the // children... often there is only one element, so lets just // hit the loop once on the set. - virtual bool isValid() const { return true; }; + bool isValid() const override { return true; }; protected: Vector< GFXShaderConstHandle* > mHandles; @@ -68,28 +68,28 @@ public: /// /// Returns the material parameter handle for name. - virtual void set(MaterialParameterHandle* handle, const F32 f); - virtual void set(MaterialParameterHandle* handle, const Point2F& fv); - virtual void set(MaterialParameterHandle* handle, const Point3F& fv); - virtual void set(MaterialParameterHandle* handle, const Point4F& fv); + void set(MaterialParameterHandle* handle, const F32 f) override; + void set(MaterialParameterHandle* handle, const Point2F& fv) override; + void set(MaterialParameterHandle* handle, const Point3F& fv) override; + void set(MaterialParameterHandle* handle, const Point4F& fv) override; virtual void set(MaterialParameterHandle* handle, const PlaneF& fv); - virtual void set(MaterialParameterHandle* handle, const LinearColorF& fv); - virtual void set(MaterialParameterHandle* handle, const S32 f); - virtual void set(MaterialParameterHandle* handle, const Point2I& fv); - virtual void set(MaterialParameterHandle* handle, const Point3I& fv); - virtual void set(MaterialParameterHandle* handle, const Point4I& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const AlignedArray& fv); - virtual void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4); - virtual void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4); + void set(MaterialParameterHandle* handle, const LinearColorF& fv) override; + void set(MaterialParameterHandle* handle, const S32 f) override; + void set(MaterialParameterHandle* handle, const Point2I& fv) override; + void set(MaterialParameterHandle* handle, const Point3I& fv) override; + void set(MaterialParameterHandle* handle, const Point4I& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const AlignedArray& fv) override; + void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; + void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override; - virtual U32 getAlignmentValue(const GFXShaderConstType constType); + U32 getAlignmentValue(const GFXShaderConstType constType) override; private: Vector mBuffers; diff --git a/Engine/source/math/mQuadPatch.h b/Engine/source/math/mQuadPatch.h index d579ca367..4aa648fb3 100644 --- a/Engine/source/math/mQuadPatch.h +++ b/Engine/source/math/mQuadPatch.h @@ -49,10 +49,10 @@ public: QuadPatch(); - virtual void calc( F32 t, Point3F &result ); - virtual void calc( Point3F *points, F32 t, Point3F &result ); - virtual void setControlPoint( Point3F &point, S32 index ); - virtual void submitControlPoints( SplCtrlPts &points ); + void calc( F32 t, Point3F &result ) override; + void calc( Point3F *points, F32 t, Point3F &result ) override; + void setControlPoint( Point3F &point, S32 index ) override; + void submitControlPoints( SplCtrlPts &points ) override; }; diff --git a/Engine/source/math/mRandom.h b/Engine/source/math/mRandom.h index dbd4a2328..a5c52eee1 100644 --- a/Engine/source/math/mRandom.h +++ b/Engine/source/math/mRandom.h @@ -89,11 +89,11 @@ public: static void setGlobalRandSeed(U32 seed); - void setSeed(S32 s); + void setSeed(S32 s) override; // using MRandomGenerator::randI; S32 randI(S32 i, S32 n); ///< i..n integer generator - U32 randI( void ); + U32 randI( void ) override; }; @@ -126,9 +126,9 @@ public: MRandomR250(S32 s); virtual ~MRandomR250() {} - void setSeed(S32 s); + void setSeed(S32 s) override; // using MRandomGenerator::randI; - U32 randI(); + U32 randI() override; }; diff --git a/Engine/source/math/util/decomposePoly.h b/Engine/source/math/util/decomposePoly.h index 884ac6123..8722bd3b8 100644 --- a/Engine/source/math/util/decomposePoly.h +++ b/Engine/source/math/util/decomposePoly.h @@ -16,7 +16,7 @@ public: inline bool twoIndices::operator==(const twoIndices& _test) const { - return ((i1 == _test.i1) && (i2 == _test.i2) || (i1 == _test.i2) && (i2 == _test.i1)); + return (((i1 == _test.i1) && (i2 == _test.i2)) || ((i1 == _test.i2) && (i2 == _test.i1))); } diff --git a/Engine/source/math/util/frustum.h b/Engine/source/math/util/frustum.h index 2129abd7d..b66939270 100644 --- a/Engine/source/math/util/frustum.h +++ b/Engine/source/math/util/frustum.h @@ -186,16 +186,16 @@ struct FrustumData : public PolyhedronData void _update() const; FrustumData() - : mIsOrtho(false), + : mDirty( false ), + mIsOrtho(false), + mIsInverted( false ), + mTransform(MatrixF(true)), mNearLeft(-1.0f), mNearRight(1.0f), mNearTop(1.0f), mNearBottom(-1.0f), mNearDist(0.1f), - mFarDist(1.0f), - mTransform(MatrixF(true)), - mDirty( false ), - mIsInverted( false ) {} + mFarDist(1.0f) {} public: diff --git a/Engine/source/math/util/tResponseCurve.h b/Engine/source/math/util/tResponseCurve.h index cf282acc5..896bc8632 100644 --- a/Engine/source/math/util/tResponseCurve.h +++ b/Engine/source/math/util/tResponseCurve.h @@ -208,8 +208,8 @@ public: DECLARE_CONOBJECT( SimResponseCurve ); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; void addPoint( F32 value, F32 time ); F32 getValue( F32 time ); diff --git a/Engine/source/module/moduleManager.h b/Engine/source/module/moduleManager.h index dad530057..a5c351401 100644 --- a/Engine/source/module/moduleManager.h +++ b/Engine/source/module/moduleManager.h @@ -149,9 +149,9 @@ public: virtual ~ModuleManager() {} /// SimObject overrides - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify( SimObject *object ); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify( SimObject *object ) override; static void initPersistFields(); /// Declare Console Object. diff --git a/Engine/source/module/tamlModuleIdUpdateVisitor.h b/Engine/source/module/tamlModuleIdUpdateVisitor.h index 36c4c2d04..276b4548d 100644 --- a/Engine/source/module/tamlModuleIdUpdateVisitor.h +++ b/Engine/source/module/tamlModuleIdUpdateVisitor.h @@ -56,10 +56,10 @@ public: {} virtual ~TamlModuleIdUpdateVisitor() {} - virtual bool wantsPropertyChanges( void ) { return true; } - virtual bool wantsRootOnly( void ) { return true; } + bool wantsPropertyChanges( void ) override { return true; } + bool wantsRootOnly( void ) override { return true; } - virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) + bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override { // Debug Profiling. PROFILE_SCOPE(TamlModuleIdUpdateVisitor_Visit); diff --git a/Engine/source/navigation/coverPoint.h b/Engine/source/navigation/coverPoint.h index 6f2e317c9..1af45aba9 100644 --- a/Engine/source/navigation/coverPoint.h +++ b/Engine/source/navigation/coverPoint.h @@ -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: diff --git a/Engine/source/navigation/duDebugDrawTorque.h b/Engine/source/navigation/duDebugDrawTorque.h index f6a1a1e3e..782f51d13 100644 --- a/Engine/source/navigation/duDebugDrawTorque.h +++ b/Engine/source/navigation/duDebugDrawTorque.h @@ -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(); diff --git a/Engine/source/navigation/guiNavEditorCtrl.h b/Engine/source/navigation/guiNavEditorCtrl.h index 4d795f459..6e0b34f5e 100644 --- a/Engine/source/navigation/guiNavEditorCtrl.h +++ b/Engine/source/navigation/guiNavEditorCtrl.h @@ -62,7 +62,7 @@ public: /// @name SimObject /// @{ - bool onAdd(); + bool onAdd() override; static void initPersistFields(); /// @} @@ -70,24 +70,24 @@ public: /// @name GuiControl /// @{ - virtual void onSleep(); - virtual void onRender(Point2I offset, const RectI &updateRect); + void onSleep() override; + void onRender(Point2I offset, const RectI &updateRect) override; /// @} /// @name EditTSCtrl /// @{ - void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_); + void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_) override; bool get3DCentre(Point3F &pos); - 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 updateGuiInfo(); - void renderScene(const RectI & updateRect); + 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 updateGuiInfo() override; + void renderScene(const RectI & updateRect) override; /// @} @@ -177,8 +177,8 @@ public: SimObjectId mObjId; - virtual void undo(); - virtual void redo() { undo(); } + void undo() override; + void redo() override { undo(); } }; #endif #endif diff --git a/Engine/source/navigation/navContext.h b/Engine/source/navigation/navContext.h index 1033465c6..6a507a8e7 100644 --- a/Engine/source/navigation/navContext.h +++ b/Engine/source/navigation/navContext.h @@ -36,29 +36,29 @@ public: protected: /// Clears all log entries. - virtual void doResetLog(); + void doResetLog() override; /// Logs a message. /// @param[in] category The category of the message. /// @param[in] msg The formatted message. /// @param[in] len The length of the formatted message. - virtual void doLog(const rcLogCategory category, const char* msg, const int len); + void doLog(const rcLogCategory category, const char* msg, const int len) override; /// Clears all timers. (Resets all to unused.) - virtual void doResetTimers(); + void doResetTimers() override; /// Starts the specified performance timer. /// @param[in] label The category of timer. - virtual void doStartTimer(const rcTimerLabel label); + void doStartTimer(const rcTimerLabel label) override; /// Stops the specified performance timer. /// @param[in] label The category of the timer. - virtual void doStopTimer(const rcTimerLabel label); + void doStopTimer(const rcTimerLabel label) override; /// Returns the total accumulated time of the specified performance timer. /// @param[in] label The category of the timer. /// @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started. - virtual int doGetAccumulatedTime(const rcTimerLabel label) const; + int doGetAccumulatedTime(const rcTimerLabel label) const override; private: /// Store start time and final time for each timer. diff --git a/Engine/source/navigation/navMesh.h b/Engine/source/navigation/navMesh.h index 5ae227f83..5c78f81f9 100644 --- a/Engine/source/navigation/navMesh.h +++ b/Engine/source/navigation/navMesh.h @@ -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: diff --git a/Engine/source/navigation/navPath.h b/Engine/source/navigation/navPath.h index 93ac0c4e7..fe6246c40 100644 --- a/Engine/source/navigation/navPath.h +++ b/Engine/source/navigation/navPath.h @@ -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(); diff --git a/Engine/source/navigation/recastPolyList.h b/Engine/source/navigation/recastPolyList.h index 2a3de4512..4425c2317 100644 --- a/Engine/source/navigation/recastPolyList.h +++ b/Engine/source/navigation/recastPolyList.h @@ -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 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: }; diff --git a/Engine/source/persistence/taml/fsTinyXml.h b/Engine/source/persistence/taml/fsTinyXml.h index c4a0d55c2..f8b6936c2 100644 --- a/Engine/source/persistence/taml/fsTinyXml.h +++ b/Engine/source/persistence/taml/fsTinyXml.h @@ -165,47 +165,47 @@ public: PrettyXMLPrinter(VfsXMLPrinter& innerPrinter, int depth = 0); /// Visit a document. - virtual bool VisitEnter(const tinyxml2::XMLDocument& doc) + bool VisitEnter(const tinyxml2::XMLDocument& doc) override { mProcessEntities = doc.ProcessEntities(); return mInnerPrinter.VisitEnter(doc); } /// Visit a document. - virtual bool VisitExit(const tinyxml2::XMLDocument& doc) + bool VisitExit(const tinyxml2::XMLDocument& doc) override { return mInnerPrinter.VisitExit(doc); } /// Visit an element. - virtual bool VisitEnter(const tinyxml2::XMLElement& element, const tinyxml2::XMLAttribute* firstAttribute); + bool VisitEnter(const tinyxml2::XMLElement& element, const tinyxml2::XMLAttribute* firstAttribute) override; /// Visit an element. - virtual bool VisitExit(const tinyxml2::XMLElement& element) + bool VisitExit(const tinyxml2::XMLElement& element) override { mDepth--; return mInnerPrinter.VisitExit(element); } /// Visit a declaration. - virtual bool Visit(const tinyxml2::XMLDeclaration& declaration) + bool Visit(const tinyxml2::XMLDeclaration& declaration) override { return mInnerPrinter.Visit(declaration); } /// Visit a text node. - virtual bool Visit(const tinyxml2::XMLText& text) + bool Visit(const tinyxml2::XMLText& text) override { return mInnerPrinter.Visit(text); } /// Visit a comment node. - virtual bool Visit(const tinyxml2::XMLComment& comment) + bool Visit(const tinyxml2::XMLComment& comment) override { return mInnerPrinter.Visit(comment); } /// Visit an unknown node. - virtual bool Visit(const tinyxml2::XMLUnknown& unknown) + bool Visit(const tinyxml2::XMLUnknown& unknown) override { return mInnerPrinter.Visit(unknown); } diff --git a/Engine/source/persistence/taml/taml.h b/Engine/source/persistence/taml/taml.h index 09dbb4623..70290684f 100644 --- a/Engine/source/persistence/taml/taml.h +++ b/Engine/source/persistence/taml/taml.h @@ -129,8 +129,8 @@ public: Taml(); virtual ~Taml() {} - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); /// Format mode. diff --git a/Engine/source/persistence/taml/tamlCustom.h b/Engine/source/persistence/taml/tamlCustom.h index 6dacc099d..fc83ad46d 100644 --- a/Engine/source/persistence/taml/tamlCustom.h +++ b/Engine/source/persistence/taml/tamlCustom.h @@ -88,7 +88,7 @@ public: // pretty much anything or everything could be invalid! } - virtual void resetState( void ) + void resetState( void ) override { mFieldName = StringTable->EmptyString(); *mFieldValue = 0; @@ -371,7 +371,7 @@ public: // pretty much anything or everything could be invalid! } - virtual void resetState( void ) + void resetState( void ) override { // We don't need to delete the write node as it'll get destroyed when the compilation is reset! mpProxyWriteNode = NULL; @@ -703,7 +703,7 @@ public: resetState(); } - virtual void resetState( void ) + void resetState( void ) override { // Cache the nodes. while ( mNodes.size() > 0 ) diff --git a/Engine/source/persistence/taml/xml/tamlXmlParser.h b/Engine/source/persistence/taml/xml/tamlXmlParser.h index 41c97dae4..62e637276 100644 --- a/Engine/source/persistence/taml/xml/tamlXmlParser.h +++ b/Engine/source/persistence/taml/xml/tamlXmlParser.h @@ -43,10 +43,10 @@ public: virtual ~TamlXmlParser() {} /// Whether the parser can change a property or not. - virtual bool canChangeProperty( void ) { return true; } + bool canChangeProperty( void ) override { return true; } /// Accept visitor. - virtual bool accept( const char* pFilename, TamlVisitor& visitor ); + bool accept( const char* pFilename, TamlVisitor& visitor ) override; private: inline bool parseElement( tinyxml2::XMLElement* pXmlElement, TamlVisitor& visitor ); diff --git a/Engine/source/platform/async/asyncBufferedStream.h b/Engine/source/platform/async/asyncBufferedStream.h index 206de59c6..8c421c5c9 100644 --- a/Engine/source/platform/async/asyncBufferedStream.h +++ b/Engine/source/platform/async/asyncBufferedStream.h @@ -151,7 +151,7 @@ class AsyncBufferedInputStream : public IInputStreamFilter< T, Stream >, void stop() { mIsStopped = true; } // IInputStream. - virtual U32 read( ElementType* buffer, U32 num ); + U32 read( ElementType* buffer, U32 num ) override; }; //----------------------------------------------------------------------------- @@ -299,7 +299,7 @@ class AsyncBufferedReadItem : public ThreadWorkItem T mElement; // WorkItem - virtual void execute() + void execute() override { if( Deref( mSourceStream ).read( &mElement, 1 ) ) { @@ -309,7 +309,7 @@ class AsyncBufferedReadItem : public ThreadWorkItem mAsyncStream->_onArrival( mElement ); } } - virtual void onCancelled() + void onCancelled() override { Parent::onCancelled(); destructSingle( mElement ); @@ -354,7 +354,7 @@ class AsyncSingleBufferedInputStream : public AsyncBufferedInputStream< T, Strea protected: // AsyncBufferedInputStream. - virtual void _requestNext(); + void _requestNext() override; /// Create a new work item that reads the next element. virtual void _newReadItem( ThreadSafeRef< ThreadWorkItem >& outRef ) diff --git a/Engine/source/platform/async/asyncPacketStream.h b/Engine/source/platform/async/asyncPacketStream.h index 00f798946..374118784 100644 --- a/Engine/source/platform/async/asyncPacketStream.h +++ b/Engine/source/platform/async/asyncPacketStream.h @@ -129,7 +129,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*, PacketType* mPacket; // WorkItem - virtual void execute() + void execute() override { Parent::execute(); mPacket->mSizeActual += this->mNumElementsRead; @@ -174,7 +174,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*, if( this->cancellationPoint() ) return; mAsyncStream->_onArrival( mPacket ); } - virtual void onCancelled() + void onCancelled() override { Parent::onCancelled(); destructSingle< PacketType* >( mPacket ); @@ -197,7 +197,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*, virtual PacketType* _newPacket( U32 packetSize ) { return constructSingle< PacketType* >( packetSize ); } /// Request the next packet from the underlying stream. - virtual void _requestNext(); + void _requestNext() override; /// Create a new work item that reads "numElements" into "packet". virtual void _newReadItem( PacketReadItemRef& outRef, diff --git a/Engine/source/platform/async/asyncUpdate.h b/Engine/source/platform/async/asyncUpdate.h index 1bb416774..e158ddaed 100644 --- a/Engine/source/platform/async/asyncUpdate.h +++ b/Engine/source/platform/async/asyncUpdate.h @@ -114,7 +114,7 @@ class AsyncUpdateThread : public Thread, public ThreadSafeRefCount< AsyncUpdateT virtual ~AsyncUpdateThread(); - virtual void run( void* ); + void run( void* ) override; /// Trigger the update event to notify the thread about /// pending updates. @@ -141,7 +141,7 @@ class AsyncPeriodicUpdateThread : public AsyncUpdateThread /// Time between periodic updates in milliseconds. U32 mIntervalMS; - virtual void _waitForEventAndReset(); + void _waitForEventAndReset() override; public: diff --git a/Engine/source/platform/platformNetAsync.cpp b/Engine/source/platform/platformNetAsync.cpp index 5b91df2b1..1a2a33df2 100644 --- a/Engine/source/platform/platformNetAsync.cpp +++ b/Engine/source/platform/platformNetAsync.cpp @@ -76,7 +76,7 @@ struct NetAsync::NameLookupWorkItem : public ThreadPool::WorkItem } protected: - virtual void execute() + void execute() override { NetAddress address; Net::Error error = Net::stringToAddress(mRequest.remoteAddr, &address, true); diff --git a/Engine/source/platform/platformTimer.h b/Engine/source/platform/platformTimer.h index 5a896e51c..84807f1d7 100644 --- a/Engine/source/platform/platformTimer.h +++ b/Engine/source/platform/platformTimer.h @@ -96,13 +96,13 @@ public: mLastTime = mNextTime = Platform::getRealMilliseconds(); } - const S32 getElapsedMs() + const S32 getElapsedMs() override { mNextTime = Platform::getRealMilliseconds(); return (mNextTime - mLastTime); } - void reset() + void reset() override { mLastTime = mNextTime; } diff --git a/Engine/source/platform/threads/threadPool.cpp b/Engine/source/platform/threads/threadPool.cpp index 1cad50dda..42f262726 100644 --- a/Engine/source/platform/threads/threadPool.cpp +++ b/Engine/source/platform/threads/threadPool.cpp @@ -206,7 +206,7 @@ struct ThreadPool::WorkerThread : public Thread WorkerThread( ThreadPool* pool, U32 index ); WorkerThread* getNext(); - virtual void run( void* arg = 0 ); + void run( void* arg = 0 ) override; private: U32 mIndex; diff --git a/Engine/source/platform/threads/threadPoolAsyncIO.h b/Engine/source/platform/threads/threadPoolAsyncIO.h index 7f37534da..35738d091 100644 --- a/Engine/source/platform/threads/threadPoolAsyncIO.h +++ b/Engine/source/platform/threads/threadPoolAsyncIO.h @@ -223,7 +223,7 @@ class AsyncReadItem : public AsyncIOItem< T, Stream > /// elements actually read from the stream. U32 mNumElementsRead; - virtual void execute(); + void execute() override; void _allocBuffer() { diff --git a/Engine/source/platformSDL/sdlInputManager.h b/Engine/source/platformSDL/sdlInputManager.h index b9c9f057d..5bea81a9e 100644 --- a/Engine/source/platformSDL/sdlInputManager.h +++ b/Engine/source/platformSDL/sdlInputManager.h @@ -95,9 +95,9 @@ public: public: SDLInputManager(); - bool enable(); - void disable(); - void process(); + bool enable() override; + void disable() override; + void process() override; void processEvent(SDL_Event &evt); diff --git a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h index 2c0e93537..72d1c6400 100644 --- a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h +++ b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h @@ -52,8 +52,8 @@ private: protected: static const WCHAR *smPVIQueryTypeToWMIString []; - bool _queryProperty( const PVIQueryType queryType, const U32 adapterId, String *outValue ); - bool _initialize(); + bool _queryProperty( const PVIQueryType queryType, const U32 adapterId, String *outValue ) override; + bool _initialize() override; String _lookUpVendorId(U32 vendorId); public: diff --git a/Engine/source/platformWin32/winDInputDevice.h b/Engine/source/platformWin32/winDInputDevice.h index b242df789..3f92dfea9 100644 --- a/Engine/source/platformWin32/winDInputDevice.h +++ b/Engine/source/platformWin32/winDInputDevice.h @@ -124,7 +124,7 @@ class DInputDevice : public InputDevice static bool joystickDetected(); // - bool process(); + bool process() override; }; //------------------------------------------------------------------------------ diff --git a/Engine/source/platformWin32/winDirectInput.h b/Engine/source/platformWin32/winDirectInput.h index d7ebd1b70..9f5d86ac0 100644 --- a/Engine/source/platformWin32/winDirectInput.h +++ b/Engine/source/platformWin32/winDirectInput.h @@ -94,14 +94,14 @@ class DInputManager : public InputManager public: DInputManager(); - bool enable(); - void disable(); + bool enable() override; + void disable() override; - void onDeleteNotify( SimObject* object ); - bool onAdd(); - void onRemove(); + void onDeleteNotify( SimObject* object ) override; + bool onAdd() override; + void onRemove() override; - void process(); + void process() override; // DirectInput functions: static void init(); diff --git a/Engine/source/platformWin32/winDlibrary.cpp b/Engine/source/platformWin32/winDlibrary.cpp index eae7b07c9..5b937bd2f 100644 --- a/Engine/source/platformWin32/winDlibrary.cpp +++ b/Engine/source/platformWin32/winDlibrary.cpp @@ -35,7 +35,7 @@ public: ~Win32DLibrary(); bool open(const char* file); void close(); - void *bind(const char *name); + void *bind(const char *name) override; }; Win32DLibrary::Win32DLibrary() diff --git a/Engine/source/platformWin32/winExec.cpp b/Engine/source/platformWin32/winExec.cpp index 3b9ad52b9..a4c08c88d 100644 --- a/Engine/source/platformWin32/winExec.cpp +++ b/Engine/source/platformWin32/winExec.cpp @@ -43,7 +43,7 @@ class ExecuteThread : public Thread public: ExecuteThread(const char *executable, const char *args = NULL, const char *directory = NULL); - virtual void run(void *arg = 0); + void run(void *arg = 0) override; }; //----------------------------------------------------------------------------- @@ -62,7 +62,7 @@ public: mOK = ok; } - virtual void process(SimObject *object) + void process(SimObject *object) override { if( Con::isFunction( "onExecuteDone" ) ) Con::executef( "onExecuteDone", Con::getIntArg( mOK ) ); diff --git a/Engine/source/platformWin32/winFont.h b/Engine/source/platformWin32/winFont.h index eac8b1bac..b5a980705 100644 --- a/Engine/source/platformWin32/winFont.h +++ b/Engine/source/platformWin32/winFont.h @@ -38,23 +38,23 @@ public: virtual ~WinFont(); // PlatformFont virtual methods - virtual bool isValidChar(const UTF16 ch) const; - virtual bool isValidChar(const UTF8 *str) const; + bool isValidChar(const UTF16 ch) const override; + bool isValidChar(const UTF8 *str) const override; - inline virtual U32 getFontHeight() const + inline U32 getFontHeight() const override { return mTextMetric.tmHeight; } - inline virtual U32 getFontBaseLine() const + inline U32 getFontBaseLine() const override { return mTextMetric.tmAscent; } - virtual PlatformFont::CharInfo &getCharInfo(const UTF16 ch) const; - virtual PlatformFont::CharInfo &getCharInfo(const UTF8 *str) const; + PlatformFont::CharInfo &getCharInfo(const UTF16 ch) const override; + PlatformFont::CharInfo &getCharInfo(const UTF8 *str) const override; - virtual bool create(const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET); + bool create(const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET) override; }; #endif // _WINFONT_H_ diff --git a/Engine/source/platformWin32/winRedbook.cpp b/Engine/source/platformWin32/winRedbook.cpp index beef38dd0..c363d69a7 100644 --- a/Engine/source/platformWin32/winRedbook.cpp +++ b/Engine/source/platformWin32/winRedbook.cpp @@ -57,13 +57,13 @@ class Win32RedBookDevice : public RedBookDevice U32 getDeviceId(); - bool open(); - bool close(); - bool play(U32); - bool stop(); - bool getTrackCount(U32 *); - bool getVolume(F32 *); - bool setVolume(F32); + bool open() override; + bool close() override; + bool play(U32) override; + bool stop() override; + bool getTrackCount(U32 *) override; + bool getVolume(F32 *) override; + bool setVolume(F32) override; }; //------------------------------------------------------------------------------ diff --git a/Engine/source/platformWin32/winTimer.cpp b/Engine/source/platformWin32/winTimer.cpp index e5c8639a1..74bd4b0e3 100644 --- a/Engine/source/platformWin32/winTimer.cpp +++ b/Engine/source/platformWin32/winTimer.cpp @@ -47,7 +47,7 @@ public: mPerfCountNext = 0.0; } - const S32 getElapsedMs() + const S32 getElapsedMs() override { // Use QPC, update remainders so we don't leak time, and return the elapsed time. QueryPerformanceCounter( (LARGE_INTEGER *) &mPerfCountNext); @@ -59,7 +59,7 @@ public: return elapsed; } - void reset() + void reset() override { // Do some simple copying to reset the timer to 0. mPerfCountCurrent = mPerfCountNext; diff --git a/Engine/source/platformWin32/winVolume.cpp b/Engine/source/platformWin32/winVolume.cpp index b9e8e01ee..68cc8a421 100644 --- a/Engine/source/platformWin32/winVolume.cpp +++ b/Engine/source/platformWin32/winVolume.cpp @@ -72,10 +72,10 @@ namespace Win32 HANDLE *getHANDLES() { return mHandleList.address(); } private: - virtual void internalProcessOnce(); + void internalProcessOnce() override; - virtual bool internalAddNotification( const Path &dir ); - virtual bool internalRemoveNotification( const Path &dir ); + bool internalAddNotification( const Path &dir ) override; + bool internalRemoveNotification( const Path &dir ) override; Vector mDirs; Vector mHandleList; diff --git a/Engine/source/platformWin32/winVolume.h b/Engine/source/platformWin32/winVolume.h index 4b3160a25..feda42281 100644 --- a/Engine/source/platformWin32/winVolume.h +++ b/Engine/source/platformWin32/winVolume.h @@ -42,15 +42,15 @@ public: Win32FileSystem(String volume); ~Win32FileSystem(); - String getTypeStr() const { return "Win32"; } + String getTypeStr() const override { return "Win32"; } - FileNodeRef resolve(const Path& path); + FileNodeRef resolve(const Path& path) override; void verifyCompatibility(const Path& _path, WIN32_FIND_DATAW _info); - FileNodeRef create(const Path& path,FileNode::Mode); - bool remove(const Path& path); - bool rename(const Path& from,const Path& to); - Path mapTo(const Path& path); - Path mapFrom(const Path& path); + FileNodeRef create(const Path& path,FileNode::Mode) override; + bool remove(const Path& path) override; + bool rename(const Path& from,const Path& to) override; + Path mapTo(const Path& path) override; + Path mapFrom(const Path& path) override; private: String mVolume; @@ -65,24 +65,24 @@ class Win32File: public File public: ~Win32File(); - Path getName() const; - NodeStatus getStatus() const; - bool getAttributes(Attributes*); - U64 getSize(); + Path getName() const override; + NodeStatus getStatus() const override; + bool getAttributes(Attributes*) override; + U64 getSize() override; - U32 getPosition(); - U32 setPosition(U32,SeekMode); + U32 getPosition() override; + U32 setPosition(U32,SeekMode) override; - bool open(AccessMode); - bool close(); + bool open(AccessMode) override; + bool close() override; - U32 read(void* dst, U32 size); - U32 write(const void* src, U32 size); + U32 read(void* dst, U32 size) override; + U32 write(const void* src, U32 size) override; private: friend class Win32FileSystem; - U32 calculateChecksum(); + U32 calculateChecksum() override; Path mPath; String mName; @@ -103,18 +103,18 @@ class Win32Directory: public Directory public: ~Win32Directory(); - Path getName() const; - NodeStatus getStatus() const; - bool getAttributes(Attributes*); + Path getName() const override; + NodeStatus getStatus() const override; + bool getAttributes(Attributes*) override; - bool open(); - bool close(); - bool read(Attributes*); + bool open() override; + bool close() override; + bool read(Attributes*) override; private: friend class Win32FileSystem; - U32 calculateChecksum(); + U32 calculateChecksum() override; Path mPath; String mName; diff --git a/Engine/source/postFx/postEffect.h b/Engine/source/postFx/postEffect.h index 5a2e6b6ae..9b7e7afef 100644 --- a/Engine/source/postFx/postEffect.h +++ b/Engine/source/postFx/postEffect.h @@ -384,8 +384,8 @@ public: DECLARE_CONOBJECT(PostEffect); // SimObject - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); /// @name Callbacks diff --git a/Engine/source/renderInstance/forcedMaterialMeshMgr.h b/Engine/source/renderInstance/forcedMaterialMeshMgr.h index 78e5ff1fb..637de4b68 100644 --- a/Engine/source/renderInstance/forcedMaterialMeshMgr.h +++ b/Engine/source/renderInstance/forcedMaterialMeshMgr.h @@ -40,7 +40,7 @@ public: void setOverrideMaterial(BaseMatInstance* overrideMaterial); // RenderBinManager interface - virtual void render(SceneRenderState * state); + void render(SceneRenderState * state) override; DECLARE_CONOBJECT(ForcedMaterialMeshMgr); static void initPersistFields(); diff --git a/Engine/source/renderInstance/renderBinManager.h b/Engine/source/renderInstance/renderBinManager.h index 4097aa7bb..f30eee046 100644 --- a/Engine/source/renderInstance/renderBinManager.h +++ b/Engine/source/renderInstance/renderBinManager.h @@ -59,7 +59,7 @@ public: virtual ~RenderBinManager() {} // SimObject - void onRemove(); + void onRemove() override; virtual void addElement( RenderInst *inst ); virtual void sort(); diff --git a/Engine/source/renderInstance/renderDeferredMgr.h b/Engine/source/renderInstance/renderDeferredMgr.h index 5b5faae1e..84ef80c85 100644 --- a/Engine/source/renderInstance/renderDeferredMgr.h +++ b/Engine/source/renderInstance/renderDeferredMgr.h @@ -58,10 +58,10 @@ public: virtual void setDeferredMaterial( DeferredMatInstance *mat ); // RenderBinManager interface - virtual void render(SceneRenderState * state); - virtual void sort(); - virtual void clear(); - virtual void addElement( RenderInst *inst ); + void render(SceneRenderState * state) override; + void sort() override; + void clear() override; + void addElement( RenderInst *inst ) override; // ConsoleObject DECLARE_CONOBJECT(RenderDeferredMgr); @@ -77,7 +77,7 @@ public: static const GFXStateBlockDesc &getOpaqueStencilTestDesc(); static const GFXStateBlockDesc &getOpaqueStenciWriteDesc(bool lightmappedGeometry = true); - virtual bool setTargetSize(const Point2I &newTargetSize); + bool setTargetSize(const Point2I &newTargetSize) override; inline BaseMatInstance* getDeferredMaterial( BaseMatInstance *mat ); @@ -96,7 +96,7 @@ protected: virtual void _registerFeatures(); virtual void _unregisterFeatures(); - virtual bool _updateTargets(); + bool _updateTargets() override; virtual void _createDeferredMaterial(); bool _lightManagerActivate(bool active); @@ -120,12 +120,12 @@ class ProcessedDeferredMaterial : public ProcessedShaderMaterial public: ProcessedDeferredMaterial(Material& mat, const RenderDeferredMgr *deferredMgr); - virtual U32 getNumStages(); + U32 getNumStages() override; - virtual void addStateBlockDesc(const GFXStateBlockDesc& desc); + void addStateBlockDesc(const GFXStateBlockDesc& desc) override; protected: - virtual void _determineFeatures( U32 stageNum, MaterialFeatureData &fd, const FeatureSet &features ); + void _determineFeatures( U32 stageNum, MaterialFeatureData &fd, const FeatureSet &features ) override; const RenderDeferredMgr *mDeferredMgr; bool mIsLightmappedGeometry; @@ -147,11 +147,11 @@ public: } // MatInstance - virtual bool init( const FeatureSet &features, - const GFXVertexFormat *vertexFormat ); + bool init( const FeatureSet &features, + const GFXVertexFormat *vertexFormat ) override; protected: - virtual ProcessedMaterial* getShaderMaterial(); + ProcessedMaterial* getShaderMaterial() override; const RenderDeferredMgr *mDeferredMgr; }; @@ -166,7 +166,7 @@ public: virtual DeferredMatInstance *getDeferredMatInstance() { return mHookedDeferredMatInst; } - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// The type for deferred material hooks. static const MatInstanceHookType Type; @@ -190,17 +190,17 @@ public: } - virtual String getName() + String getName() override { return "Linear Eye-Space Depth Conditioner"; } - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; protected: - virtual Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta ); - virtual Var *_unconditionInput( Var *conditionedInput, MultiLine *meta ); + Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override; + Var *_unconditionInput( Var *conditionedInput, MultiLine *meta ) override; - virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ); + Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override; }; diff --git a/Engine/source/renderInstance/renderFormatChanger.h b/Engine/source/renderInstance/renderFormatChanger.h index f57463051..09bc6c384 100644 --- a/Engine/source/renderInstance/renderFormatChanger.h +++ b/Engine/source/renderInstance/renderFormatChanger.h @@ -84,16 +84,16 @@ public: DECLARE_CONOBJECT(RenderFormatToken); static void initPersistFields(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; RenderFormatToken(); virtual ~RenderFormatToken(); - virtual void process(SceneRenderState *state, RenderPassStateBin *callingBin); - virtual void reset(); - virtual void enable(bool enabled = true); - virtual bool isEnabled() const; + void process(SceneRenderState *state, RenderPassStateBin *callingBin) override; + void reset() override; + void enable(bool enabled = true) override; + bool isEnabled() const override; }; #endif // _RENDERFORMATCHANGER_H_ diff --git a/Engine/source/renderInstance/renderGlowMgr.h b/Engine/source/renderInstance/renderGlowMgr.h index 6b7d2289f..27ff7a03f 100644 --- a/Engine/source/renderInstance/renderGlowMgr.h +++ b/Engine/source/renderInstance/renderGlowMgr.h @@ -50,8 +50,8 @@ public: bool isGlowEnabled(); // RenderBinManager - virtual void addElement( RenderInst *inst ); - virtual void render( SceneRenderState *state ); + void addElement( RenderInst *inst ) override; + void render( SceneRenderState *state ) override; // ConsoleObject DECLARE_CONOBJECT( RenderGlowMgr ); @@ -67,7 +67,7 @@ protected: virtual BaseMatInstance *getMatInstance() { return mGlowMatInst; } - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// Our material hook type. static const MatInstanceHookType Type; diff --git a/Engine/source/renderInstance/renderImposterMgr.h b/Engine/source/renderInstance/renderImposterMgr.h index caf6f83d4..f870c6e77 100644 --- a/Engine/source/renderInstance/renderImposterMgr.h +++ b/Engine/source/renderInstance/renderImposterMgr.h @@ -93,7 +93,7 @@ public: static void initPersistFields(); // RenderBinManager - virtual void render( SceneRenderState *state ); + void render( SceneRenderState *state ) override; }; diff --git a/Engine/source/renderInstance/renderMeshMgr.h b/Engine/source/renderInstance/renderMeshMgr.h index fa0d3cb2a..20a3f38f4 100644 --- a/Engine/source/renderInstance/renderMeshMgr.h +++ b/Engine/source/renderInstance/renderMeshMgr.h @@ -38,8 +38,8 @@ public: // RenderBinManager interface virtual void init(); - virtual void render(SceneRenderState * state); - virtual void addElement( RenderInst *inst ); + void render(SceneRenderState * state) override; + void addElement( RenderInst *inst ) override; // ConsoleObject interface static void initPersistFields(); diff --git a/Engine/source/renderInstance/renderObjectMgr.h b/Engine/source/renderInstance/renderObjectMgr.h index 3686fe93e..c8ef9c575 100644 --- a/Engine/source/renderInstance/renderObjectMgr.h +++ b/Engine/source/renderInstance/renderObjectMgr.h @@ -39,7 +39,7 @@ public: virtual void setOverrideMaterial(BaseMatInstance* overrideMat); // RenderBinMgr - virtual void render(SceneRenderState * state); + void render(SceneRenderState * state) override; // ConsoleObject static void initPersistFields(); diff --git a/Engine/source/renderInstance/renderOcclusionMgr.h b/Engine/source/renderInstance/renderOcclusionMgr.h index 34f64eb46..893274f9d 100644 --- a/Engine/source/renderInstance/renderOcclusionMgr.h +++ b/Engine/source/renderInstance/renderOcclusionMgr.h @@ -41,7 +41,7 @@ public: // RenderOcclusionMgr virtual void init(); - virtual void render(SceneRenderState * state); + void render(SceneRenderState * state) override; // ConsoleObject static void consoleInit(); diff --git a/Engine/source/renderInstance/renderParticleMgr.h b/Engine/source/renderInstance/renderParticleMgr.h index 77b3d6a82..6d606acad 100644 --- a/Engine/source/renderInstance/renderParticleMgr.h +++ b/Engine/source/renderInstance/renderParticleMgr.h @@ -50,10 +50,10 @@ public: virtual ~RenderParticleMgr(); // RenderBinManager - void render(SceneRenderState * state); - void sort(); - void clear(); - void addElement( RenderInst *inst ); + void render(SceneRenderState * state) override; + void sort() override; + void clear() override; + void addElement( RenderInst *inst ) override; // ConsoleObject DECLARE_CONOBJECT(RenderParticleMgr); @@ -62,12 +62,12 @@ public: const static U8 ParticleSystemStencilMask = 0x80; // We are using the top bit const static U32 OffscreenPoolSize = 5; - virtual void setTargetChainLength(const U32 chainLength); + void setTargetChainLength(const U32 chainLength) override; protected: // Override - virtual bool _handleGFXEvent(GFXDevice::GFXDeviceEventType event); + bool _handleGFXEvent(GFXDevice::GFXDeviceEventType event) override; bool _initShader(); void _initGFXResources(); diff --git a/Engine/source/renderInstance/renderPassManager.h b/Engine/source/renderInstance/renderPassManager.h index b203fd630..8231370c8 100644 --- a/Engine/source/renderInstance/renderPassManager.h +++ b/Engine/source/renderInstance/renderPassManager.h @@ -57,7 +57,7 @@ class LightInfo; struct RenderInst; class MatrixSet; class GFXPrimitiveBufferHandle; -class CustomShaderBindingData; +struct CustomShaderBindingData; /// A RenderInstType hash value. typedef U32 RenderInstTypeHash; diff --git a/Engine/source/renderInstance/renderPassStateToken.h b/Engine/source/renderInstance/renderPassStateToken.h index f472c72c7..2786cd43b 100644 --- a/Engine/source/renderInstance/renderPassStateToken.h +++ b/Engine/source/renderInstance/renderPassStateToken.h @@ -79,9 +79,9 @@ public: RenderPassStateBin(); virtual ~RenderPassStateBin(); - void render(SceneRenderState *state); - void clear(); - void sort(); + void render(SceneRenderState *state) override; + void clear() override; + void sort() override; }; #endif // _RENDERPASSSTATETOKEN_H_ diff --git a/Engine/source/renderInstance/renderProbeMgr.h b/Engine/source/renderInstance/renderProbeMgr.h index 94b8f7167..fcf9e68dd 100644 --- a/Engine/source/renderInstance/renderProbeMgr.h +++ b/Engine/source/renderInstance/renderProbeMgr.h @@ -342,14 +342,14 @@ public: RenderProbeMgr(); RenderProbeMgr(RenderInstType riType, F32 renderOrder, F32 processAddOrder); virtual ~RenderProbeMgr(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // ConsoleObject static void initPersistFields(); static void consoleInit(); - virtual void addElement(RenderInst* inst) {}; + void addElement(RenderInst* inst) override {}; DECLARE_CONOBJECT(RenderProbeMgr); /// @@ -481,9 +481,9 @@ public: /// /// Renders the sorted probes list via a PostEffect to draw them into the buffer data in deferred mode. /// - virtual void render(SceneRenderState * state); + void render(SceneRenderState * state) override; - virtual void clear() { mActiveProbes.clear(); Parent::clear(); } + void clear() override { mActiveProbes.clear(); Parent::clear(); } }; RenderProbeMgr* RenderProbeMgr::getProbeManager() diff --git a/Engine/source/renderInstance/renderTerrainMgr.h b/Engine/source/renderInstance/renderTerrainMgr.h index c235588db..0e819da8e 100644 --- a/Engine/source/renderInstance/renderTerrainMgr.h +++ b/Engine/source/renderInstance/renderTerrainMgr.h @@ -83,7 +83,7 @@ protected: static bool _clearStats( GFXDevice::GFXDeviceEventType type ); // RenderBinManager - virtual void internalAddElement( RenderInst *inst ); + void internalAddElement( RenderInst *inst ) override; public: @@ -96,9 +96,9 @@ public: DECLARE_CONOBJECT(RenderTerrainMgr); // RenderBinManager - virtual void sort(); - virtual void render( SceneRenderState *state ); - virtual void clear(); + void sort() override; + void render( SceneRenderState *state ) override; + void clear() override; }; diff --git a/Engine/source/renderInstance/renderTexTargetBinManager.h b/Engine/source/renderInstance/renderTexTargetBinManager.h index 67270a191..90d4fd02e 100644 --- a/Engine/source/renderInstance/renderTexTargetBinManager.h +++ b/Engine/source/renderInstance/renderTexTargetBinManager.h @@ -77,7 +77,7 @@ public: DECLARE_CONOBJECT(RenderTexTargetBinManager); static void initPersistFields(); - virtual bool onAdd(); + bool onAdd() override; protected: diff --git a/Engine/source/renderInstance/renderTranslucentMgr.h b/Engine/source/renderInstance/renderTranslucentMgr.h index e6464f7d9..8c01402b2 100644 --- a/Engine/source/renderInstance/renderTranslucentMgr.h +++ b/Engine/source/renderInstance/renderTranslucentMgr.h @@ -43,9 +43,9 @@ public: virtual ~RenderTranslucentMgr(); // RenderBinManager - void render(SceneRenderState * state); - void addElement( RenderInst *inst ); - void setupSGData( MeshRenderInst *ri, SceneData &data ); + void render(SceneRenderState * state) override; + void addElement( RenderInst *inst ) override; + void setupSGData( MeshRenderInst *ri, SceneData &data ) override; // ConsoleObject DECLARE_CONOBJECT(RenderTranslucentMgr); diff --git a/Engine/source/scene/mixin/sceneAmbientSoundObject.h b/Engine/source/scene/mixin/sceneAmbientSoundObject.h index ef3f2c82c..24bf95078 100644 --- a/Engine/source/scene/mixin/sceneAmbientSoundObject.h +++ b/Engine/source/scene/mixin/sceneAmbientSoundObject.h @@ -58,11 +58,11 @@ class SceneAmbientSoundObject : public Base 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; // SceneObject. - virtual SFXAmbience* getSoundAmbience() const { return mSoundAmbience; } + SFXAmbience* getSoundAmbience() const override { return mSoundAmbience; } private: diff --git a/Engine/source/scene/mixin/scenePolyhedralObject.h b/Engine/source/scene/mixin/scenePolyhedralObject.h index 6a60d0b6d..1e9599565 100644 --- a/Engine/source/scene/mixin/scenePolyhedralObject.h +++ b/Engine/source/scene/mixin/scenePolyhedralObject.h @@ -75,7 +75,7 @@ class ScenePolyhedralObject : public Base, public IScenePolyhedralObject PolyhedronType mPolyhedron; /// - virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ); + void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override; public: @@ -90,21 +90,21 @@ class ScenePolyhedralObject : public Base, public IScenePolyhedralObject const PolyhedronType& getPolyhedron() const { return mPolyhedron; } // SimObject. - virtual bool onAdd(); - virtual void writeFields( Stream& stream, U32 tabStop ); - virtual bool writeField( StringTableEntry name, const char* value ); + bool onAdd() override; + void writeFields( Stream& stream, U32 tabStop ) override; + bool writeField( StringTableEntry name, 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; // SceneObject. - virtual bool containsPoint( const Point3F& point ); + bool containsPoint( const Point3F& point ) override; // IScenePolyhedralObject. - virtual AnyPolyhedron ToAnyPolyhedron() const { return getPolyhedron(); } + AnyPolyhedron ToAnyPolyhedron() const override { return getPolyhedron(); } private: diff --git a/Engine/source/scene/pathManager.cpp b/Engine/source/scene/pathManager.cpp index e5d5c72fb..cfa84a91a 100644 --- a/Engine/source/scene/pathManager.cpp +++ b/Engine/source/scene/pathManager.cpp @@ -88,10 +88,10 @@ class PathManagerEvent : public NetEvent typedef NetEvent Parent; PathManagerEvent() : modifiedPath(0), clearPaths(false) { } - void pack(NetConnection*, BitStream*); - void write(NetConnection*, BitStream*); - void unpack(NetConnection*, BitStream*); - void process(NetConnection*); + void pack(NetConnection*, BitStream*) override; + void write(NetConnection*, BitStream*) override; + void unpack(NetConnection*, BitStream*) override; + void process(NetConnection*) override; DECLARE_CONOBJECT(PathManagerEvent); }; diff --git a/Engine/source/scene/reflectionMatHook.h b/Engine/source/scene/reflectionMatHook.h index dab5e2b8c..c90444a38 100644 --- a/Engine/source/scene/reflectionMatHook.h +++ b/Engine/source/scene/reflectionMatHook.h @@ -38,7 +38,7 @@ public: ReflectionMatInstance( Material *mat ); virtual ~ReflectionMatInstance() {} - virtual bool setupPass( SceneRenderState *state, const SceneData &sgData ); + bool setupPass( SceneRenderState *state, const SceneData &sgData ) override; }; class ReflectionMaterialHook : public MatInstanceHook @@ -49,7 +49,7 @@ public: // MatInstanceHook virtual ~ReflectionMaterialHook(); - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// The material hook type. static const MatInstanceHookType Type; diff --git a/Engine/source/scene/reflector.h b/Engine/source/scene/reflector.h index 4d87b69c1..d39451089 100644 --- a/Engine/source/scene/reflector.h +++ b/Engine/source/scene/reflector.h @@ -70,9 +70,9 @@ public: static void initPersistFields(); - virtual void packData( BitStream *stream ); - virtual void unpackData( BitStream* stream ); - virtual bool preload( bool server, String &errorStr ); + void packData( BitStream *stream ) override; + void unpackData( BitStream* stream ) override; + bool preload( bool server, String &errorStr ) override; U32 texSize; F32 nearDist; @@ -150,7 +150,7 @@ public: void registerReflector( SceneObject *inObject, ReflectorDesc *inDesc ); - virtual void unregisterReflector(); + void unregisterReflector() override; virtual void updateReflection( const ReflectParams ¶ms, Point3F explicitPostion = Point3F::Max); GFXCubemap* getCubemap() const { return mCubemap; } @@ -174,8 +174,8 @@ protected: U32 faceIdx; CubeReflector *cube; - virtual void updateReflection( const ReflectParams ¶ms ) { cube->updateFace( params, faceIdx ); } - virtual F32 calcScore( const ReflectParams ¶ms ); + void updateReflection( const ReflectParams ¶ms ) override { cube->updateFace( params, faceIdx ); } + F32 calcScore( const ReflectParams ¶ms ) override; }; CubeFaceReflector mFaces[6]; @@ -200,8 +200,8 @@ public: void registerReflector( SceneObject *inObject, ReflectorDesc *inDesc ); - virtual F32 calcScore( const ReflectParams ¶ms ); - virtual void updateReflection( const ReflectParams ¶ms ); + F32 calcScore( const ReflectParams ¶ms ) override; + void updateReflection( const ReflectParams ¶ms ) override; /// Set up the GFX matrices void setGFXMatrices( const MatrixF &camTrans ); diff --git a/Engine/source/scene/sceneObject.h b/Engine/source/scene/sceneObject.h index 7b48addec..1ebe3fd72 100644 --- a/Engine/source/scene/sceneObject.h +++ b/Engine/source/scene/sceneObject.h @@ -497,7 +497,7 @@ class SceneObject : public NetObject, public ProcessObject /// it is removed entirely from collisions, it is not ghosted and is /// essentially "non existant" as far as simulation is concerned. /// @param hidden True if object is to be hidden - virtual void setHidden( bool hidden ); + void setHidden( bool hidden ) override; /// Builds a convex hull for this object. /// @@ -732,22 +732,22 @@ class SceneObject : public NetObject, public ProcessObject ProcessList* getProcessList() const; // ProcessObject, - virtual void processAfter( ProcessObject *obj ); - virtual void clearProcessAfter(); - virtual ProcessObject* getAfterObject() const { return mAfterObject; } - virtual void setProcessTick( bool t ); + void processAfter( ProcessObject *obj ) override; + void clearProcessAfter() override; + ProcessObject* getAfterObject() const override { return mAfterObject; } + void setProcessTick( bool t ) override; // NetObject. - virtual U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ); - virtual void unpackUpdate( NetConnection* conn, BitStream* stream ); - virtual void onCameraScopeQuery( NetConnection* connection, CameraScopeQuery* query ); + U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ) override; + void unpackUpdate( NetConnection* conn, BitStream* stream ) override; + void onCameraScopeQuery( NetConnection* connection, CameraScopeQuery* query ) override; // SimObject. - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify( SimObject *object ); - virtual void inspectPostApply(); - virtual bool writeField( StringTableEntry fieldName, const char* value ); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify( SimObject *object ) override; + void inspectPostApply() override; + bool writeField( StringTableEntry fieldName, const char* value ) override; static void initPersistFields(); diff --git a/Engine/source/scene/sceneSpace.h b/Engine/source/scene/sceneSpace.h index bff78d81f..fb13abc74 100644 --- a/Engine/source/scene/sceneSpace.h +++ b/Engine/source/scene/sceneSpace.h @@ -64,20 +64,20 @@ class SceneSpace : public SceneObject ~SceneSpace(); // SimObject. - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; // SceneObject. - virtual void setTransform( const MatrixF &mat ); - virtual void prepRenderImage( SceneRenderState* state ); + void setTransform( const MatrixF &mat ) override; + void prepRenderImage( SceneRenderState* state ) override; // 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; // SimObject. - virtual void onEditorEnable(); - virtual void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; }; #endif // !_SCENESPACE_H_ diff --git a/Engine/source/scene/simPath.h b/Engine/source/scene/simPath.h index b4a6395d7..244cf7154 100644 --- a/Engine/source/scene/simPath.h +++ b/Engine/source/scene/simPath.h @@ -68,15 +68,15 @@ class Path : public GameBase S32 mMinDelay; S32 mMaxDelay; protected: - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; public: Path(); ~Path(); - void addObject(SimObject*); - void removeObject(SimObject*); + void addObject(SimObject*) override; + void removeObject(SimObject*) override; void sortMarkers(); void updatePath(); @@ -130,16 +130,16 @@ class Marker : public SceneObject // Rendering protected: - void prepRenderImage(SceneRenderState *state); + void prepRenderImage(SceneRenderState *state) override; void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* overrideMat); protected: - bool onAdd(); - void onRemove(); - void onGroupAdd(); + bool onAdd() override; + void onRemove() override; + void onGroupAdd() override; - void onEditorEnable(); - void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; static void initGFXResources(); @@ -154,10 +154,10 @@ class Marker : public SceneObject DECLARE_CONOBJECT(Marker); DECLARE_CATEGORY("Cinematic"); static void initPersistFields(); - 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; }; typedef Marker::SmoothingType MarkerSmoothingType; diff --git a/Engine/source/scene/zones/scenePolyhedralZone.h b/Engine/source/scene/zones/scenePolyhedralZone.h index b6a9c7b03..f0ac7fd0a 100644 --- a/Engine/source/scene/zones/scenePolyhedralZone.h +++ b/Engine/source/scene/zones/scenePolyhedralZone.h @@ -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_ diff --git a/Engine/source/scene/zones/sceneRootZone.h b/Engine/source/scene/zones/sceneRootZone.h index 6cc7932dc..989d64ea5 100644 --- a/Engine/source/scene/zones/sceneRootZone.h +++ b/Engine/source/scene/zones/sceneRootZone.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_ diff --git a/Engine/source/scene/zones/sceneSimpleZone.h b/Engine/source/scene/zones/sceneSimpleZone.h index 6da5f039f..ffee2f7cb 100644 --- a/Engine/source/scene/zones/sceneSimpleZone.h +++ b/Engine/source/scene/zones/sceneSimpleZone.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; /// @} diff --git a/Engine/source/scene/zones/sceneZoneSpace.h b/Engine/source/scene/zones/sceneZoneSpace.h index 7c04279d2..2fe26788a 100644 --- a/Engine/source/scene/zones/sceneZoneSpace.h +++ b/Engine/source/scene/zones/sceneZoneSpace.h @@ -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: diff --git a/Engine/source/sfx/media/sfxVorbisStream.h b/Engine/source/sfx/media/sfxVorbisStream.h index 74b9d0964..f5b13b32a 100644 --- a/Engine/source/sfx/media/sfxVorbisStream.h +++ b/Engine/source/sfx/media/sfxVorbisStream.h @@ -60,8 +60,8 @@ class SFXVorbisStream : public SFXFileStream, static long _tell_func( void *datasource ); // SFXStream - virtual bool _readHeader(); - virtual void _close(); + bool _readHeader() override; + void _close() override; public: @@ -92,10 +92,10 @@ class SFXVorbisStream : public SFXFileStream, S32 *bitstream ); // SFXStream - virtual void reset(); - virtual U32 read( U8 *buffer, U32 length ); - virtual bool isEOS() const; - virtual SFXStream* clone() const + void reset() override; + U32 read( U8 *buffer, U32 length ) override; + bool isEOS() const override; + SFXStream* clone() const override { SFXVorbisStream* stream = new SFXVorbisStream( *this ); if( !stream->mVF ) @@ -104,8 +104,8 @@ class SFXVorbisStream : public SFXFileStream, } // IPositionable - virtual U32 getPosition() const; - virtual void setPosition( U32 offset ); + U32 getPosition() const override; + void setPosition( U32 offset ) override; }; #endif // TORQUE_OGGVORBIS diff --git a/Engine/source/sfx/media/sfxWavStream.h b/Engine/source/sfx/media/sfxWavStream.h index 7b6d182a7..243fc078a 100644 --- a/Engine/source/sfx/media/sfxWavStream.h +++ b/Engine/source/sfx/media/sfxWavStream.h @@ -44,8 +44,8 @@ class SFXWavStream : public SFXFileStream, U32 mDataStart; // SFXFileStream - virtual bool _readHeader(); - virtual void _close(); + bool _readHeader() override; + void _close() override; public: @@ -62,9 +62,9 @@ class SFXWavStream : public SFXFileStream, virtual ~SFXWavStream(); // SFXStream - virtual void reset(); - virtual U32 read( U8 *buffer, U32 length ); - virtual SFXStream* clone() const + void reset() override; + U32 read( U8 *buffer, U32 length ) override; + SFXStream* clone() const override { SFXWavStream* stream = new SFXWavStream( *this ); if( !stream->mStream ) @@ -73,8 +73,8 @@ class SFXWavStream : public SFXFileStream, } // IPositionable - virtual U32 getPosition() const; - virtual void setPosition( U32 offset ); + U32 getPosition() const override; + void setPosition( U32 offset ) override; }; #endif // _SFXWAVSTREAM_H_ diff --git a/Engine/source/sfx/null/sfxNullBuffer.h b/Engine/source/sfx/null/sfxNullBuffer.h index 8ad77c714..ce90aad14 100644 --- a/Engine/source/sfx/null/sfxNullBuffer.h +++ b/Engine/source/sfx/null/sfxNullBuffer.h @@ -38,8 +38,8 @@ class SFXNullBuffer : public SFXBuffer SFXNullBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ); // SFXBuffer. - virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ); - virtual void _flush() {} + void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override; + void _flush() override {} public: diff --git a/Engine/source/sfx/null/sfxNullDevice.h b/Engine/source/sfx/null/sfxNullDevice.h index d3b36ae7f..299b53cd8 100644 --- a/Engine/source/sfx/null/sfxNullDevice.h +++ b/Engine/source/sfx/null/sfxNullDevice.h @@ -55,9 +55,9 @@ class SFXNullDevice : public SFXDevice public: // SFXDevice. - virtual SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ); - virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ); - virtual void update(); + SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override; + SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override; + void update() override; }; #endif // _SFXNULLDEVICE_H_ \ No newline at end of file diff --git a/Engine/source/sfx/null/sfxNullProvider.cpp b/Engine/source/sfx/null/sfxNullProvider.cpp index da85b5588..a41dda4c8 100644 --- a/Engine/source/sfx/null/sfxNullProvider.cpp +++ b/Engine/source/sfx/null/sfxNullProvider.cpp @@ -36,11 +36,11 @@ public: protected: void addDeviceDesc( const String& name, const String& desc ); - void init(); + void init() override; public: - SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ); + SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override; }; diff --git a/Engine/source/sfx/null/sfxNullVoice.h b/Engine/source/sfx/null/sfxNullVoice.h index 02582542d..b28cb6629 100644 --- a/Engine/source/sfx/null/sfxNullVoice.h +++ b/Engine/source/sfx/null/sfxNullVoice.h @@ -54,12 +54,12 @@ class SFXNullVoice : public SFXVoice bool mIsLooping; // SFXVoice. - virtual SFXStatus _status() const; - virtual void _play(); - virtual void _pause(); - virtual void _stop(); - virtual void _seek( U32 sample ); - virtual U32 _tell() const; + SFXStatus _status() const override; + void _play() override; + void _pause() override; + void _stop() override; + void _seek( U32 sample ) override; + U32 _tell() const override; /// U32 _getPlayTime() const @@ -72,15 +72,15 @@ class SFXNullVoice : public SFXVoice virtual ~SFXNullVoice(); /// SFXVoice - SFXStatus getStatus() const; - void setPosition( U32 sample ); - void play( bool looping ); - void setMinMaxDistance( F32 min, F32 max ); - void setVelocity( const VectorF& velocity ); - void setTransform( const MatrixF& transform ); - void setVolume( F32 volume ); - void setPitch( F32 pitch ); - void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ); + SFXStatus getStatus() const override; + void setPosition( U32 sample ) override; + void play( bool looping ) override; + void setMinMaxDistance( F32 min, F32 max ) override; + void setVelocity( const VectorF& velocity ) override; + void setTransform( const MatrixF& transform ) override; + void setVolume( F32 volume ) override; + void setPitch( F32 pitch ) override; + void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override; }; #endif // _SFXNULLVOICE_H_ \ No newline at end of file diff --git a/Engine/source/sfx/openal/sfxALBuffer.h b/Engine/source/sfx/openal/sfxALBuffer.h index 4ed44e133..26864a3d0 100644 --- a/Engine/source/sfx/openal/sfxALBuffer.h +++ b/Engine/source/sfx/openal/sfxALBuffer.h @@ -103,8 +103,8 @@ class SFXALBuffer : public SFXBuffer } // SFXBuffer. - virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ); - void _flush(); + void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override; + void _flush() override; public: diff --git a/Engine/source/sfx/openal/sfxALDevice.h b/Engine/source/sfx/openal/sfxALDevice.h index 654dca6d2..3d2bf5e78 100644 --- a/Engine/source/sfx/openal/sfxALDevice.h +++ b/Engine/source/sfx/openal/sfxALDevice.h @@ -87,12 +87,12 @@ class SFXALDevice : public SFXDevice public: // SFXDevice. - virtual SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ); - virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ); - virtual void setListener( U32 index, const SFXListenerProperties& listener ); - virtual void setDistanceModel( SFXDistanceModel model ); - virtual void setDopplerFactor( F32 factor ); - virtual void setRolloffFactor( F32 factor ); + SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override; + SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override; + void setListener( U32 index, const SFXListenerProperties& listener ) override; + void setDistanceModel( SFXDistanceModel model ) override; + void setDopplerFactor( F32 factor ) override; + void setRolloffFactor( F32 factor ) override; #if defined(AL_ALEXT_PROTOTYPES) //function for openAL to open slots virtual void openSlots(); @@ -103,7 +103,7 @@ class SFXALDevice : public SFXDevice //get values from sfxreverbproperties and pass it to openal device virtual void setReverb(const SFXReverbProperties& reverb); #endif - virtual void resetReverb() {} + void resetReverb() override {} }; #endif // _SFXALDEVICE_H_ diff --git a/Engine/source/sfx/openal/sfxALProvider.cpp b/Engine/source/sfx/openal/sfxALProvider.cpp index e6742f515..28a28b9e4 100644 --- a/Engine/source/sfx/openal/sfxALProvider.cpp +++ b/Engine/source/sfx/openal/sfxALProvider.cpp @@ -48,10 +48,10 @@ protected: }; - void init(); + void init() override; public: - SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ); + SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override; }; diff --git a/Engine/source/sfx/openal/sfxALVoice.h b/Engine/source/sfx/openal/sfxALVoice.h index 6360da843..2f3dd8eca 100644 --- a/Engine/source/sfx/openal/sfxALVoice.h +++ b/Engine/source/sfx/openal/sfxALVoice.h @@ -79,12 +79,12 @@ class SFXALVoice : public SFXVoice void _lateBindStaticBufferIfNecessary(); // SFXVoice. - virtual SFXStatus _status() const; - virtual void _play(); - virtual void _pause(); - virtual void _stop(); - virtual void _seek( U32 sample ); - virtual U32 _tell() const; + SFXStatus _status() const override; + void _play() override; + void _pause() override; + void _stop() override; + void _seek( U32 sample ) override; + U32 _tell() const override; public: @@ -94,14 +94,14 @@ class SFXALVoice : public SFXVoice virtual ~SFXALVoice(); /// SFXVoice - void setMinMaxDistance( F32 min, F32 max ); - void play( bool looping ); - void setVelocity( const VectorF& velocity ); - void setTransform( const MatrixF& transform ); - void setVolume( F32 volume ); - void setPitch( F32 pitch ); - void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ); - void setRolloffFactor( F32 factor ); + void setMinMaxDistance( F32 min, F32 max ) override; + void play( bool looping ) override; + void setVelocity( const VectorF& velocity ) override; + void setTransform( const MatrixF& transform ) override; + void setVolume( F32 volume ) override; + void setPitch( F32 pitch ) override; + void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override; + void setRolloffFactor( F32 factor ) override; }; #endif // _SFXALVOICE_H_ \ No newline at end of file diff --git a/Engine/source/sfx/sfxAmbience.h b/Engine/source/sfx/sfxAmbience.h index 598d42596..bd36a1547 100644 --- a/Engine/source/sfx/sfxAmbience.h +++ b/Engine/source/sfx/sfxAmbience.h @@ -105,11 +105,11 @@ class SFXAmbience : public SimDataBlock static ChangeSignal& getChangeSignal() { return smChangeSignal; } // SimDataBlock. - virtual bool onAdd(); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - virtual bool preload( bool server, String& errorStr ); - virtual void inspectPostApply(); + bool onAdd() override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; + bool preload( bool server, String& errorStr ) override; + void inspectPostApply() override; static void initPersistFields(); diff --git a/Engine/source/sfx/sfxBuffer.h b/Engine/source/sfx/sfxBuffer.h index 5c2307022..bf00e40ee 100644 --- a/Engine/source/sfx/sfxBuffer.h +++ b/Engine/source/sfx/sfxBuffer.h @@ -227,10 +227,10 @@ class SFXBuffer : public StrongRefBase, void load(); // IPolled. - virtual bool update(); + bool update() override; // WeakRefBase. - virtual void destroySelf(); + void destroySelf() override; }; #endif // _SFXBUFFER_H_ diff --git a/Engine/source/sfx/sfxController.h b/Engine/source/sfx/sfxController.h index 7d2ee4980..0d3b26f3d 100644 --- a/Engine/source/sfx/sfxController.h +++ b/Engine/source/sfx/sfxController.h @@ -185,14 +185,14 @@ class SFXController : public SFXSource static SFXController* _create( SFXPlayList* playList ); // SFXSource. - virtual void _play(); - virtual void _pause(); - virtual void _stop(); - virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ); - virtual void _updateVolume( const MatrixF& listener ); - virtual void _updatePitch(); - virtual void _updatePriority(); - virtual void _update(); + void _play() override; + void _pause() override; + void _stop() override; + void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override; + void _updateVolume( const MatrixF& listener ) override; + void _updatePitch() override; + void _updatePriority() override; + void _update() override; public: diff --git a/Engine/source/sfx/sfxDescription.h b/Engine/source/sfx/sfxDescription.h index 003faee27..8f4d31134 100644 --- a/Engine/source/sfx/sfxDescription.h +++ b/Engine/source/sfx/sfxDescription.h @@ -188,17 +188,17 @@ class SFXDescription : public SimDataBlock static void initPersistFields(); // SimDataBlock. - virtual bool onAdd(); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - virtual void inspectPostApply(); + bool onAdd() override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; + void inspectPostApply() override; /// Validates the description fixing any /// parameters that are out of range. void validate(); public: SFXDescription(const SFXDescription&, bool); - virtual bool allowSubstitutions() const { return true; } + bool allowSubstitutions() const override { return true; } }; diff --git a/Engine/source/sfx/sfxEnvironment.h b/Engine/source/sfx/sfxEnvironment.h index 372d4138b..5afad1acc 100644 --- a/Engine/source/sfx/sfxEnvironment.h +++ b/Engine/source/sfx/sfxEnvironment.h @@ -59,11 +59,11 @@ class SFXEnvironment : public SimDataBlock static void initPersistFields(); - virtual bool onAdd(); - virtual bool preload( bool server, String& errorStr ); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - virtual void inspectPostApply(); + bool onAdd() override; + bool preload( bool server, String& errorStr ) override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; + void inspectPostApply() override; /// @return The reverb properties of the sound environment. const SFXReverbProperties& getReverb() const { return mReverb; } diff --git a/Engine/source/sfx/sfxFileStream.h b/Engine/source/sfx/sfxFileStream.h index 54c578081..b22ba57a2 100644 --- a/Engine/source/sfx/sfxFileStream.h +++ b/Engine/source/sfx/sfxFileStream.h @@ -105,11 +105,11 @@ class SFXFileStream : public SFXStream void close(); // SFXStream. - const SFXFormat& getFormat() const { return mFormat; } - U32 getSampleCount() const { return mSamples; } - U32 getDataLength() const { return mSamples * mFormat.getBytesPerSample(); } - U32 getDuration() const { return mFormat.getDuration( mSamples ); } - bool isEOS() const; + const SFXFormat& getFormat() const override { return mFormat; } + U32 getSampleCount() const override { return mSamples; } + U32 getDataLength() const override { return mSamples * mFormat.getBytesPerSample(); } + U32 getDuration() const override { return mFormat.getDuration( mSamples ); } + bool isEOS() const override; }; #endif // _SFXFILESTREAM_H_ diff --git a/Engine/source/sfx/sfxInternal.h b/Engine/source/sfx/sfxInternal.h index 212133859..7d2c49df2 100644 --- a/Engine/source/sfx/sfxInternal.h +++ b/Engine/source/sfx/sfxInternal.h @@ -120,15 +120,15 @@ class SFXAsyncStream : public AsyncPacketBufferedInputStream< SFXStreamRef, SFXS bool mReadSilenceAtEnd; // AsyncPacketStream. - virtual SFXStreamPacket* _newPacket( U32 packetSize ) + SFXStreamPacket* _newPacket( U32 packetSize ) override { SFXStreamPacket* packet = Parent::_newPacket( packetSize ); packet->mFormat = getSourceStream()->getFormat(); return packet; } - virtual void _requestNext(); - virtual void _onArrival( SFXStreamPacket* const& packet ); - virtual void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements ) + void _requestNext() override; + void _onArrival( SFXStreamPacket* const& packet ) override; + void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements ) override { if( !this->mNumRemainingSourceElements && mReadSilenceAtEnd ) packet->mIsLast = false; @@ -285,7 +285,7 @@ class SFXWrapAroundBuffer : public SFXBuffer U32 mBufferSize; // SFXBuffer. - virtual void _flush() + void _flush() override { mWriteOffset = 0; } @@ -294,7 +294,7 @@ class SFXWrapAroundBuffer : public SFXBuffer virtual bool _copyData( U32 offset, const U8* data, U32 length ) = 0; // SFXBuffer. - virtual void write( SFXStreamPacket* const* packets, U32 num ); + void write( SFXStreamPacket* const* packets, U32 num ) override; /// @return the sample position in the sound stream as determined from the /// given buffer offset. @@ -326,7 +326,7 @@ class SFXWrapAroundBuffer : public SFXBuffer SFXWrapAroundBuffer( SFXDescription* description ) : Parent( description ), mBufferSize( 0 ), mWriteOffset(0) {} - virtual U32 getMemoryUsed() const { return mBufferSize; } + U32 getMemoryUsed() const override { return mBufferSize; } }; //-------------------------------------------------------------------------- diff --git a/Engine/source/sfx/sfxMemoryStream.h b/Engine/source/sfx/sfxMemoryStream.h index dddfcaf01..2421add45 100644 --- a/Engine/source/sfx/sfxMemoryStream.h +++ b/Engine/source/sfx/sfxMemoryStream.h @@ -72,13 +72,13 @@ class SFXMemoryStream : public SFXStream, SFXMemoryStream( const SFXFormat& format, SourceStreamType* stream, U32 numSamples = U32_MAX ); // SFXStream. - const SFXFormat& getFormat() const { return mFormat; } - U32 getSampleCount() const { return mNumSamplesTotal; } - U32 getDataLength() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); } - U32 getDuration() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); } - bool isEOS() const { return ( mNumSamplesLeft != 0 ); } - void reset(); - U32 read( U8 *buffer, U32 length ); + const SFXFormat& getFormat() const override { return mFormat; } + U32 getSampleCount() const override { return mNumSamplesTotal; } + U32 getDataLength() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); } + U32 getDuration() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); } + bool isEOS() const override { return ( mNumSamplesLeft != 0 ); } + void reset() override; + U32 read( U8 *buffer, U32 length ) override; }; #endif // !_SFXMEMORYSTREAM_H_ diff --git a/Engine/source/sfx/sfxModifier.h b/Engine/source/sfx/sfxModifier.h index 39f2a7316..07fce959d 100644 --- a/Engine/source/sfx/sfxModifier.h +++ b/Engine/source/sfx/sfxModifier.h @@ -73,7 +73,7 @@ class SFXOneShotModifier : public SFXModifier SFXOneShotModifier( SFXSource* source, F32 triggerPos, bool removeWhenDone = false ); // IPolled. - virtual bool update(); + bool update() override; }; /// An SFXModifier that is spans a certain range of playback time. @@ -117,7 +117,7 @@ class SFXRangeModifier : public SFXModifier bool isActive() const { return mIsActive; } // IPolled. - virtual bool update(); + bool update() override; }; /// A volume fade effect (fade-in or fade-out). @@ -149,9 +149,9 @@ class SFXFadeModifier : public SFXRangeModifier EOnEnd mOnEnd; // SFXModifier. - virtual void _onStart(); - virtual void _onUpdate(); - virtual void _onEnd(); + void _onStart() override; + void _onUpdate() override; + void _onEnd() override; public: @@ -181,7 +181,7 @@ class SFXMarkerModifier : public SFXOneShotModifier String mMarkerName; // SFXOneShotModifier - virtual void _onTrigger(); + void _onTrigger() override; public: diff --git a/Engine/source/sfx/sfxParameter.h b/Engine/source/sfx/sfxParameter.h index 32be7d01c..80f311c7c 100644 --- a/Engine/source/sfx/sfxParameter.h +++ b/Engine/source/sfx/sfxParameter.h @@ -157,8 +157,8 @@ class SFXParameter : public SimObject EventSignal& getEventSignal() { return mEventSignal; } // SimObject. - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; static void initPersistFields(); diff --git a/Engine/source/sfx/sfxPlayList.h b/Engine/source/sfx/sfxPlayList.h index 8fa0df89c..fde096659 100644 --- a/Engine/source/sfx/sfxPlayList.h +++ b/Engine/source/sfx/sfxPlayList.h @@ -338,12 +338,12 @@ class SFXPlayList : public SFXTrack virtual bool isLooping() const; // SimDataBlock. - bool onAdd(); - void onRemove(); - virtual bool preload( bool server, String& errorStr ); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - virtual void inspectPostApply(); + bool onAdd() override; + void onRemove() override; + bool preload( bool server, String& errorStr ) override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; + void inspectPostApply() override; static void initPersistFields(); }; diff --git a/Engine/source/sfx/sfxProfile.h b/Engine/source/sfx/sfxProfile.h index e26079c8e..3a08f155e 100644 --- a/Engine/source/sfx/sfxProfile.h +++ b/Engine/source/sfx/sfxProfile.h @@ -148,10 +148,10 @@ class SFXProfile : public SFXTrack virtual bool isLooping() const; // SimObject - bool onAdd(); - void onRemove(); - void packData( BitStream* stream ); - void unpackData( BitStream* stream ); + bool onAdd() override; + void onRemove() override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; /// Returns the sound filename. const String getSoundFileName() const { return mFilename; } @@ -162,7 +162,7 @@ class SFXProfile : public SFXTrack /// @note This has nothing to do with mPreload. /// @see SimDataBlock::preload - bool preload( bool server, String &errorStr ); + bool preload( bool server, String &errorStr ) override; /// Returns the sound resource loading it from /// disk if it hasn't been preloaded. @@ -187,8 +187,8 @@ class SFXProfile : public SFXTrack public: /*C*/ SFXProfile(const SFXProfile&, bool = false); SFXProfile* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); - virtual void onPerformSubstitutions(); - virtual bool allowSubstitutions() const { return true; } + void onPerformSubstitutions() override; + bool allowSubstitutions() const override { return true; } }; diff --git a/Engine/source/sfx/sfxSound.h b/Engine/source/sfx/sfxSound.h index 7494e3846..c3c5dd8c5 100644 --- a/Engine/source/sfx/sfxSound.h +++ b/Engine/source/sfx/sfxSound.h @@ -104,16 +104,16 @@ class SFXSound : public SFXSource, } // SFXSource. - virtual void _play(); - virtual void _pause(); - virtual void _stop(); - virtual void _updateStatus(); - virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ); - virtual void _updateVolume( const MatrixF& listener ); - virtual void _updatePitch(); - virtual void _updatePriority(); - virtual void _setMinMaxDistance( F32 min, F32 max ); - virtual void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ); + void _play() override; + void _pause() override; + void _stop() override; + void _updateStatus() override; + void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override; + void _updateVolume( const MatrixF& listener ) override; + void _updatePitch() override; + void _updatePriority() override; + void _setMinMaxDistance( F32 min, F32 max ) override; + void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override; public: @@ -131,10 +131,10 @@ class SFXSound : public SFXSource, /// Return the current playback position in milliseconds. /// @note For looping sources, this returns the position in the current cycle. - U32 getPosition() const; + U32 getPosition() const override; /// Set the current playback position in milliseconds. - void setPosition( U32 ms ); + void setPosition( U32 ms ) override; /// Returns the source's total playback time in milliseconds. U32 getDuration() const { return mDuration; } @@ -155,15 +155,15 @@ class SFXSound : public SFXSource, static S32 QSORT_CALLBACK qsortCompare( const void* item1, const void* item2 ); // SFXSource. - virtual void setTransform( const MatrixF& transform ); - virtual void setVelocity( const VectorF& velocity ); - virtual bool isVirtualized() const; - virtual F32 getElapsedPlayTimeCurrentCycle() const; - virtual F32 getTotalPlayTime() const; + void setTransform( const MatrixF& transform ) override; + void setVelocity( const VectorF& velocity ) override; + bool isVirtualized() const override; + F32 getElapsedPlayTimeCurrentCycle() const override; + F32 getTotalPlayTime() const override; // SimObject. - virtual void onRemove(); - virtual void onDeleteNotify( SimObject* object ); + void onRemove() override; + void onDeleteNotify( SimObject* object ) override; }; #endif // !_SFXSOUND_H_ diff --git a/Engine/source/sfx/sfxSource.h b/Engine/source/sfx/sfxSource.h index 8d6bb129f..6115cc091 100644 --- a/Engine/source/sfx/sfxSource.h +++ b/Engine/source/sfx/sfxSource.h @@ -382,7 +382,7 @@ class SFXSource : public SimGroup /// We overload this to disable creation of /// a source via script 'new'. - virtual bool processArguments( S32 argc, ConsoleValue *argv ); + bool processArguments( S32 argc, ConsoleValue *argv ) override; // Console getters/setters. static bool _setDescription( void *obj, const char *index, const char *data ); @@ -643,11 +643,11 @@ class SFXSource : public SimGroup /// @} // SimGroup. - virtual bool onAdd(); - virtual void onRemove(); - virtual void onDeleteNotify( SimObject* object ); + bool onAdd() override; + void onRemove() override; + void onDeleteNotify( SimObject* object ) override; virtual bool acceptsAsChild( SimObject* object ); - virtual void onGroupAdd(); + void onGroupAdd() override; static void initPersistFields(); diff --git a/Engine/source/sfx/sfxState.h b/Engine/source/sfx/sfxState.h index 320586e51..85f9b7b86 100644 --- a/Engine/source/sfx/sfxState.h +++ b/Engine/source/sfx/sfxState.h @@ -105,10 +105,10 @@ class SFXState : public SimDataBlock void disable(); // SimDataBlock. - virtual bool onAdd(); - virtual bool preload( bool server, String& errorStr ); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); + bool onAdd() override; + bool preload( bool server, String& errorStr ) override; + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; static void initPersistFields(); diff --git a/Engine/source/sfx/sfxStream.h b/Engine/source/sfx/sfxStream.h index 6d52db3d6..7f965e678 100644 --- a/Engine/source/sfx/sfxStream.h +++ b/Engine/source/sfx/sfxStream.h @@ -73,12 +73,12 @@ class SFXStream : public ThreadSafeRefCount< SFXStream >, virtual bool isEOS() const = 0; /// Resets the stream to restart reading data from the begining. - virtual void reset() = 0; + void reset() override = 0; /// Reads data from the stream and decompresses it into PCM samples. /// /// @param length Number of bytes to read. - virtual U32 read( U8 *buffer, U32 length ) = 0; + U32 read( U8 *buffer, U32 length ) override = 0; }; typedef ThreadSafeRef< SFXStream > SFXStreamRef; diff --git a/Engine/source/sfx/sfxTrack.h b/Engine/source/sfx/sfxTrack.h index 7ee966d43..d05c33b93 100644 --- a/Engine/source/sfx/sfxTrack.h +++ b/Engine/source/sfx/sfxTrack.h @@ -61,7 +61,7 @@ class SFXTrack : public SimDataBlock StringTableEntry mParameters[ MaxNumParameters ]; /// Overload this to disable direct instantiation of this class via script 'new'. - virtual bool processArguments( S32 argc, ConsoleValue *argv ); + bool processArguments( S32 argc, ConsoleValue *argv ) override; public: @@ -86,11 +86,11 @@ class SFXTrack : public SimDataBlock void setParameter( U32 index, const char* name ); // SimDataBlock. - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - virtual bool preload( bool server, String& errorStr ); - virtual bool onAdd(); - virtual void inspectPostApply(); + void packData( BitStream* stream ) override; + void unpackData( BitStream* stream ) override; + bool preload( bool server, String& errorStr ) override; + bool onAdd() override; + void inspectPostApply() override; static void initPersistFields(); diff --git a/Engine/source/sfx/sfxVoice.h b/Engine/source/sfx/sfxVoice.h index f199a633f..74e40293e 100644 --- a/Engine/source/sfx/sfxVoice.h +++ b/Engine/source/sfx/sfxVoice.h @@ -156,14 +156,14 @@ class SFXVoice : public StrongRefBase, /// /// @note For looping sounds, this will return the position in the /// current cycle and not the total number of samples played so far. - virtual U32 getPosition() const; + U32 getPosition() const override; /// Sets the playback position to the given sample count. /// /// @param sample Offset in number of samples. This is allowed to use an offset /// accumulated from multiple cycles. Each cycle will wrap around back to the /// beginning of the buffer. - virtual void setPosition( U32 sample ); + void setPosition( U32 sample ) override; /// @return the current playback status. /// @note For streaming voices, the reaction to for the voice to update its status diff --git a/Engine/source/sfx/sfxWorld.h b/Engine/source/sfx/sfxWorld.h index 20f742380..288644ace 100644 --- a/Engine/source/sfx/sfxWorld.h +++ b/Engine/source/sfx/sfxWorld.h @@ -229,8 +229,8 @@ class SFXWorld : public ScopeTracker< NUM_DIMENSIONS, Object > F32 _getSortValue( Object object ); // ScopeTracker. - virtual void _onScopeIn( Object object ); - virtual void _onScopeOut( Object object ); + void _onScopeIn( Object object ) override; + void _onScopeOut( Object object ) override; public: diff --git a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h index 046f065c9..d27269c64 100644 --- a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h @@ -50,19 +50,19 @@ public: //**************************************************************************** // Accu Texture //**************************************************************************** - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; void getAccuVec( MultiLine *meta, LangElement *accuVec ); Var* addOutAccuVec( Vector &componentList, MultiLine *meta ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ) + Resources getResources( const MaterialFeatureData &fd ) override { Resources res; res.numTex = 1; @@ -70,12 +70,12 @@ public: return res; } - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Accu Texture"; } @@ -84,7 +84,7 @@ public: class AccuScaleFeature : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuScale = (Var *)( LangElement::find("accuScale") ); @@ -98,13 +98,13 @@ public: } } - virtual String getName() { return "Accu Scale"; } + String getName() override { return "Accu Scale"; } }; class AccuDirectionFeature : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuDirection = (Var *)( LangElement::find("accuDirection") ); @@ -118,13 +118,13 @@ public: } } - virtual String getName() { return "Accu Direction"; } + String getName() override { return "Accu Direction"; } }; class AccuStrengthFeature : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuStrength = (Var *)( LangElement::find("accuStrength") ); @@ -138,13 +138,13 @@ public: } } - virtual String getName() { return "Accu Strength"; } + String getName() override { return "Accu Strength"; } }; class AccuCoverageFeature : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuCoverage = (Var *)( LangElement::find("accuCoverage") ); @@ -158,14 +158,14 @@ public: } } - virtual String getName() { return "Accu Coverage"; } + String getName() override { return "Accu Coverage"; } }; class AccuSpecularFeature : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuSpecular = (Var *)( LangElement::find("accuSpecular") ); @@ -179,7 +179,7 @@ public: } } - virtual String getName() { return "Accu Specular"; } + String getName() override { return "Accu Specular"; } }; #endif \ No newline at end of file diff --git a/Engine/source/shaderGen/GLSL/bumpGLSL.h b/Engine/source/shaderGen/GLSL/bumpGLSL.h index b37bb9099..2dc934eed 100644 --- a/Engine/source/shaderGen/GLSL/bumpGLSL.h +++ b/Engine/source/shaderGen/GLSL/bumpGLSL.h @@ -43,17 +43,17 @@ class BumpFeatGLSL : public ShaderFeatureGLSL public: // ShaderFeatureGLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual void setTexData( Material::StageData &stageDat, + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } + Resources getResources( const MaterialFeatureData &fd ) override; + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); - virtual String getName() { return "Bumpmap"; } + U32 &texIndex ) override; + String getName() override { return "Bumpmap"; } }; @@ -75,16 +75,16 @@ public: ParallaxFeatGLSL(); // ShaderFeatureGLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual void setTexData( Material::StageData &stageDat, + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); - virtual String getName() { return "Parallax"; } + U32 &texIndex ) override; + String getName() override { return "Parallax"; } }; @@ -95,12 +95,12 @@ class NormalsOutFeatGLSL : public ShaderFeatureGLSL public: // ShaderFeatureGLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } - virtual String getName() { return "NormalsOut"; } + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } + String getName() override { return "NormalsOut"; } }; #endif // _BUMP_GLSL_H_ \ No newline at end of file diff --git a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h index b8358a835..df304ef10 100644 --- a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h @@ -94,15 +94,15 @@ public: //**************************************************************************** // Accu Texture //**************************************************************************** - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual Resources getResources(const MaterialFeatureData& fd) + Resources getResources(const MaterialFeatureData& fd) override { Resources res; res.numTex = 1; @@ -110,12 +110,12 @@ public: return res; } - virtual void setTexData(Material::StageData& stageDat, + void setTexData(Material::StageData& stageDat, const MaterialFeatureData& fd, RenderPassData& passData, - U32& texIndex); + U32& texIndex) override; - virtual String getName() + String getName() override { return mOwner->getName(); } diff --git a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h index 7994f115a..cf7039f29 100644 --- a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h @@ -34,8 +34,8 @@ public: DebugVizGLSL(); - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual String getName() { return "Debug Viz"; } + String getName() override { return "Debug Viz"; } }; diff --git a/Engine/source/shaderGen/GLSL/depthGLSL.h b/Engine/source/shaderGen/GLSL/depthGLSL.h index c92326415..3c7d6fdb0 100644 --- a/Engine/source/shaderGen/GLSL/depthGLSL.h +++ b/Engine/source/shaderGen/GLSL/depthGLSL.h @@ -35,12 +35,12 @@ class EyeSpaceDepthOutGLSL : public ShaderFeatureGLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Eye Space Depth (Out)"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } - virtual const char* getOutputVarName() const { return "eyeSpaceDepth"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Eye Space Depth (Out)"; } + Material::BlendOp getBlendOp() override { return Material::None; } + const char* getOutputVarName() const override { return "eyeSpaceDepth"; } }; @@ -49,12 +49,12 @@ class DepthOutGLSL : public ShaderFeatureGLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Depth (Out)"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } - virtual const char* getOutputVarName() const { return "IN_depth"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Depth (Out)"; } + Material::BlendOp getBlendOp() override { return Material::None; } + const char* getOutputVarName() const override { return "IN_depth"; } }; #endif // _DEPTH_GLSL_H_ \ No newline at end of file diff --git a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h index 811b19324..1a0feaf1f 100644 --- a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h +++ b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h @@ -37,11 +37,11 @@ class ParaboloidVertTransformGLSL : public ShaderFeatureGLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Paraboloid Vert Transform"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Paraboloid Vert Transform"; } + Material::BlendOp getBlendOp() override { return Material::None; } }; diff --git a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h index 1ba5d66db..46d2e2496 100644 --- a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h @@ -33,46 +33,46 @@ class VertPixelConnectorGLSL : public ShaderConnector public: // ShaderConnector - virtual Var* getElement( RegisterType type, + Var* getElement( RegisterType type, U32 numElements = 1, - U32 numRegisters = -1 ); - virtual void setName( const char *newName ); - virtual void reset(); - virtual void sortVars(); + U32 numRegisters = -1 ) override; + void setName( const char *newName ) override; + void reset() override; + void sortVars() override; virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux - virtual void print( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; void printStructDefines( Stream &stream, bool in ); - virtual void printOnMain( Stream &stream, bool isVerterShader ); + void printOnMain( Stream &stream, bool isVerterShader ) override; }; class AppVertConnectorGLSL : public ShaderConnector { public: - virtual Var* getElement( RegisterType type, + Var* getElement( RegisterType type, U32 numElements = 1, - U32 numRegisters = -1 ); - virtual void setName( const char *newName ); - virtual void reset(); - virtual void sortVars(); + U32 numRegisters = -1 ) override; + void setName( const char *newName ) override; + void reset() override; + void sortVars() override; virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux - virtual void print( Stream &stream, bool isVerterShader ); - virtual void printOnMain( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; + void printOnMain( Stream &stream, bool isVerterShader ) override; }; class VertexParamsDefGLSL : public ParamsDef { public: - virtual void print( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; }; class PixelParamsDefGLSL : public ParamsDef { public: - virtual void print( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; }; #endif // _SHADERCOMP_GLSL_H_ diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h index d4dbb1886..5db741ded 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h @@ -140,10 +140,10 @@ public: Var* getInWorldNormal(Vector& componentList); // ShaderFeature - Var* getVertTexCoord( const String &name ); - LangElement* setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ); - LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ); - LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ); + Var* getVertTexCoord( const String &name ) override; + LangElement* setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ) override; + LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override; + LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override; }; @@ -157,7 +157,7 @@ public: : mName( name ) {} - virtual String getName() { return mName; } + String getName() override { return mName; } }; class RenderTargetZeroGLSL : public ShaderFeatureGLSL @@ -175,12 +175,12 @@ public: mFeatureName = buffer; } - virtual String getName() { return mFeatureName; } + String getName() override { return mFeatureName; } - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const { return mOutputTargetMask; } + U32 getOutputTargets( const MaterialFeatureData &fd ) const override { return mOutputTargetMask; } }; @@ -188,20 +188,20 @@ public: class VertPositionGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Vert Position"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; }; @@ -218,17 +218,17 @@ public: RTLightingFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "RT Lighting"; } @@ -244,25 +244,25 @@ protected: ShaderIncludeDependency mTorqueDep; public: DiffuseMapFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; + U32 getOutputTargets(const MaterialFeatureData &fd) const override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Base Texture"; } @@ -273,23 +273,23 @@ public: class OverlayTexFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Overlay Texture"; } @@ -300,14 +300,14 @@ public: class DiffuseFeatureGLSL : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; + U32 getOutputTargets(const MaterialFeatureData &fd) const override; - virtual String getName() + String getName() override { return "Diffuse Color"; } @@ -318,14 +318,14 @@ class DiffuseVertColorFeatureGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector< ShaderComponent* >& componentList, - const MaterialFeatureData& fd ); - virtual void processPix( Vector< ShaderComponent* >&componentList, - const MaterialFeatureData& fd ); + void processVert( Vector< ShaderComponent* >& componentList, + const MaterialFeatureData& fd ) override; + void processPix( Vector< ShaderComponent* >&componentList, + const MaterialFeatureData& fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual String getName() + String getName() override { return "Diffuse Vertex Color"; } @@ -335,28 +335,28 @@ public: class LightmapFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Lightmap"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -364,28 +364,28 @@ public: class TonemapFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Tonemap"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -393,20 +393,20 @@ public: class VertLitGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual String getName() + String getName() override { return "Vert Lit"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -414,23 +414,23 @@ public: class DetailFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::Mul; } + Material::BlendOp getBlendOp() override{ return Material::Mul; } // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Detail"; } @@ -441,21 +441,21 @@ public: class ReflectCubeFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Reflect Cube"; } @@ -472,17 +472,17 @@ protected: public: FogFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual String getName() + String getName() override { return "Fog"; } @@ -493,9 +493,9 @@ public: class TexAnimGLSL : public ShaderFeatureGLSL { public: - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Texture Animation"; } @@ -513,17 +513,17 @@ public: VisibilityFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Visibility"; } @@ -534,12 +534,12 @@ public: class AlphaTestGLSL : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Alpha Test"; } @@ -552,12 +552,12 @@ public: class GlowMaskGLSL : public ShaderFeatureGLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Glow Mask"; } @@ -578,12 +578,12 @@ public: HDROutGLSL(); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() { return "HDR Output"; } + String getName() override { return "HDR Output"; } }; /// @@ -597,35 +597,35 @@ public: FoliageFeatureGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Foliage Feature"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; - virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ); + ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override; }; class ParticleNormalFeatureGLSL : public ShaderFeatureGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Particle Normal Generation Feature"; } @@ -645,20 +645,20 @@ public: ImposterVertFeatureGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() { return "Imposter Vert"; } + String getName() override { return "Imposter Vert"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; }; /// Hardware Skinning @@ -668,10 +668,10 @@ protected: public: - virtual void processVert(Vector &componentList, - const MaterialFeatureData &fd); + void processVert(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual String getName() { return "Hardware Skinning"; } + String getName() override { return "Hardware Skinning"; } }; /// Reflection Probes @@ -683,21 +683,21 @@ protected: public: ReflectionProbeFeatGLSL(); - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual Resources getResources(const MaterialFeatureData& fd); + Resources getResources(const MaterialFeatureData& fd) override; // Sets textures and texture flags for current pass - virtual void setTexData(Material::StageData& stageDat, + void setTexData(Material::StageData& stageDat, const MaterialFeatureData& fd, RenderPassData& passData, - U32& texIndex); + U32& texIndex) override; - virtual String getName() + String getName() override { return "Reflection Probes"; } diff --git a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h index 77305b8e7..51c84aa50 100644 --- a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h @@ -36,12 +36,12 @@ public: ShaderGenPrinterGLSL() { for (int i = 0; i < 3; i++) extraRTs[i] = false; } // ShaderGenPrinter - virtual void printShaderHeader(Stream& stream); - virtual void printMainComment(Stream& stream); - virtual void printVertexShaderCloser(Stream& stream); - virtual void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData); - virtual void printPixelShaderCloser(Stream& stream); - virtual void printLine(Stream& stream, const String& line); + void printShaderHeader(Stream& stream) override; + void printMainComment(Stream& stream) override; + void printVertexShaderCloser(Stream& stream) override; + void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData) override; + void printPixelShaderCloser(Stream& stream) override; + void printLine(Stream& stream, const String& line) override; }; class ShaderGenComponentFactoryGLSL : public ShaderGenComponentFactory @@ -53,10 +53,10 @@ public: static const char* typeToString( GFXDeclType type ); // ShaderGenComponentFactory - virtual ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ); - virtual ShaderComponent* createVertexPixelConnector(); - virtual ShaderComponent* createVertexParamsDef(); - virtual ShaderComponent* createPixelParamsDef(); + ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ) override; + ShaderComponent* createVertexPixelConnector() override; + ShaderComponent* createVertexParamsDef() override; + ShaderComponent* createPixelParamsDef() override; }; #endif \ No newline at end of file diff --git a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h index 76ca93ae6..5f4682178 100644 --- a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h @@ -50,19 +50,19 @@ public: //**************************************************************************** // Accu Texture //**************************************************************************** - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; void getAccuVec( MultiLine *meta, LangElement *accuVec ); Var* addOutAccuVec( Vector &componentList, MultiLine *meta ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ) + Resources getResources( const MaterialFeatureData &fd ) override { Resources res; res.numTex = 1; @@ -70,12 +70,12 @@ public: return res; } - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Accu Texture"; } @@ -84,7 +84,7 @@ public: class AccuScaleFeature : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuScale = (Var *)( LangElement::find("accuScale") ); @@ -98,13 +98,13 @@ public: } } - virtual String getName() { return "Accu Scale"; } + String getName() override { return "Accu Scale"; } }; class AccuDirectionFeature : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuDirection = (Var *)( LangElement::find("accuDirection") ); @@ -118,13 +118,13 @@ public: } } - virtual String getName() { return "Accu Direction"; } + String getName() override { return "Accu Direction"; } }; class AccuStrengthFeature : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuStrength = (Var *)( LangElement::find("accuStrength") ); @@ -138,13 +138,13 @@ public: } } - virtual String getName() { return "Accu Strength"; } + String getName() override { return "Accu Strength"; } }; class AccuCoverageFeature : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuCoverage = (Var *)( LangElement::find("accuCoverage") ); @@ -158,14 +158,14 @@ public: } } - virtual String getName() { return "Accu Coverage"; } + String getName() override { return "Accu Coverage"; } }; class AccuSpecularFeature : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ) + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override { // Find the constant value Var *accuSpecular = (Var *)( LangElement::find("accuSpecular") ); @@ -179,7 +179,7 @@ public: } } - virtual String getName() { return "Accu Specular"; } + String getName() override { return "Accu Specular"; } }; #endif \ No newline at end of file diff --git a/Engine/source/shaderGen/HLSL/bumpHLSL.h b/Engine/source/shaderGen/HLSL/bumpHLSL.h index 79e5af370..23be5778c 100644 --- a/Engine/source/shaderGen/HLSL/bumpHLSL.h +++ b/Engine/source/shaderGen/HLSL/bumpHLSL.h @@ -43,17 +43,17 @@ class BumpFeatHLSL : public ShaderFeatureHLSL public: // ShaderFeatureHLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual void setTexData( Material::StageData &stageDat, + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } + Resources getResources( const MaterialFeatureData &fd ) override; + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); - virtual String getName() { return "Bumpmap"; } + U32 &texIndex ) override; + String getName() override { return "Bumpmap"; } }; @@ -75,16 +75,16 @@ public: ParallaxFeatHLSL(); // ShaderFeatureHLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual void setTexData( Material::StageData &stageDat, + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); - virtual String getName() { return "Parallax"; } + U32 &texIndex ) override; + String getName() override { return "Parallax"; } }; @@ -95,12 +95,12 @@ class NormalsOutFeatHLSL : public ShaderFeatureHLSL public: // ShaderFeatureHLSL - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } - virtual String getName() { return "NormalsOut"; } + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } + String getName() override { return "NormalsOut"; } }; #endif // _BUMP_HLSL_H_ \ No newline at end of file diff --git a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h index be89aeb50..f1d92a724 100644 --- a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h @@ -94,15 +94,15 @@ public: //**************************************************************************** // Accu Texture //**************************************************************************** - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual Resources getResources(const MaterialFeatureData& fd) + Resources getResources(const MaterialFeatureData& fd) override { Resources res; res.numTex = 1; @@ -110,12 +110,12 @@ public: return res; } - virtual void setTexData(Material::StageData& stageDat, + void setTexData(Material::StageData& stageDat, const MaterialFeatureData& fd, RenderPassData& passData, - U32& texIndex); + U32& texIndex) override; - virtual String getName() + String getName() override { return mOwner->getName(); } diff --git a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h index 69d5b0940..53c0151e9 100644 --- a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h @@ -34,8 +34,8 @@ public: DebugVizHLSL(); - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual String getName() { return "Debug Viz"; } + String getName() override { return "Debug Viz"; } }; diff --git a/Engine/source/shaderGen/HLSL/depthHLSL.h b/Engine/source/shaderGen/HLSL/depthHLSL.h index c174ee1c8..e0607f2bb 100644 --- a/Engine/source/shaderGen/HLSL/depthHLSL.h +++ b/Engine/source/shaderGen/HLSL/depthHLSL.h @@ -35,12 +35,12 @@ class EyeSpaceDepthOutHLSL : public ShaderFeatureHLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Eye Space Depth (Out)"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } - virtual const char* getOutputVarName() const { return "eyeSpaceDepth"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Eye Space Depth (Out)"; } + Material::BlendOp getBlendOp() override { return Material::None; } + const char* getOutputVarName() const override { return "eyeSpaceDepth"; } }; @@ -49,12 +49,12 @@ class DepthOutHLSL : public ShaderFeatureHLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Depth (Out)"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } - virtual const char* getOutputVarName() const { return "IN.depth"; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Depth (Out)"; } + Material::BlendOp getBlendOp() override { return Material::None; } + const char* getOutputVarName() const override { return "IN.depth"; } }; #endif // _DEPTH_HLSL_H_ \ No newline at end of file diff --git a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h index 43ee84239..63e379b3c 100644 --- a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h +++ b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h @@ -37,11 +37,11 @@ class ParaboloidVertTransformHLSL : public ShaderFeatureHLSL public: // ShaderFeature - virtual void processVert( Vector &componentList, const MaterialFeatureData &fd ); - virtual void processPix( Vector &componentList, const MaterialFeatureData &fd ); - virtual Resources getResources( const MaterialFeatureData &fd ); - virtual String getName() { return "Paraboloid Vert Transform"; } - virtual Material::BlendOp getBlendOp() { return Material::None; } + void processVert( Vector &componentList, const MaterialFeatureData &fd ) override; + void processPix( Vector &componentList, const MaterialFeatureData &fd ) override; + Resources getResources( const MaterialFeatureData &fd ) override; + String getName() override { return "Paraboloid Vert Transform"; } + Material::BlendOp getBlendOp() override { return Material::None; } }; diff --git a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h index a89c54ea1..e11e234c7 100644 --- a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h @@ -35,40 +35,40 @@ private: public: // ShaderConnector - virtual Var* getElement( RegisterType type, + Var* getElement( RegisterType type, U32 numElements = 1, - U32 numRegisters = -1 ); + U32 numRegisters = -1 ) override; virtual Var* getIndexedElement( U32 index, RegisterType type, U32 numElements = 1, U32 numRegisters = -1 ); - virtual void setName( const char *newName ); - virtual void reset(); - virtual void sortVars(); + void setName( const char *newName ) override; + void reset() override; + void sortVars() override; - virtual void print( Stream &stream, bool isVertexShader ); + void print( Stream &stream, bool isVertexShader ) override; }; class ParamsDefHLSL : public ParamsDef { protected: - virtual void assignConstantNumbers(); + void assignConstantNumbers() override; }; class VertexParamsDefHLSL : public ParamsDefHLSL { public: - virtual void print( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; }; class PixelParamsDefHLSL : public ParamsDefHLSL { public: - virtual void print( Stream &stream, bool isVerterShader ); + void print( Stream &stream, bool isVerterShader ) override; }; #endif // _SHADERCOMP_HLSL_H_ diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h index e01b97853..49c32e66e 100644 --- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h @@ -141,10 +141,10 @@ public: Var* getInWorldNormal(Vector& componentList); // ShaderFeature - Var* getVertTexCoord( const String &name ); - LangElement* setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ); - LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ); - LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ); + Var* getVertTexCoord( const String &name ) override; + LangElement* setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ) override; + LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override; + LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override; }; @@ -158,7 +158,7 @@ public: : mName( name ) {} - virtual String getName() { return mName; } + String getName() override { return mName; } }; class RenderTargetZeroHLSL : public ShaderFeatureHLSL @@ -176,12 +176,12 @@ public: mFeatureName = buffer; } - virtual String getName() { return mFeatureName; } + String getName() override { return mFeatureName; } - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const { return mOutputTargetMask; } + U32 getOutputTargets( const MaterialFeatureData &fd ) const override { return mOutputTargetMask; } }; @@ -189,23 +189,23 @@ public: class VertPositionHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd); + void processPix( Vector &componentList, + const MaterialFeatureData &fd) override; - virtual String getName() + String getName() override { return "Vert Position"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; }; @@ -222,17 +222,17 @@ public: RTLightingFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "RT Lighting"; } @@ -248,25 +248,25 @@ protected: public: DiffuseMapFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; + U32 getOutputTargets(const MaterialFeatureData &fd) const override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Base Texture"; } @@ -277,23 +277,23 @@ public: class OverlayTexFeatHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Overlay Texture"; } @@ -304,13 +304,13 @@ public: class DiffuseFeatureHLSL : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; - virtual String getName() + U32 getOutputTargets(const MaterialFeatureData &fd) const override; + String getName() override { return "Diffuse Color"; } @@ -321,14 +321,14 @@ class DiffuseVertColorFeatureHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector< ShaderComponent* >& componentList, - const MaterialFeatureData& fd ); - virtual void processPix( Vector< ShaderComponent* >&componentList, - const MaterialFeatureData& fd ); + void processVert( Vector< ShaderComponent* >& componentList, + const MaterialFeatureData& fd ) override; + void processPix( Vector< ShaderComponent* >&componentList, + const MaterialFeatureData& fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual String getName() + String getName() override { return "Diffuse Vertex Color"; } @@ -338,28 +338,28 @@ public: class LightmapFeatHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Lightmap"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -367,28 +367,28 @@ public: class TonemapFeatHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; } - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Tonemap"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -396,20 +396,20 @@ public: class VertLitHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::None; } + Material::BlendOp getBlendOp() override{ return Material::None; } - virtual String getName() + String getName() override { return "Vert Lit"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -417,23 +417,23 @@ public: class DetailFeatHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp(){ return Material::Mul; } + Material::BlendOp getBlendOp() override{ return Material::Mul; } // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Detail"; } @@ -444,21 +444,21 @@ public: class ReflectCubeFeatHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; // Sets textures and texture flags for current pass - virtual void setTexData( Material::StageData &stageDat, + void setTexData( Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex ); + U32 &texIndex ) override; - virtual String getName() + String getName() override { return "Reflect Cube"; } @@ -475,17 +475,17 @@ protected: public: FogFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; } + Material::BlendOp getBlendOp() override { return Material::LerpAlpha; } - virtual String getName() + String getName() override { return "Fog"; } @@ -496,9 +496,9 @@ public: class TexAnimHLSL : public ShaderFeatureHLSL { public: - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Texture Animation"; } @@ -516,17 +516,17 @@ public: VisibilityFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Visibility"; } @@ -537,12 +537,12 @@ public: class AlphaTestHLSL : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Alpha Test"; } @@ -555,12 +555,12 @@ public: class GlowMaskHLSL : public ShaderFeatureHLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() + String getName() override { return "Glow Mask"; } @@ -581,12 +581,12 @@ public: HDROutHLSL(); - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Material::BlendOp getBlendOp() { return Material::None; } + Material::BlendOp getBlendOp() override { return Material::None; } - virtual String getName() { return "HDR Output"; } + String getName() override { return "HDR Output"; } }; /// @@ -600,35 +600,35 @@ public: FoliageFeatureHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Foliage Feature"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; - virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ); + ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override; }; class ParticleNormalFeatureHLSL : public ShaderFeatureHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() + String getName() override { return "Particle Normal Generation Feature"; } @@ -648,20 +648,20 @@ public: ImposterVertFeatureHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() { return "Imposter Vert"; } + String getName() override { return "Imposter Vert"; } - virtual void determineFeature( Material *material, + void determineFeature( Material *material, const GFXVertexFormat *vertexFormat, U32 stageNum, const FeatureType &type, const FeatureSet &features, - MaterialFeatureData *outFeatureData ); + MaterialFeatureData *outFeatureData ) override; }; /// Hardware Skinning @@ -671,10 +671,10 @@ protected: public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual String getName() { return "Hardware Skinning"; } + String getName() override { return "Hardware Skinning"; } }; /// Reflection Probes @@ -686,21 +686,21 @@ protected: public: ReflectionProbeFeatHLSL(); - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual Resources getResources(const MaterialFeatureData &fd); + Resources getResources(const MaterialFeatureData &fd) override; // Sets textures and texture flags for current pass - virtual void setTexData(Material::StageData &stageDat, + void setTexData(Material::StageData &stageDat, const MaterialFeatureData &fd, RenderPassData &passData, - U32 &texIndex); + U32 &texIndex) override; - virtual String getName() + String getName() override { return "Reflection Probes"; } diff --git a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h index c14354f39..74be5684a 100644 --- a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h @@ -33,12 +33,12 @@ class ShaderGenPrinterHLSL : public ShaderGenPrinter public: // ShaderGenPrinter - virtual void printShaderHeader(Stream& stream); - virtual void printMainComment(Stream& stream); - virtual void printVertexShaderCloser(Stream& stream); - virtual void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData); - virtual void printPixelShaderCloser(Stream& stream); - virtual void printLine(Stream& stream, const String& line); + void printShaderHeader(Stream& stream) override; + void printMainComment(Stream& stream) override; + void printVertexShaderCloser(Stream& stream) override; + void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData) override; + void printPixelShaderCloser(Stream& stream) override; + void printLine(Stream& stream, const String& line) override; }; class ShaderGenComponentFactoryHLSL : public ShaderGenComponentFactory @@ -50,10 +50,10 @@ public: static const char* typeToString( GFXDeclType type ); // ShaderGenComponentFactory - virtual ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ); - virtual ShaderComponent* createVertexPixelConnector(); - virtual ShaderComponent* createVertexParamsDef(); - virtual ShaderComponent* createPixelParamsDef(); + ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ) override; + ShaderComponent* createVertexPixelConnector() override; + ShaderComponent* createVertexParamsDef() override; + ShaderComponent* createPixelParamsDef() override; }; diff --git a/Engine/source/shaderGen/conditionerFeature.h b/Engine/source/shaderGen/conditionerFeature.h index bacdd300b..b834418d7 100644 --- a/Engine/source/shaderGen/conditionerFeature.h +++ b/Engine/source/shaderGen/conditionerFeature.h @@ -51,7 +51,7 @@ public: ConditionerFeature( const GFXFormat bufferFormat ); virtual ~ConditionerFeature(); - virtual Material::BlendOp getBlendOp() + Material::BlendOp getBlendOp() override { return Material::None; } @@ -60,10 +60,10 @@ public: virtual bool setBufferFormat(const GFXFormat bufferFormat) { bool ret = mBufferFormat == bufferFormat; mBufferFormat = bufferFormat; return ret; } // zero-out these methods - virtual Var* getVertTexCoord( const String &name ) { AssertFatal( false, "don't use this." ); return NULL; } - virtual LangElement *setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ) { AssertFatal( false, "don't use this." ); return NULL; } - virtual LangElement *expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) { AssertFatal( false, "don't use this." ); return NULL; } - virtual LangElement *assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) { AssertFatal( false, "don't use this." ); return NULL; } + Var* getVertTexCoord( const String &name ) override { AssertFatal( false, "don't use this." ); return NULL; } + LangElement *setupTexSpaceMat( Vector &componentList, Var **texSpaceMat ) override { AssertFatal( false, "don't use this." ); return NULL; } + LangElement *expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override { AssertFatal( false, "don't use this." ); return NULL; } + LangElement *assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override { AssertFatal( false, "don't use this." ); return NULL; } // conditioned output virtual LangElement *assignOutput( Var *unconditionedOutput, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ); @@ -128,7 +128,7 @@ public: ConditionerMethodDependency( ConditionerFeature *conditioner, const ConditionerFeature::MethodType methodType ) : mConditioner(conditioner), mMethodType(methodType) {} - virtual void print( Stream &s ) const; + void print( Stream &s ) const override; // Auto insert information into a macro virtual void createMethodMacro( const String &methodName, Vector ¯os ); diff --git a/Engine/source/shaderGen/customShaderFeature.h b/Engine/source/shaderGen/customShaderFeature.h index fd76380c4..6a452779c 100644 --- a/Engine/source/shaderGen/customShaderFeature.h +++ b/Engine/source/shaderGen/customShaderFeature.h @@ -65,8 +65,8 @@ public: static void initPersistFields(); // Handle when we are added to the scene and removed from the scene - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; //shadergen setup void addVariable(String name, String type, String defaultValue); diff --git a/Engine/source/shaderGen/langElement.h b/Engine/source/shaderGen/langElement.h index 34af7c3f9..6608173e5 100644 --- a/Engine/source/shaderGen/langElement.h +++ b/Engine/source/shaderGen/langElement.h @@ -136,7 +136,7 @@ struct Var : public LangElement void setConnectName(const char *newName ); void setType(const char *newType ); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; // Construct a uniform / shader const var void setUniform(const String& constType, const String& constName, ConstantSortPosition sortPos); @@ -176,7 +176,7 @@ public: } void addStatement( LangElement *elem ); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; }; diff --git a/Engine/source/shaderGen/shaderComp.h b/Engine/source/shaderGen/shaderComp.h index 70fe4372e..e1c30c42a 100644 --- a/Engine/source/shaderGen/shaderComp.h +++ b/Engine/source/shaderGen/shaderComp.h @@ -91,7 +91,7 @@ public: virtual void reset() = 0; virtual void sortVars() = 0; - virtual void print( Stream &stream, bool isVerterShader ) = 0; + void print( Stream &stream, bool isVerterShader ) override = 0; }; /// This is to provide common functionalty needed by vertex and pixel main defs diff --git a/Engine/source/shaderGen/shaderDependency.h b/Engine/source/shaderGen/shaderDependency.h index 78960de37..63a6de48b 100644 --- a/Engine/source/shaderGen/shaderDependency.h +++ b/Engine/source/shaderGen/shaderDependency.h @@ -59,8 +59,8 @@ public: ShaderIncludeDependency( const Torque::Path &pathToInclude ); - virtual bool operator==( const ShaderDependency &cmpTo ) const; - virtual void print( Stream &s ) const; + bool operator==( const ShaderDependency &cmpTo ) const override; + void print( Stream &s ) const override; }; #endif // _SHADER_DEPENDENCY_H_ \ No newline at end of file diff --git a/Engine/source/shaderGen/shaderOp.h b/Engine/source/shaderGen/shaderOp.h index 2f2cbc4bf..63faad2ad 100644 --- a/Engine/source/shaderGen/shaderOp.h +++ b/Engine/source/shaderGen/shaderOp.h @@ -89,7 +89,7 @@ class DecOp : public ShaderOp public: DecOp( Var *in1 ); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; }; @@ -107,7 +107,7 @@ class EchoOp : public ShaderOp public: EchoOp( const char * statement ); ~EchoOp(); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; }; //---------------------------------------------------------------------------- @@ -122,7 +122,7 @@ class IndexOp : public ShaderOp public: IndexOp( Var* var, U32 index ); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; }; @@ -159,7 +159,7 @@ class GenOp : public ShaderOp public: GenOp( const char * statement, ... ); - virtual void print( Stream &stream ); + void print( Stream &stream ) override; }; diff --git a/Engine/source/sim/actionMap.h b/Engine/source/sim/actionMap.h index 840dd70f9..3a8ff392e 100644 --- a/Engine/source/sim/actionMap.h +++ b/Engine/source/sim/actionMap.h @@ -55,7 +55,7 @@ class ActionMap : public SimObject friend class ContextAction; protected: - bool onAdd(); + bool onAdd() override; struct Node { U32 modifiers; @@ -214,8 +214,8 @@ public: bool mReturnHoldTime; ///< Do we return back our time held? ContextAction(StringTableEntry func, F32 minHoldTime, ActionMap::Node* button, bool holdOnly); - virtual void processTick(); - virtual void interpolateTick(F32 delta) {} - virtual void advanceTime(F32 timeDelta) {} + void processTick() override; + void interpolateTick(F32 delta) override {} + void advanceTime(F32 timeDelta) override {} }; #endif // _ACTIONMAP_H_ diff --git a/Engine/source/sim/connectionStringTable.cpp b/Engine/source/sim/connectionStringTable.cpp index 50ecd54a6..e7342ed17 100644 --- a/Engine/source/sim/connectionStringTable.cpp +++ b/Engine/source/sim/connectionStringTable.cpp @@ -38,29 +38,29 @@ public: mIndex = index; mString = string; } - virtual void pack(NetConnection* /*ps*/, BitStream *bstream) + void pack(NetConnection* /*ps*/, BitStream *bstream) override { bstream->writeInt(mIndex, ConnectionStringTable::EntryBitSize); bstream->writeString(mString.getString()); } - virtual void write(NetConnection* /*ps*/, BitStream *bstream) + void write(NetConnection* /*ps*/, BitStream *bstream) override { bstream->writeInt(mIndex, ConnectionStringTable::EntryBitSize); bstream->writeString(mString.getString()); } - virtual void unpack(NetConnection* /*con*/, BitStream *bstream) + void unpack(NetConnection* /*con*/, BitStream *bstream) override { char buf[256]; mIndex = bstream->readInt(ConnectionStringTable::EntryBitSize); bstream->readString(buf); mString = NetStringHandle(buf); } - virtual void notifyDelivered(NetConnection *ps, bool madeit) + void notifyDelivered(NetConnection *ps, bool madeit) override { if(madeit) ps->confirmStringReceived(mString, mIndex); } - virtual void process(NetConnection *connection) + void process(NetConnection *connection) override { #ifdef TORQUE_DEBUG_NET Con::printf("Mapping string: %s to index: %d", mString.getString(), mIndex); diff --git a/Engine/source/sim/netConnection.cpp b/Engine/source/sim/netConnection.cpp index ac3a2c325..0ce12bb68 100644 --- a/Engine/source/sim/netConnection.cpp +++ b/Engine/source/sim/netConnection.cpp @@ -69,25 +69,25 @@ public: typedef NetEvent Parent; ConnectionMessageEvent(U32 msg=0, U32 seq=0, U32 gc=0) { message = msg; sequence = seq; ghostCount = gc;} - void pack(NetConnection *, BitStream *bstream) + void pack(NetConnection *, BitStream *bstream) override { bstream->write(sequence); bstream->writeInt(message, 3); bstream->writeInt(ghostCount, NetConnection::GhostIdBitSize + 1); } - void write(NetConnection *, BitStream *bstream) + void write(NetConnection *, BitStream *bstream) override { bstream->write(sequence); bstream->writeInt(message, 3); bstream->writeInt(ghostCount, NetConnection::GhostIdBitSize + 1); } - void unpack(NetConnection *, BitStream *bstream) + void unpack(NetConnection *, BitStream *bstream) override { bstream->read(&sequence); message = bstream->readInt(3); ghostCount = bstream->readInt(NetConnection::GhostIdBitSize + 1); } - void process(NetConnection *ps) + void process(NetConnection *ps) override { ps->handleConnectionMessage(message, sequence, ghostCount); } @@ -790,7 +790,7 @@ public: stream.setBuffer(buffer, inStream->getPosition()); stream.setPosition(inStream->getPosition()); } - void process(SimObject *object) + void process(SimObject *object) override { ((NetConnection *) object)->sendPacket(&stream); } diff --git a/Engine/source/sim/netConnection.h b/Engine/source/sim/netConnection.h index d13eec8c6..e9a346f80 100644 --- a/Engine/source/sim/netConnection.h +++ b/Engine/source/sim/netConnection.h @@ -616,15 +616,15 @@ public: static void setLastError(const char *fmt,...); void checkMaxRate(); - void handlePacket(BitStream *stream); - void processRawPacket(BitStream *stream); - void handleNotify(bool recvd); - void handleConnectionEstablished(); - void keepAlive(); + void handlePacket(BitStream *stream) override; + void processRawPacket(BitStream *stream) override; + void handleNotify(bool recvd) override; + void handleConnectionEstablished() override; + void keepAlive() override; const NetAddress *getNetAddress(); void setNetAddress(const NetAddress *address); - Net::Error sendPacket(BitStream *stream); + Net::Error sendPacket(BitStream *stream) override; private: void netAddressTableInsert(); @@ -643,7 +643,7 @@ public: static void consoleInit(); - void onRemove(); + void onRemove() override; NetConnection(); ~NetConnection(); @@ -1052,8 +1052,8 @@ public: void stopRecording(); void stopDemoPlayback(); - virtual void writeDemoStartBlock(ResizeBitStream *stream); - virtual bool readDemoStartBlock(BitStream *stream); + void writeDemoStartBlock(ResizeBitStream *stream) override; + bool readDemoStartBlock(BitStream *stream) override; virtual void demoPlaybackComplete(); /// @} public: diff --git a/Engine/source/sim/netDownload.cpp b/Engine/source/sim/netDownload.cpp index b523ef0ad..ba6176b76 100644 --- a/Engine/source/sim/netDownload.cpp +++ b/Engine/source/sim/netDownload.cpp @@ -59,28 +59,28 @@ public: } } - virtual void pack(NetConnection *, BitStream *bstream) + void pack(NetConnection *, BitStream *bstream) override { bstream->writeRangedU32(nameCount, 0, MaxFileNames); for(U32 i = 0; i < nameCount; i++) bstream->writeString(mFileNames[i]); } - virtual void write(NetConnection *, BitStream *bstream) + void write(NetConnection *, BitStream *bstream) override { bstream->writeRangedU32(nameCount, 0, MaxFileNames); for(U32 i = 0; i < nameCount; i++) bstream->writeString(mFileNames[i]); } - virtual void unpack(NetConnection *, BitStream *bstream) + void unpack(NetConnection *, BitStream *bstream) override { nameCount = bstream->readRangedU32(0, MaxFileNames); for(U32 i = 0; i < nameCount; i++) bstream->readString(mFileNames[i]); } - virtual void process(NetConnection *connection) + void process(NetConnection *connection) override { U32 i; for(i = 0; i < nameCount; i++) @@ -120,30 +120,30 @@ public: chunkLen = len; } - virtual void pack(NetConnection *, BitStream *bstream) + void pack(NetConnection *, BitStream *bstream) override { bstream->writeRangedU32(chunkLen, 0, ChunkSize); bstream->write(chunkLen, chunkData); } - virtual void write(NetConnection *, BitStream *bstream) + void write(NetConnection *, BitStream *bstream) override { bstream->writeRangedU32(chunkLen, 0, ChunkSize); bstream->write(chunkLen, chunkData); } - virtual void unpack(NetConnection *, BitStream *bstream) + void unpack(NetConnection *, BitStream *bstream) override { chunkLen = bstream->readRangedU32(0, ChunkSize); bstream->read(chunkLen, chunkData); } - virtual void process(NetConnection *connection) + void process(NetConnection *connection) override { connection->chunkReceived(chunkData, chunkLen); } - virtual void notifyDelivered(NetConnection *nc, bool madeIt) + void notifyDelivered(NetConnection *nc, bool madeIt) override { if(!nc->isRemoved()) nc->sendFileChunk(); diff --git a/Engine/source/sim/netGhost.cpp b/Engine/source/sim/netGhost.cpp index d903d7473..89d8c7143 100644 --- a/Engine/source/sim/netGhost.cpp +++ b/Engine/source/sim/netGhost.cpp @@ -63,7 +63,7 @@ public: ~GhostAlwaysObjectEvent() { delete object; } - void pack(NetConnection *ps, BitStream *bstream) + void pack(NetConnection *ps, BitStream *bstream) override { bstream->writeInt(ghostIndex, NetConnection::GhostIdBitSize); @@ -83,7 +83,7 @@ public: #endif } } - void write(NetConnection *ps, BitStream *bstream) + void write(NetConnection *ps, BitStream *bstream) override { bstream->writeInt(ghostIndex, NetConnection::GhostIdBitSize); if(bstream->writeFlag(validObject)) @@ -100,7 +100,7 @@ public: #endif } } - void unpack(NetConnection *ps, BitStream *bstream) + void unpack(NetConnection *ps, BitStream *bstream) override { ghostIndex = bstream->readInt(NetConnection::GhostIdBitSize); @@ -136,7 +136,7 @@ public: validObject = false; } } - void process(NetConnection *ps) + void process(NetConnection *ps) override { Con::executef("onGhostAlwaysObjectReceived"); diff --git a/Engine/source/sim/netObject.h b/Engine/source/sim/netObject.h index 60e8786d7..0bed12612 100644 --- a/Engine/source/sim/netObject.h +++ b/Engine/source/sim/netObject.h @@ -287,14 +287,14 @@ public: NetObject(); ~NetObject(); - virtual String describeSelf() const; + String describeSelf() const override; /// @name Miscellaneous /// @{ DECLARE_CONOBJECT(NetObject); static void initPersistFields(); - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; /// @} static void collapseDirtyList(); diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.h b/Engine/source/terrain/glsl/terrFeatureGLSL.h index 135d54b8a..7c80773ec 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.h +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.h @@ -61,17 +61,17 @@ class TerrainBaseMapFeatGLSL : public TerrainFeatGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Base Texture"; } + String getName() override { return "Terrain Base Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -86,17 +86,17 @@ public: TerrainDetailMapFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Detail Texture"; } + String getName() override { return "Terrain Detail Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -111,17 +111,17 @@ public: TerrainMacroMapFeatGLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Macro Texture"; } + String getName() override { return "Terrain Macro Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -129,66 +129,66 @@ class TerrainNormalMapFeatGLSL : public TerrainFeatGLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Normal Texture"; } + String getName() override { return "Terrain Normal Texture"; } }; class TerrainLightMapFeatGLSL : public TerrainFeatGLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Lightmap Texture"; } + String getName() override { return "Terrain Lightmap Texture"; } }; class TerrainORMMapFeatGLSL : public TerrainFeatGLSL { public: - virtual void processVert(Vector &componentList, - const MaterialFeatureData &fd); + void processVert(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual Resources getResources(const MaterialFeatureData &fd); + Resources getResources(const MaterialFeatureData &fd) override; - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; - virtual String getName() { return "Composite Matinfo map"; } + U32 getOutputTargets(const MaterialFeatureData &fd) const override; + String getName() override { return "Composite Matinfo map"; } }; class TerrainBlankInfoMapFeatGLSL : public ShaderFeatureGLSL { public: - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual String getName() { return "Blank Matinfo map"; } + String getName() override { return "Blank Matinfo map"; } }; class TerrainHeightMapBlendGLSL : public TerrainFeatGLSL { public: - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual String getName() { return "Terrain Heightmap Blend"; } + String getName() override { return "Terrain Heightmap Blend"; } }; #endif // _TERRFEATUREGLSL_H_ diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.h b/Engine/source/terrain/hlsl/terrFeatureHLSL.h index 407b8e267..b65b1335b 100644 --- a/Engine/source/terrain/hlsl/terrFeatureHLSL.h +++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.h @@ -68,17 +68,17 @@ class TerrainBaseMapFeatHLSL : public TerrainFeatHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Base Texture"; } + String getName() override { return "Terrain Base Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -93,17 +93,17 @@ public: TerrainDetailMapFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Detail Texture"; } + String getName() override { return "Terrain Detail Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -118,17 +118,17 @@ public: TerrainMacroMapFeatHLSL(); - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Macro Texture"; } + String getName() override { return "Terrain Macro Texture"; } - virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const; + U32 getOutputTargets( const MaterialFeatureData &fd ) const override; }; @@ -136,65 +136,65 @@ class TerrainNormalMapFeatHLSL : public TerrainFeatHLSL { public: - virtual void processVert( Vector &componentList, - const MaterialFeatureData &fd ); + void processVert( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Normal Texture"; } + String getName() override { return "Terrain Normal Texture"; } }; class TerrainLightMapFeatHLSL : public TerrainFeatHLSL { public: - virtual void processPix( Vector &componentList, - const MaterialFeatureData &fd ); + void processPix( Vector &componentList, + const MaterialFeatureData &fd ) override; - virtual Resources getResources( const MaterialFeatureData &fd ); + Resources getResources( const MaterialFeatureData &fd ) override; - virtual String getName() { return "Terrain Lightmap Texture"; } + String getName() override { return "Terrain Lightmap Texture"; } }; class TerrainORMMapFeatHLSL : public TerrainFeatHLSL { public: - virtual void processVert(Vector &componentList, - const MaterialFeatureData &fd); + void processVert(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; - virtual Resources getResources(const MaterialFeatureData &fd); + Resources getResources(const MaterialFeatureData &fd) override; - virtual U32 getOutputTargets(const MaterialFeatureData &fd) const; - virtual String getName() { return "Composite Matinfo map"; } + U32 getOutputTargets(const MaterialFeatureData &fd) const override; + String getName() override { return "Composite Matinfo map"; } }; class TerrainBlankInfoMapFeatHLSL : public TerrainFeatHLSL { public: - virtual void processPix(Vector &componentList, - const MaterialFeatureData &fd); - virtual String getName() { return "Blank Matinfo map"; } + void processPix(Vector &componentList, + const MaterialFeatureData &fd) override; + String getName() override { return "Blank Matinfo map"; } }; class TerrainHeightMapBlendHLSL : public TerrainFeatHLSL { public: - virtual void processVert(Vector& componentList, - const MaterialFeatureData& fd); + void processVert(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual void processPix(Vector& componentList, - const MaterialFeatureData& fd); + void processPix(Vector& componentList, + const MaterialFeatureData& fd) override; - virtual String getName() { return "Terrain Heightmap Blend"; } + String getName() override { return "Terrain Heightmap Blend"; } }; #endif // _TERRFEATUREHLSL_H_ diff --git a/Engine/source/terrain/terrCollision.h b/Engine/source/terrain/terrCollision.h index 7313b9054..6434a3a91 100644 --- a/Engine/source/terrain/terrCollision.h +++ b/Engine/source/terrain/terrCollision.h @@ -47,11 +47,11 @@ class TerrainConvex : public Convex TerrainConvex( const TerrainConvex& cv ); // Convex - Box3F getBoundingBox() const; - Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const; - Point3F support(const VectorF& v) const; - void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf); - void getPolyList(AbstractPolyList* list); + Box3F getBoundingBox() const override; + Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override; + Point3F support(const VectorF& v) const override; + void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override; + void getPolyList(AbstractPolyList* list) override; }; #endif // _TERRCOLL_H_ diff --git a/Engine/source/terrain/terrData.h b/Engine/source/terrain/terrData.h index 8eeb79d12..ebbe099c1 100644 --- a/Engine/source/terrain/terrData.h +++ b/Engine/source/terrain/terrData.h @@ -300,11 +300,11 @@ public: Resource getFile() const { return mFile; }; - bool onAdd(); - void onRemove(); + bool onAdd() override; + void onRemove() override; - void onEditorEnable(); - void onEditorDisable(); + void onEditorEnable() override; + void onEditorDisable() override; /// Adds a new material as the top layer or /// inserts it at the specified index. @@ -418,7 +418,7 @@ public: StringTableEntry &matName ) const; // only the editor currently uses this method - should always be using a ray to collide with - bool collideBox( const Point3F &start, const Point3F &end, RayInfo* info ) + bool collideBox( const Point3F &start, const Point3F &end, RayInfo* info ) override { return castRay( start, end, info ); } @@ -461,14 +461,14 @@ public: U32 getScreenError() const { return smLODScale * mScreenError; } // SceneObject - void setTransform( const MatrixF &mat ); - void setScale( const VectorF &scale ); + void setTransform( const MatrixF &mat ) override; + void setScale( const VectorF &scale ) override; - void prepRenderImage ( SceneRenderState* state ); + void prepRenderImage ( SceneRenderState* state ) override; - void buildConvex(const Box3F& box,Convex* convex); - bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere); - bool castRay(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 castRayI(const Point3F &start, const Point3F &end, RayInfo* info, bool emptyCollide); bool castRayBlock( const Point3F &pStart, @@ -490,11 +490,11 @@ public: DECLARE_CONOBJECT(TerrainBlock); DECLARE_CATEGORY("Environment \t BackGround"); static void initPersistFields(); - U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); - void unpackUpdate(NetConnection *conn, BitStream *stream); - void inspectPostApply(); + U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override; + void unpackUpdate(NetConnection *conn, BitStream *stream) override; + void inspectPostApply() override; - virtual void getUtilizedAssets(Vector* usedAssetsList); + void getUtilizedAssets(Vector* usedAssetsList) override; const StringTableEntry getTerrain() const { diff --git a/Engine/source/terrain/terrMaterial.h b/Engine/source/terrain/terrMaterial.h index 7c3025542..501ab29d3 100644 --- a/Engine/source/terrain/terrMaterial.h +++ b/Engine/source/terrain/terrMaterial.h @@ -104,7 +104,7 @@ public: TerrainMaterial(); virtual ~TerrainMaterial(); - bool onAdd(); + bool onAdd() override; static void initPersistFields(); DECLARE_CONOBJECT( TerrainMaterial ); diff --git a/Engine/source/ts/assimp/assimpAppMaterial.h b/Engine/source/ts/assimp/assimpAppMaterial.h index 3c1482fa9..0e973aaeb 100644 --- a/Engine/source/ts/assimp/assimpAppMaterial.h +++ b/Engine/source/ts/assimp/assimpAppMaterial.h @@ -47,7 +47,7 @@ public: AssimpAppMaterial(aiMaterial* mtl); ~AssimpAppMaterial() { } - String getName() const { return name; } + String getName() const override { return name; } Material* createMaterial(const Torque::Path& path) const; void initMaterial(const Torque::Path& path, Material* mat) const; diff --git a/Engine/source/ts/assimp/assimpAppMesh.h b/Engine/source/ts/assimp/assimpAppMesh.h index 871ef86fe..9e5919276 100644 --- a/Engine/source/ts/assimp/assimpAppMesh.h +++ b/Engine/source/ts/assimp/assimpAppMesh.h @@ -53,7 +53,7 @@ public: //delete geomExt; } - void lookupSkinData(); + void lookupSkinData() override; static void fixDetailSize(bool fixed, S32 size=2) { @@ -64,7 +64,7 @@ public: /// Get the name of this mesh /// /// @return A string containing the name of this mesh - const char *getName(bool allowFixed=true); + const char *getName(bool allowFixed=true) override; //----------------------------------------------------------------------- @@ -74,7 +74,7 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getFloat(const char *propName, F32 &defaultVal) + bool getFloat(const char *propName, F32 &defaultVal) override { return appNode->getFloat(propName,defaultVal); } @@ -85,7 +85,7 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getInt(const char *propName, S32 &defaultVal) + bool getInt(const char *propName, S32 &defaultVal) override { return appNode->getInt(propName,defaultVal); } @@ -96,13 +96,13 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getBool(const char *propName, bool &defaultVal) + bool getBool(const char *propName, bool &defaultVal) override { return appNode->getBool(propName,defaultVal); } /// Return true if this mesh is a skin - bool isSkin() + bool isSkin() override { return mIsSkinMesh; } @@ -111,15 +111,15 @@ public: /// /// @param time Time at which to generate the mesh data /// @param objectOffset Transform to apply to the generated data (bounds transform) - void lockMesh(F32 time, const MatrixF& objOffset); + void lockMesh(F32 time, const MatrixF& objOffset) override; /// Get the transform of this mesh at a certain time /// /// @param time Time at which to get the transform /// /// @return The mesh transform at the specified time - MatrixF getMeshTransform(F32 time); - F32 getVisValue(F32 t); + MatrixF getMeshTransform(F32 time) override; + F32 getVisValue(F32 t) override; }; #endif // _COLLADA_APPMESH_H_ diff --git a/Engine/source/ts/assimp/assimpAppNode.h b/Engine/source/ts/assimp/assimpAppNode.h index 947cb894b..41b90cd3a 100644 --- a/Engine/source/ts/assimp/assimpAppNode.h +++ b/Engine/source/ts/assimp/assimpAppNode.h @@ -45,8 +45,8 @@ class AssimpAppNode : public AppNode MatrixF getTransform(F32 time); void getAnimatedTransform(MatrixF& mat, F32 t, aiAnimation* animSeq); - void buildMeshList(); - void buildChildList(); + void buildMeshList() override; + void buildChildList() override; protected: @@ -73,10 +73,10 @@ public: static F32 sTimeMultiplier; //----------------------------------------------------------------------- - const char *getName() { return mName; } - const char *getParentName() { return mParentName; } + const char *getName() override { return mName; } + const char *getParentName() override { return mParentName; } - bool isEqual(AppNode* node) + bool isEqual(AppNode* node) override { const AssimpAppNode* appNode = dynamic_cast(node); return (appNode && (appNode->mNode == mNode)); @@ -84,21 +84,21 @@ public: // Property look-ups: only float properties are stored, the rest are // converted from floats as needed - bool getFloat(const char* propName, F32& defaultVal) + bool getFloat(const char* propName, F32& defaultVal) override { //Map::Iterator itr = mProps.find(propName); //if (itr != mProps.end()) // defaultVal = itr->value; return false; } - bool getInt(const char* propName, S32& defaultVal) + bool getInt(const char* propName, S32& defaultVal) override { F32 value = defaultVal; bool ret = getFloat(propName, value); defaultVal = (S32)value; return ret; } - bool getBool(const char* propName, bool& defaultVal) + bool getBool(const char* propName, bool& defaultVal) override { F32 value = defaultVal; bool ret = getFloat(propName, value); @@ -106,9 +106,9 @@ public: return ret; } - MatrixF getNodeTransform(F32 time); - bool animatesTransform(const AppSequence* appSeq); - bool isParentRoot() { return (appParent == NULL); } + MatrixF getNodeTransform(F32 time) override; + bool animatesTransform(const AppSequence* appSeq) override; + bool isParentRoot() override { return (appParent == NULL); } static void assimpToTorqueMat(const aiMatrix4x4& inAssimpMat, MatrixF& outMat); static void convertMat(MatrixF& outMat); diff --git a/Engine/source/ts/assimp/assimpAppSequence.h b/Engine/source/ts/assimp/assimpAppSequence.h index 467aeb4a2..abd20aa8d 100644 --- a/Engine/source/ts/assimp/assimpAppSequence.h +++ b/Engine/source/ts/assimp/assimpAppSequence.h @@ -34,18 +34,18 @@ public: aiAnimation *mAnim; - virtual void setActive(bool active); + void setActive(bool active) override; - virtual S32 getNumTriggers() const { return 0; } - virtual void getTrigger(S32 index, TSShape::Trigger& trigger) const { trigger.state = 0; } + S32 getNumTriggers() const override { return 0; } + void getTrigger(S32 index, TSShape::Trigger& trigger) const override { trigger.state = 0; } - virtual const char* getName() const { return mSequenceName.c_str(); } + const char* getName() const override { return mSequenceName.c_str(); } - F32 getStart() const { return seqStart; } - F32 getEnd() const { return seqEnd; } + F32 getStart() const override { return seqStart; } + F32 getEnd() const override { return seqEnd; } void setEnd(F32 end) { seqEnd = end; } - virtual U32 getFlags() const; - virtual F32 getPriority() const; - virtual F32 getBlendRefTime() const; + U32 getFlags() const override; + F32 getPriority() const override; + F32 getBlendRefTime() const override; }; diff --git a/Engine/source/ts/assimp/assimpShapeLoader.h b/Engine/source/ts/assimp/assimpShapeLoader.h index 7bbf1efa8..26a163154 100644 --- a/Engine/source/ts/assimp/assimpShapeLoader.h +++ b/Engine/source/ts/assimp/assimpShapeLoader.h @@ -39,8 +39,8 @@ class AssimpShapeLoader : public TSShapeLoader protected: const struct aiScene* mScene; - virtual bool ignoreNode(const String& name); - virtual bool ignoreMesh(const String& name); + bool ignoreNode(const String& name) override; + bool ignoreMesh(const String& name) override; void detectDetails(); void extractTexture(U32 index, aiTexture* pTex); @@ -58,11 +58,11 @@ public: ~AssimpShapeLoader(); void releaseImport(); - void enumerateScene(); + void enumerateScene() override; void updateMaterialsScript(const Torque::Path &path); void processAnimations(); - void computeBounds(Box3F& bounds); + void computeBounds(Box3F& bounds) override; bool fillGuiTreeView(const char* shapePath, GuiTreeViewCtrl* tree); diff --git a/Engine/source/ts/collada/colladaAppMaterial.h b/Engine/source/ts/collada/colladaAppMaterial.h index 429a07e50..76fc6f434 100644 --- a/Engine/source/ts/collada/colladaAppMaterial.h +++ b/Engine/source/ts/collada/colladaAppMaterial.h @@ -53,7 +53,7 @@ public: ColladaAppMaterial(const domMaterial* pMat); ~ColladaAppMaterial() { delete effectExt; } - String getName() const { return name; } + String getName() const override { return name; } void resolveFloat(const domCommon_float_or_param_type* value, F32* dst); void resolveColor(const domCommon_color_or_texture_type* value, LinearColorF* dst); diff --git a/Engine/source/ts/collada/colladaAppMesh.h b/Engine/source/ts/collada/colladaAppMesh.h index 72c16e56d..6b737a9b9 100644 --- a/Engine/source/ts/collada/colladaAppMesh.h +++ b/Engine/source/ts/collada/colladaAppMesh.h @@ -135,7 +135,7 @@ public: /// Get the name of this mesh /// /// @return A string containing the name of this mesh - const char *getName(bool allowFixed=true); + const char *getName(bool allowFixed=true) override; //----------------------------------------------------------------------- @@ -145,7 +145,7 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getFloat(const char *propName, F32 &defaultVal) + bool getFloat(const char *propName, F32 &defaultVal) override { return appNode->getFloat(propName,defaultVal); } @@ -156,7 +156,7 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getInt(const char *propName, S32 &defaultVal) + bool getInt(const char *propName, S32 &defaultVal) override { return appNode->getInt(propName,defaultVal); } @@ -167,13 +167,13 @@ public: /// @param defaultVal Reference to variable to hold return value /// /// @return True if a value was set, false if not - bool getBool(const char *propName, bool &defaultVal) + bool getBool(const char *propName, bool &defaultVal) override { return appNode->getBool(propName,defaultVal); } /// Return true if this mesh is a skin - bool isSkin() + bool isSkin() override { if (instanceCtrl) { const domController* ctrl = daeSafeCast(instanceCtrl->getUrl().getElement()); @@ -185,48 +185,48 @@ public: } /// Get the skin data: bones, vertex weights etc - void lookupSkinData(); + void lookupSkinData() override; /// Check if the mesh visibility is animated /// /// @param appSeq Start/end time to check /// /// @return True if the mesh visibility is animated, false if not - bool animatesVis(const AppSequence* appSeq); + bool animatesVis(const AppSequence* appSeq) override; /// Check if the material used by this mesh is animated /// /// @param appSeq Start/end time to check /// /// @return True if the material is animated, false if not - bool animatesMatFrame(const AppSequence* appSeq); + bool animatesMatFrame(const AppSequence* appSeq) override; /// Check if the mesh is animated /// /// @param appSeq Start/end time to check /// /// @return True if the mesh is animated, false if not - bool animatesFrame(const AppSequence* appSeq); + bool animatesFrame(const AppSequence* appSeq) override; /// Generate the vertex, normal and triangle data for the mesh. /// /// @param time Time at which to generate the mesh data /// @param objOffset Transform to apply to the generated data (bounds transform) - void lockMesh(F32 time, const MatrixF& objOffset); + void lockMesh(F32 time, const MatrixF& objOffset) override; /// Get the transform of this mesh at a certain time /// /// @param time Time at which to get the transform /// /// @return The mesh transform at the specified time - MatrixF getMeshTransform(F32 time); + MatrixF getMeshTransform(F32 time) override; /// Get the visibility of this mesh at a certain time /// /// @param time Time at which to get visibility info /// /// @return Visibility from 0 (invisible) to 1 (opaque) - F32 getVisValue(F32 time); + F32 getVisValue(F32 time) override; }; #endif // _COLLADA_APPMESH_H_ diff --git a/Engine/source/ts/collada/colladaAppNode.h b/Engine/source/ts/collada/colladaAppNode.h index f633e7be6..b67b581d8 100644 --- a/Engine/source/ts/collada/colladaAppNode.h +++ b/Engine/source/ts/collada/colladaAppNode.h @@ -39,8 +39,8 @@ class ColladaAppNode : public AppNode friend class ColladaAppMesh; MatrixF getTransform(F32 time); - void buildMeshList(); - void buildChildList(); + void buildMeshList() override; + void buildChildList() override; protected: @@ -69,10 +69,10 @@ public: const domNode* getDomNode() const { return p_domNode; } //----------------------------------------------------------------------- - const char *getName() { return mName; } - const char *getParentName() { return mParentName; } + const char *getName() override { return mName; } + const char *getParentName() override { return mParentName; } - bool isEqual(AppNode* node) + bool isEqual(AppNode* node) override { const ColladaAppNode* appNode = dynamic_cast(node); return (appNode && (appNode->p_domNode == p_domNode)); @@ -80,21 +80,21 @@ public: // Property look-ups: only float properties are stored, the rest are // converted from floats as needed - bool getFloat(const char* propName, F32& defaultVal) + bool getFloat(const char* propName, F32& defaultVal) override { Map::Iterator itr = mProps.find(propName); if (itr != mProps.end()) defaultVal = itr->value; return false; } - bool getInt(const char* propName, S32& defaultVal) + bool getInt(const char* propName, S32& defaultVal) override { F32 value = defaultVal; bool ret = getFloat(propName, value); defaultVal = (S32)value; return ret; } - bool getBool(const char* propName, bool& defaultVal) + bool getBool(const char* propName, bool& defaultVal) override { F32 value = defaultVal; bool ret = getFloat(propName, value); @@ -102,9 +102,9 @@ public: return ret; } - MatrixF getNodeTransform(F32 time); - bool animatesTransform(const AppSequence* appSeq); - bool isParentRoot() { return (appParent == NULL); } + MatrixF getNodeTransform(F32 time) override; + bool animatesTransform(const AppSequence* appSeq) override; + bool isParentRoot() override { return (appParent == NULL); } }; #endif // _COLLADA_APPNODE_H_ diff --git a/Engine/source/ts/collada/colladaAppSequence.h b/Engine/source/ts/collada/colladaAppSequence.h index 83be18be4..fcb9d4e84 100644 --- a/Engine/source/ts/collada/colladaAppSequence.h +++ b/Engine/source/ts/collada/colladaAppSequence.h @@ -44,20 +44,20 @@ public: ColladaAppSequence(const domAnimation_clip* clip); ~ColladaAppSequence(); - void setActive(bool active); + void setActive(bool active) override; const domAnimation_clip* getClip() const { return pClip; } S32 getNumTriggers(); void getTrigger(S32 index, TSShape::Trigger& trigger); - const char* getName() const; + const char* getName() const override; - F32 getStart() const { return seqStart; } - F32 getEnd() const { return seqEnd; } + F32 getStart() const override { return seqStart; } + F32 getEnd() const override { return seqEnd; } void setEnd(F32 end) { seqEnd = end; } - U32 getFlags() const; + U32 getFlags() const override; F32 getPriority(); F32 getBlendRefTime(); }; diff --git a/Engine/source/ts/collada/colladaShapeLoader.cpp b/Engine/source/ts/collada/colladaShapeLoader.cpp index 8f96c9cab..817ca3a6e 100644 --- a/Engine/source/ts/collada/colladaShapeLoader.cpp +++ b/Engine/source/ts/collada/colladaShapeLoader.cpp @@ -68,12 +68,12 @@ static FileTime sLastModTime; // Modification time of the last loaded Collada // Custom warning/error message handler class myErrorHandler : public daeErrorHandler { - void handleError( daeString msg ) + void handleError( daeString msg ) override { Con::errorf("Error: %s", msg); } - void handleWarning( daeString msg ) + void handleWarning( daeString msg ) override { Con::errorf("Warning: %s", msg); } diff --git a/Engine/source/ts/collada/colladaShapeLoader.h b/Engine/source/ts/collada/colladaShapeLoader.h index b5cfd3198..b9ed393b1 100644 --- a/Engine/source/ts/collada/colladaShapeLoader.h +++ b/Engine/source/ts/collada/colladaShapeLoader.h @@ -47,10 +47,10 @@ public: ColladaShapeLoader(domCOLLADA* _root); ~ColladaShapeLoader(); - void enumerateScene(); - bool ignoreNode(const String& name); - bool ignoreMesh(const String& name); - void computeBounds(Box3F& bounds); + void enumerateScene() override; + bool ignoreNode(const String& name) override; + bool ignoreMesh(const String& name) override; + void computeBounds(Box3F& bounds) override; static bool canLoadCachedDTS(const Torque::Path& path); static bool checkAndMountSketchup(const Torque::Path& path, String& mountPoint, Torque::Path& daePath); diff --git a/Engine/source/ts/collada/colladaUtils.h b/Engine/source/ts/collada/colladaUtils.h index 8cfe1a4dd..90a8265f5 100644 --- a/Engine/source/ts/collada/colladaUtils.h +++ b/Engine/source/ts/collada/colladaUtils.h @@ -672,14 +672,14 @@ public: } /// Most primitives can use these common implementations - const char* getElementName() { return primitive->getElementName(); } - const char* getMaterial() { return (FindMatch::isMatchMultipleExprs(ColladaUtils::getOptions().neverImportMat, primitive->getMaterial(), false)) ? NULL : primitive->getMaterial(); } - const domInputLocalOffset_Array& getInputs() { return primitive->getInput_array(); } - S32 getStride() const { return stride; } + const char* getElementName() override { return primitive->getElementName(); } + const char* getMaterial() override { return (FindMatch::isMatchMultipleExprs(ColladaUtils::getOptions().neverImportMat, primitive->getMaterial(), false)) ? NULL : primitive->getMaterial(); } + const domInputLocalOffset_Array& getInputs() override { return primitive->getInput_array(); } + S32 getStride() const override { return stride; } /// Each supported primitive needs to implement this method (and convert /// to triangles if required) - const domListOfUInts *getTriangleData() { return NULL; } + const domListOfUInts *getTriangleData() override { return NULL; } }; //----------------------------------------------------------------------------- diff --git a/Engine/source/ts/instancingMatHook.h b/Engine/source/ts/instancingMatHook.h index fe1c72659..0c3c3a952 100644 --- a/Engine/source/ts/instancingMatHook.h +++ b/Engine/source/ts/instancingMatHook.h @@ -41,7 +41,7 @@ public: virtual ~InstancingMaterialHook(); // MatInstanceHook - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// Returns the instancing material instance or the input material /// instance if one could not be created. diff --git a/Engine/source/ts/loader/tsShapeLoader.h b/Engine/source/ts/loader/tsShapeLoader.h index bfd0f687c..bcb35624a 100644 --- a/Engine/source/ts/loader/tsShapeLoader.h +++ b/Engine/source/ts/loader/tsShapeLoader.h @@ -182,7 +182,7 @@ protected: void install(); public: - TSShapeLoader() : boundsNode(0), shape(NULL) { } + TSShapeLoader() : shape(NULL), boundsNode(0) { } virtual ~TSShapeLoader(); static const Torque::Path& getShapePath() { return shapePath; } diff --git a/Engine/source/ts/tsMaterialList.h b/Engine/source/ts/tsMaterialList.h index 15294f334..ed40b56cc 100644 --- a/Engine/source/ts/tsMaterialList.h +++ b/Engine/source/ts/tsMaterialList.h @@ -69,7 +69,7 @@ class TSMaterialList : public MaterialList TSMaterialList(); TSMaterialList(const TSMaterialList*); ~TSMaterialList(); - void free(); + void free() override; U32 getFlags(U32 index); void setFlags(U32 index, U32 value); @@ -91,7 +91,7 @@ class TSMaterialList : public MaterialList /// @} protected: - virtual void mapMaterial( U32 index ); + void mapMaterial( U32 index ) override; }; diff --git a/Engine/source/ts/tsMesh.h b/Engine/source/ts/tsMesh.h index b20a9a2fb..cc9f009fa 100644 --- a/Engine/source/ts/tsMesh.h +++ b/Engine/source/ts/tsMesh.h @@ -552,17 +552,17 @@ public: void setupVertexTransforms(); /// Returns maximum bones used per vertex - virtual U32 getMaxBonesPerVert(); + U32 getMaxBonesPerVert() override; - virtual void convertToVertexData(); - virtual void copySourceVertexDataFrom(const TSMesh* srcMesh); + void convertToVertexData() override; + void copySourceVertexDataFrom(const TSMesh* srcMesh) override; void printVerts(); void addWeightsFromVertexBuffer(); - void makeEditable(); - void clearEditable(); + void makeEditable() override; + void clearEditable() override; public: typedef TSMesh Parent; @@ -587,24 +587,24 @@ public: void updateSkinBones( const Vector &transforms, Vector& destTransforms ); // render methods.. - void render( TSVertexBufferHandle &instanceVB ); + void render( TSVertexBufferHandle &instanceVB ) override; void render( TSMaterialList *, const TSRenderState &data, bool isSkinDirty, const Vector &transforms, TSVertexBufferHandle &vertexBuffer, - const char *meshName ); + const char *meshName ) override; // collision methods... - bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ); - bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials ); - bool buildConvexHull(); // does nothing, skins don't use this + bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ) override; + bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials ) override; + bool buildConvexHull() override; // does nothing, skins don't use this - void computeBounds( const MatrixF &transform, Box3F &bounds, S32 frame, Point3F *center, F32 *radius ); + void computeBounds( const MatrixF &transform, Box3F &bounds, S32 frame, Point3F *center, F32 *radius ) override; /// persist methods... - void assemble( bool skip ); - void disassemble(); + void assemble( bool skip ) override; + void disassemble() override; /// Helper method to add a blend tuple for a vertex inline void addWeightForVert(U32 vi, U32 bi, F32 w) diff --git a/Engine/source/ts/tsShapeConstruct.h b/Engine/source/ts/tsShapeConstruct.h index 465861599..b85337a83 100644 --- a/Engine/source/ts/tsShapeConstruct.h +++ b/Engine/source/ts/tsShapeConstruct.h @@ -212,12 +212,12 @@ public: static TSShapeConstructor* findShapeConstructorByAssetId(StringTableEntry path); static TSShapeConstructor* findShapeConstructorByFilename(const FileName& path); - bool onAdd(); + bool onAdd() override; void onScriptChanged(const Torque::Path& path); void onActionPerformed(); - bool writeField(StringTableEntry fieldname, const char* value); + bool writeField(StringTableEntry fieldname, const char* value) override; void writeChangeSet(); void notifyShapeChanged(); diff --git a/Engine/source/ts/tsShapeInstance.h b/Engine/source/ts/tsShapeInstance.h index 60177c349..78ed5e641 100644 --- a/Engine/source/ts/tsShapeInstance.h +++ b/Engine/source/ts/tsShapeInstance.h @@ -176,11 +176,11 @@ class TSShapeInstance MeshObjectInstance(); virtual ~MeshObjectInstance() {} - void render( S32 objectDetail, TSVertexBufferHandle &vb, TSMaterialList *, TSRenderState &rdata, F32 alpha, const char *meshName ); + void render( S32 objectDetail, TSVertexBufferHandle &vb, TSMaterialList *, TSRenderState &rdata, F32 alpha, const char *meshName ) override; - void updateVertexBuffer( S32 objectDetail, U8 *buffer ); + void updateVertexBuffer( S32 objectDetail, U8 *buffer ) override; - bool bufferNeedsUpdate(S32 objectDetail); + bool bufferNeedsUpdate(S32 objectDetail) override; /// Gets the mesh with specified detail level TSMesh * getMesh(S32 num) const { return numnumMeshes ? *(meshList+num) : NULL; } @@ -188,15 +188,15 @@ class TSShapeInstance /// @name Collision Routines /// @{ - bool buildPolyList( S32 objectDetail, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ); - bool getFeatures( S32 objectDetail, const MatrixF &mat, const Point3F &n, ConvexFeature *feature, U32 &surfaceKey ); - void support( S32 od, const Point3F &v, F32 *currMaxDP, Point3F *currSupport ); - bool castRay( S32 objectDetail, const Point3F &start, const Point3F &end, RayInfo *info, TSMaterialList *materials ); + bool buildPolyList( S32 objectDetail, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ) override; + bool getFeatures( S32 objectDetail, const MatrixF &mat, const Point3F &n, ConvexFeature *feature, U32 &surfaceKey ) override; + void support( S32 od, const Point3F &v, F32 *currMaxDP, Point3F *currSupport ) override; + bool castRay( S32 objectDetail, const Point3F &start, const Point3F &end, RayInfo *info, TSMaterialList *materials ) override; bool castRayRendered( S32 objectDetail, const Point3F &start, const Point3F &end, RayInfo *info, TSMaterialList *materials ); bool buildPolyListOpcode( S32 objectDetail, AbstractPolyList *polyList, const Box3F &box, TSMaterialList* materials ); - bool castRayOpcode( S32 objectDetail, const Point3F &start, const Point3F &end, RayInfo *info, TSMaterialList *materials ); - bool buildConvexOpcode( const MatrixF &mat, S32 objectDetail, const Box3F &bounds, Convex *c, Convex *list ); + bool castRayOpcode( S32 objectDetail, const Point3F &start, const Point3F &end, RayInfo *info, TSMaterialList *materials ) override; + bool buildConvexOpcode( const MatrixF &mat, S32 objectDetail, const Box3F &bounds, Convex *c, Convex *list ) override; /// @} }; diff --git a/Engine/source/ts/tsSortedMesh.h b/Engine/source/ts/tsSortedMesh.h index df0e58ddd..26dc18621 100644 --- a/Engine/source/ts/tsSortedMesh.h +++ b/Engine/source/ts/tsSortedMesh.h @@ -60,15 +60,15 @@ public: // render methods.. void render(S32 frame, S32 matFrame, TSMaterialList *); - bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ); - bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials ); - bool buildConvexHull(); ///< does nothing, skins don't use this + bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ) override; + bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials ) override; + bool buildConvexHull() override; ///< does nothing, skins don't use this /// /// @returns false ALWAYS S32 getNumPolys(); - void assemble(bool skip); - void disassemble(); + void assemble(bool skip) override; + void disassemble() override; TSSortedMesh() { alwaysWriteDepth = false; diff --git a/Engine/source/util/catmullRom.h b/Engine/source/util/catmullRom.h index 84bb272aa..40d7d2eaa 100644 --- a/Engine/source/util/catmullRom.h +++ b/Engine/source/util/catmullRom.h @@ -101,8 +101,8 @@ public: TYPE getPosition( U32 idx ); // CatmullRomBase - void clear(); - F32 segmentArcLength( U32 i, F32 u1, F32 u2 ); + void clear() override; + F32 segmentArcLength( U32 i, F32 u1, F32 u2 ) override; protected: diff --git a/Engine/source/util/imposterCapture.cpp b/Engine/source/util/imposterCapture.cpp index 426f3b0bb..2c78120d7 100644 --- a/Engine/source/util/imposterCapture.cpp +++ b/Engine/source/util/imposterCapture.cpp @@ -49,7 +49,7 @@ public: // MatInstanceHook virtual ~ImposterCaptureMaterialHook(); - virtual const MatInstanceHookType& getType() const { return Type; } + const MatInstanceHookType& getType() const override { return Type; } /// The material hook type. static const MatInstanceHookType Type; diff --git a/Engine/source/util/messaging/eventManager.h b/Engine/source/util/messaging/eventManager.h index 888e8357c..af2cfd46a 100644 --- a/Engine/source/util/messaging/eventManager.h +++ b/Engine/source/util/messaging/eventManager.h @@ -62,8 +62,8 @@ public: EventManagerListener(): mSubscribers(64, false) {} /// Called by the EventManager queue when an event is triggered. Calls all listeners subscribed to the triggered event. - virtual bool onMessageReceived( StringTableEntry queue, const char* event, const char* data ); - virtual bool onMessageObjectReceived( StringTableEntry queue, Message *msg ) { return true; }; + bool onMessageReceived( StringTableEntry queue, const char* event, const char* data ) override; + bool onMessageObjectReceived( StringTableEntry queue, Message *msg ) override { return true; }; }; /// @addtogroup msgsys Message System diff --git a/Engine/source/util/messaging/message.h b/Engine/source/util/messaging/message.h index 3ccbf4744..604361fa7 100644 --- a/Engine/source/util/messaging/message.h +++ b/Engine/source/util/messaging/message.h @@ -109,8 +109,8 @@ public: //----------------------------------------------------------------------------- static SimObjectId getNextMessageID(); - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; //----------------------------------------------------------------------------- /// @brief Get the type of the message diff --git a/Engine/source/util/messaging/messageForwarder.h b/Engine/source/util/messaging/messageForwarder.h index 3fc668ccb..3ac8d7ab1 100644 --- a/Engine/source/util/messaging/messageForwarder.h +++ b/Engine/source/util/messaging/messageForwarder.h @@ -65,8 +65,8 @@ public: static void initPersistFields(); - virtual bool onMessageReceived(StringTableEntry queue, const char *event, const char *data); - virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg); + bool onMessageReceived(StringTableEntry queue, const char *event, const char *data) override; + bool onMessageObjectReceived(StringTableEntry queue, Message *msg) override; }; // @} diff --git a/Engine/source/util/messaging/scriptMsgListener.h b/Engine/source/util/messaging/scriptMsgListener.h index ab26dd171..7cd2a5c23 100644 --- a/Engine/source/util/messaging/scriptMsgListener.h +++ b/Engine/source/util/messaging/scriptMsgListener.h @@ -66,16 +66,16 @@ public: /////////////////////////////////////////////////////////////////////// - virtual bool onAdd(); - virtual void onRemove(); + bool onAdd() override; + void onRemove() override; /////////////////////////////////////////////////////////////////////// - virtual bool onMessageReceived(StringTableEntry queue, const char* event, const char* data); - virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg); + bool onMessageReceived(StringTableEntry queue, const char* event, const char* data) override; + bool onMessageObjectReceived(StringTableEntry queue, Message *msg) override; - virtual void onAddToQueue(StringTableEntry queue); - virtual void onRemoveFromQueue(StringTableEntry queue); + void onAddToQueue(StringTableEntry queue) override; + void onRemoveFromQueue(StringTableEntry queue) override; }; // @} diff --git a/Engine/source/util/sampler.cpp b/Engine/source/util/sampler.cpp index 405a81800..775dc3360 100644 --- a/Engine/source/util/sampler.cpp +++ b/Engine/source/util/sampler.cpp @@ -164,7 +164,7 @@ class CSVSamplerBackend : public ISamplerBackend } /// Open the file and emit a row with the names of all enabled keys. - virtual bool init( const char* fileName ) + bool init( const char* fileName ) override { if( !mStream.open( fileName, Torque::FS::File::Write ) ) { @@ -193,11 +193,11 @@ class CSVSamplerBackend : public ISamplerBackend return true; } - virtual void beginFrame() + void beginFrame() override { } - virtual void endFrame() + void endFrame() override { char buffer[ 256 ]; @@ -260,19 +260,19 @@ class CSVSamplerBackend : public ISamplerBackend return NULL; // silence compiler } - virtual void sample( U32 key, bool value ) + void sample( U32 key, bool value ) override { lookup( key )->set( value ); } - virtual void sample( U32 key, S32 value ) + void sample( U32 key, S32 value ) override { lookup( key )->set( value ); } - virtual void sample( U32 key, F32 value ) + void sample( U32 key, F32 value ) override { lookup( key )->set( value ); } - virtual void sample( U32 key, const char* value ) + void sample( U32 key, const char* value ) override { lookup( key )->set( value ); } diff --git a/Engine/source/util/undo.h b/Engine/source/util/undo.h index 63c78f813..caf856c60 100644 --- a/Engine/source/util/undo.h +++ b/Engine/source/util/undo.h @@ -89,10 +89,10 @@ public: DECLARE_CONOBJECT(CompoundUndoAction); virtual void addAction( UndoAction *action ); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; - virtual void onDeleteNotify( SimObject* object ); + void onDeleteNotify( SimObject* object ) override; U32 getNumChildren() const { return mChildren.size(); } }; @@ -215,10 +215,10 @@ public: { } - virtual void undo() { Con::executef(this, "undo"); }; - virtual void redo() { Con::executef(this, "redo"); } + void undo() override { Con::executef(this, "undo"); }; + void redo() override { Con::executef(this, "redo"); } - virtual bool onAdd() + bool onAdd() override { // Let Parent Do Work. if(!Parent::onAdd()) @@ -233,7 +233,7 @@ public: return true; }; - virtual void onRemove() + void onRemove() override { if (mUndoManager) mUndoManager->removeAction((UndoAction*)this, true); diff --git a/Engine/source/windowManager/sdl/sdlCursorController.h b/Engine/source/windowManager/sdl/sdlCursorController.h index 423be28b5..66be2f8c3 100644 --- a/Engine/source/windowManager/sdl/sdlCursorController.h +++ b/Engine/source/windowManager/sdl/sdlCursorController.h @@ -34,17 +34,17 @@ public: pushCursor( PlatformCursorController::curArrow ); }; - virtual void setCursorPosition( S32 x, S32 y ); - virtual void getCursorPosition( Point2I &point ); - virtual void setCursorVisible( bool visible ); - virtual bool isCursorVisible(); + void setCursorPosition( S32 x, S32 y ) override; + void getCursorPosition( Point2I &point ) override; + void setCursorVisible( bool visible ) override; + bool isCursorVisible() override; - void setCursorShape( U32 cursorID ); - void setCursorShape( const UTF8 *fileName, bool reload ); + void setCursorShape( U32 cursorID ) override; + void setCursorShape( const UTF8 *fileName, bool reload ) override; - U32 getDoubleClickTime(); - S32 getDoubleClickWidth(); - S32 getDoubleClickHeight(); + U32 getDoubleClickTime() override; + S32 getDoubleClickWidth() override; + S32 getDoubleClickHeight() override; }; diff --git a/Engine/source/windowManager/sdl/sdlWindow.h b/Engine/source/windowManager/sdl/sdlWindow.h index 205945963..7fb852809 100644 --- a/Engine/source/windowManager/sdl/sdlWindow.h +++ b/Engine/source/windowManager/sdl/sdlWindow.h @@ -104,7 +104,7 @@ public: PlatformWindowSDL(); ~PlatformWindowSDL(); - virtual void* getSystemWindow(const WindowSystem system); + void* getSystemWindow(const WindowSystem system) override; void* &getMenuHandle() { @@ -116,62 +116,62 @@ public: mMenuHandle = menuHandle; } - virtual GFXDevice *getGFXDevice(); - virtual GFXWindowTarget *getGFXTarget(); + GFXDevice *getGFXDevice() override; + GFXWindowTarget *getGFXTarget() override; - virtual void _setVideoMode(const GFXVideoMode &mode); - virtual const GFXVideoMode &getVideoMode(); - virtual bool clearFullscreen(); - virtual bool isFullscreen(); - virtual void _setFullscreen(const bool fullscreen); + void _setVideoMode(const GFXVideoMode &mode) override; + const GFXVideoMode &getVideoMode() override; + bool clearFullscreen() override; + bool isFullscreen() override; + void _setFullscreen(const bool fullscreen) override; - virtual bool setCaption(const char *cap); - virtual const char *getCaption(); + bool setCaption(const char *cap) override; + const char *getCaption() override; // Window Client Area Extent - virtual void setClientExtent( const Point2I newExtent ); - virtual const Point2I getClientExtent(); + void setClientExtent( const Point2I newExtent ) override; + const Point2I getClientExtent() override; // Window Bounds - virtual void setBounds(const RectI &newBounds); - virtual const RectI getBounds() const; + void setBounds(const RectI &newBounds) override; + const RectI getBounds() const override; // Window Position - virtual void setPosition( const Point2I newPosition ); - virtual const Point2I getPosition(); - virtual void centerWindow(); - virtual bool setSize(const Point2I &newSize); + void setPosition( const Point2I newPosition ) override; + const Point2I getPosition() override; + void centerWindow() override; + bool setSize(const Point2I &newSize) override; // Coordinate space conversion. - virtual Point2I clientToScreen( const Point2I& pos ); - virtual Point2I screenToClient( const Point2I& pos ); + Point2I clientToScreen( const Point2I& pos ) override; + Point2I screenToClient( const Point2I& pos ) override; - virtual bool isOpen(); - virtual bool isVisible(); - virtual bool isFocused(); - virtual bool isMinimized(); - virtual bool isMaximized(); + bool isOpen() override; + bool isVisible() override; + bool isFocused() override; + bool isMinimized() override; + bool isMaximized() override; - virtual void minimize(); - virtual void maximize(); - virtual void hide(); - virtual void show(); - virtual void close(); - virtual void restore(); - virtual void setFocus(); + void minimize() override; + void maximize() override; + void hide() override; + void show() override; + void close() override; + void restore() override; + void setFocus() override; - virtual void setMouseLocked(bool enable); - virtual bool isMouseLocked() const { return mMouseLocked; }; - virtual bool shouldLockMouse() const { return mShouldLockMouse; }; + void setMouseLocked(bool enable) override; + bool isMouseLocked() const override { return mMouseLocked; }; + bool shouldLockMouse() const override { return mShouldLockMouse; }; /// Set if relevant keypress events should be translated into character input events. - virtual void setKeyboardTranslation(const bool enabled); + void setKeyboardTranslation(const bool enabled) override; - virtual WindowId getWindowId(); + WindowId getWindowId() override; SDL_Window* getSDLWindow() const { return mWindowHandle; } - virtual PlatformWindow * getNextWindow() const + PlatformWindow * getNextWindow() const override { return mNextWindow; } @@ -187,6 +187,6 @@ public: /// Return the platform specific object needed to create or attach an /// accelerated graohics drawing context on or to the window - virtual void* getPlatformDrawable() const { return mWindowHandle; } + void* getPlatformDrawable() const override { return mWindowHandle; } }; #endif diff --git a/Engine/source/windowManager/sdl/sdlWindowMgr.h b/Engine/source/windowManager/sdl/sdlWindowMgr.h index 45cd3bfe3..d4c49095d 100644 --- a/Engine/source/windowManager/sdl/sdlWindowMgr.h +++ b/Engine/source/windowManager/sdl/sdlWindowMgr.h @@ -61,7 +61,7 @@ protected: friend class PlatformWindowSDL; friend class FileDialog; // TODO SDL REMOVE - virtual void _processCmdLineArgs(const S32 argc, const char **argv); + void _processCmdLineArgs(const S32 argc, const char **argv) override; /// Link the specified window into the window list. void linkWindow(PlatformWindowSDL *w); @@ -101,34 +101,34 @@ public: PlatformWindowManagerSDL(); ~PlatformWindowManagerSDL(); - virtual RectI getPrimaryDesktopArea(); - virtual S32 getDesktopBitDepth(); - virtual Point2I getDesktopResolution(); + RectI getPrimaryDesktopArea() override; + S32 getDesktopBitDepth() override; + Point2I getDesktopResolution() override; - virtual S32 findFirstMatchingMonitor(const char* name); - virtual U32 getMonitorCount(); - virtual const char* getMonitorName(U32 index); - virtual RectI getMonitorRect(U32 index); - virtual RectI getMonitorUsableRect(U32 index); - virtual U32 getMonitorModeCount(U32 monitorIndex); - virtual const String getMonitorMode(U32 monitorIndex, U32 modeIndex); - virtual const String getMonitorDesktopMode(U32 monitorIndex); + S32 findFirstMatchingMonitor(const char* name) override; + U32 getMonitorCount() override; + const char* getMonitorName(U32 index) override; + RectI getMonitorRect(U32 index) override; + RectI getMonitorUsableRect(U32 index) override; + U32 getMonitorModeCount(U32 monitorIndex) override; + const String getMonitorMode(U32 monitorIndex, U32 modeIndex) override; + const String getMonitorDesktopMode(U32 monitorIndex) override; - virtual void getMonitorRegions(Vector ®ions); - virtual PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode); - virtual void getWindows(VectorPtr &windows); + void getMonitorRegions(Vector ®ions) override; + PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode) override; + void getWindows(VectorPtr &windows) override; - virtual void setParentWindow(void* newParent); - virtual void* getParentWindow(); + void setParentWindow(void* newParent) override; + void* getParentWindow() override; - virtual PlatformWindow *getWindowById(WindowId id); - virtual PlatformWindow *getFirstWindow(); - virtual PlatformWindow* getFocusedWindow(); + PlatformWindow *getWindowById(WindowId id) override; + PlatformWindow *getFirstWindow() override; + PlatformWindow* getFocusedWindow() override; - virtual void lowerCurtain(); - virtual void raiseCurtain(); + void lowerCurtain() override; + void raiseCurtain() override; - virtual void setDisplayWindow(bool set) { mDisplayWindow = set; } + void setDisplayWindow(bool set) override { mDisplayWindow = set; } /// Stores the input state so that the event loop will fire a check if we need /// to change how keyboard input is being handled. diff --git a/Engine/source/windowManager/win32/win32Window.h b/Engine/source/windowManager/win32/win32Window.h index 638cc3b19..2445c08d1 100644 --- a/Engine/source/windowManager/win32/win32Window.h +++ b/Engine/source/windowManager/win32/win32Window.h @@ -136,7 +136,7 @@ public: return mWindowHandle; } - virtual void* getSystemWindow(const WindowSystem system); + void* getSystemWindow(const WindowSystem system) override; HMENU &getMenuHandle() { @@ -161,57 +161,57 @@ public: /// Allow windows to translate messages. Used for accelerators. bool translateMessage(MSG &msg); - virtual GFXDevice *getGFXDevice(); - virtual GFXWindowTarget *getGFXTarget(); + GFXDevice *getGFXDevice() override; + GFXWindowTarget *getGFXTarget() override; - virtual void _setVideoMode(const GFXVideoMode &mode); - virtual const GFXVideoMode &getVideoMode(); - virtual bool clearFullscreen(); - virtual bool isFullscreen(); - virtual void _setFullscreen(const bool fullscreen); + void _setVideoMode(const GFXVideoMode &mode) override; + const GFXVideoMode &getVideoMode() override; + bool clearFullscreen() override; + bool isFullscreen() override; + void _setFullscreen(const bool fullscreen) override; - virtual bool setCaption(const char *cap); - virtual const char *getCaption(); + bool setCaption(const char *cap) override; + const char *getCaption() override; // Window Client Area Extent - virtual void setClientExtent( const Point2I newExtent ); - virtual const Point2I getClientExtent(); + void setClientExtent( const Point2I newExtent ) override; + const Point2I getClientExtent() override; // Window Bounds - virtual void setBounds(const RectI &newBounds); - virtual const RectI getBounds() const; + void setBounds(const RectI &newBounds) override; + const RectI getBounds() const override; // Window Position - virtual void setPosition( const Point2I newPosition ); - virtual const Point2I getPosition(); - virtual void centerWindow(); - virtual bool setSize(const Point2I &newSize); + void setPosition( const Point2I newPosition ) override; + const Point2I getPosition() override; + void centerWindow() override; + bool setSize(const Point2I &newSize) override; // Coordinate space conversion. - virtual Point2I clientToScreen( const Point2I& pos ); - virtual Point2I screenToClient( const Point2I& pos ); + Point2I clientToScreen( const Point2I& pos ) override; + Point2I screenToClient( const Point2I& pos ) override; - virtual bool isOpen(); - virtual bool isVisible(); - virtual bool isFocused(); - virtual bool isMinimized(); - virtual bool isMaximized(); + bool isOpen() override; + bool isVisible() override; + bool isFocused() override; + bool isMinimized() override; + bool isMaximized() override; - virtual void minimize(); - virtual void maximize(); - virtual void hide(); - virtual void show(); - virtual void close(); - virtual void restore(); - virtual void setFocus(); + void minimize() override; + void maximize() override; + void hide() override; + void show() override; + void close() override; + void restore() override; + void setFocus() override; - virtual void setMouseLocked(bool enable); - virtual bool isMouseLocked() const { return mMouseLocked; }; - virtual bool shouldLockMouse() const { return mShouldLockMouse; }; + void setMouseLocked(bool enable) override; + bool isMouseLocked() const override { return mMouseLocked; }; + bool shouldLockMouse() const override { return mShouldLockMouse; }; - virtual WindowId getWindowId(); + WindowId getWindowId() override; - virtual PlatformWindow * getNextWindow() const + PlatformWindow * getNextWindow() const override { return mNextWindow; } @@ -227,6 +227,6 @@ public: /// Return the platform specific object needed to create or attach an /// accelerated graohics drawing context on or to the window - virtual void* getPlatformDrawable() const { return mWindowHandle; } + void* getPlatformDrawable() const override { return mWindowHandle; } }; #endif