diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index 5f2d9bfe0c7..b7d326920ca 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -87,7 +87,7 @@ class AABTreeClass : public W3DMPO, public RefCountClass AABTreeClass(); AABTreeClass(AABTreeBuilderClass * builder); AABTreeClass(const AABTreeClass & that); - ~AABTreeClass(); + virtual ~AABTreeClass() override; void Load_W3D(ChunkLoadClass & cload); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 80597d728bb..9178700bc41 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -209,15 +209,15 @@ class AggregatePrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name() const { return m_pDefinition->Get_Name (); } - virtual int Get_Class_ID() const { return m_pDefinition->Class_ID (); } - virtual RenderObjClass * Create () { return m_pDefinition->Create (); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return m_pDefinition->Get_Name (); } + virtual int Get_Class_ID() const override { return m_pDefinition->Class_ID (); } + virtual RenderObjClass * Create () override { return m_pDefinition->Create (); } + virtual void DeleteSelf() override { delete this; } virtual AggregateDefClass * Get_Definition () const { return m_pDefinition; } virtual void Set_Definition (AggregateDefClass *pdef) { m_pDefinition = pdef; } protected: - virtual ~AggregatePrototypeClass () { delete m_pDefinition; } + virtual ~AggregatePrototypeClass () override { delete m_pDefinition; } private: @@ -237,8 +237,8 @@ class AggregateLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_AGGREGATE; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_AGGREGATE; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h index 454e7b22d6d..5acbfeb5235 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -47,6 +47,6 @@ class Bitmap2DObjClass : public DynamicScreenMeshClass bool center, bool additive, bool colorizable = false, bool ignore_alpha = false); Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {} - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_BITMAP2D; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_BITMAP2D; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index 22338a1fdcb..98fdc43e32a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -123,15 +123,15 @@ class CollectionPrototypeClass : public W3DMPO, public PrototypeClass public: CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); } - virtual const char * Get_Name() const { return ColDef->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_COLLECTION; } - virtual RenderObjClass * Create() { return NEW_REF( CollectionClass, (*ColDef)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return ColDef->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_COLLECTION; } + virtual RenderObjClass * Create() override { return NEW_REF( CollectionClass, (*ColDef)); } + virtual void DeleteSelf() override { delete this; } CollectionDefClass * ColDef; protected: - virtual ~CollectionPrototypeClass() { delete ColDef; } + virtual ~CollectionPrototypeClass() override { delete ColDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index c334a23a07c..8fcc589542d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -60,11 +60,11 @@ class CollectionClass : public CompositeRenderObjClass CollectionClass(const CollectionDefClass & def); CollectionClass(const CollectionClass & src); CollectionClass & operator = (const CollectionClass &); - virtual ~CollectionClass(); - virtual RenderObjClass * Clone() const; + virtual ~CollectionClass() override; + virtual RenderObjClass * Clone() const override; - virtual int Class_ID() const; - virtual int Get_Num_Polys() const; + virtual int Class_ID() const override; + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Proxy interface @@ -75,48 +75,48 @@ class CollectionClass : public CompositeRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// virtual int Snap_Point_Count(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: void Free(); - void Update_Sub_Object_Transforms(); + virtual void Update_Sub_Object_Transforms() override; DynamicVectorClass ProxyList; DynamicVectorClass SubObjects; @@ -135,8 +135,8 @@ class CollectionLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_COLLECTION; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_COLLECTION; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern CollectionLoaderClass _CollectionLoader; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h index e53a2fb7290..e5a72d73bbc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -52,33 +52,33 @@ class CompositeRenderObjClass : public RenderObjClass CompositeRenderObjClass(); CompositeRenderObjClass(const CompositeRenderObjClass & that); - virtual ~CompositeRenderObjClass(); + virtual ~CompositeRenderObjClass() override; CompositeRenderObjClass & operator = (const CompositeRenderObjClass & that); - virtual void Restart(); + virtual void Restart() override; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual const char * Get_Base_Model_Name () const; - virtual void Set_Base_Model_Name (const char *name); - virtual int Get_Num_Polys() const; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual const char * Get_Base_Model_Name () const override; + virtual void Set_Base_Model_Name (const char *name) override; + virtual int Get_Num_Polys() const override; + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere = ObjSphere; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box = ObjBox; } - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere = ObjSphere; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box = ObjBox; } + virtual void Update_Obj_Space_Bounding_Volumes() override; - virtual void Set_User_Data(void *value, bool recursive = false); + virtual void Set_User_Data(void *value, bool recursive = false) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h index f30ec4c503a..3d48a36426e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -173,7 +173,7 @@ class DecalGeneratorClass : public ProjectorClass protected: DecalGeneratorClass(uint32 id,DecalSystemClass * system); - ~DecalGeneratorClass(); + virtual ~DecalGeneratorClass() override; /* ** Logical Decal ID, DecalSystem that this generator is tied to @@ -215,19 +215,19 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass MultiFixedPoolDecalSystemClass(uint32 num_pools, const uint32 *pool_sizes); MultiFixedPoolDecalSystemClass(const MultiFixedPoolDecalSystemClass & that); - virtual ~MultiFixedPoolDecalSystemClass(); + virtual ~MultiFixedPoolDecalSystemClass() override; // This clears the slot in addition to locking the generator, thus preventing any decal id // collisions (since any decal previously in that slot will have the same id as the new one). - virtual DecalGeneratorClass * Lock_Decal_Generator(); + virtual DecalGeneratorClass * Lock_Decal_Generator() override; // This will register the decal in the system in the appropriate pool and slot (determined by // the generator's pool and slot ids), removing any decal which may have been there before. - virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator); + virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator) override; // This notifies the system that a mesh which has decals on it was destroyed - therefore we // need to remove the mesh from our list to avoid dangling pointers. - virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh); + virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh) override; // Not part of the DecalSystemClass interface - this function removes any decal currently in // the given slot in the given pool. @@ -247,7 +247,7 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass ** can set them before calling Lock_Decal_Generator() (which is where this function is called). ** We do it this way to avoid needing to override Lock_Decal_Generator(). */ - virtual uint32 Generate_Decal_Id() { return encode_decal_id(Generator_PoolID, Generator_SlotID); } + virtual uint32 Generate_Decal_Id() override { return encode_decal_id(Generator_PoolID, Generator_SlotID); } uint32 Generator_PoolID; // These should be set before calling Lock_Decal_Generator() uint32 Generator_SlotID; // These should be set before calling Lock_Decal_Generator() diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h index bdc79198c09..f973fa96e37 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h @@ -64,28 +64,28 @@ class DistLODClass : public CompositeRenderObjClass DistLODClass(const DistLODDefClass & desc); DistLODClass(const DistLODClass & that); - virtual ~DistLODClass(); - virtual RenderObjClass * Clone() const { return W3DNEW DistLODClass(*this); } - virtual int Class_ID() const { return CLASSID_DISTLOD; } - virtual int Get_Num_Polys() const; + virtual ~DistLODClass() override; + virtual RenderObjClass * Clone() const override { return W3DNEW DistLODClass(*this); } + virtual int Class_ID() const override { return CLASSID_DISTLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Access each LOD individually through Get_Sub_Object. ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation @@ -94,36 +94,36 @@ class DistLODClass : public CompositeRenderObjClass // animation-compatible) so the bone query functions simply pass to the top // LOD. ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); - virtual void Set_Animation( HAnimClass * motion, float frame, int anim_mode = ANIM_MODE_MANUAL); - virtual void Set_Animation( HAnimClass * motion0,float frame0,HAnimClass * motion1,float frame1,float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); - virtual HAnimClass * Peek_Animation(); - virtual int Get_Num_Bones(); - virtual const char * Get_Bone_Name(int bone_index); - virtual int Get_Bone_Index(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(int boneindex); - virtual void Capture_Bone(int bindex); - virtual void Release_Bone(int bindex); - virtual bool Is_Bone_Captured(int bindex) const; - virtual void Control_Bone(int bindex,const Matrix3D & tm,bool world_space_translation = false); + virtual void Set_Animation() override; + virtual void Set_Animation( HAnimClass * motion, float frame, int anim_mode = ANIM_MODE_MANUAL) override; + virtual void Set_Animation( HAnimClass * motion0,float frame0,HAnimClass * motion1,float frame1,float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; + virtual HAnimClass * Peek_Animation() override; + virtual int Get_Num_Bones() override; + virtual const char * Get_Bone_Name(int bone_index) override; + virtual int Get_Bone_Index(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(int boneindex) override; + virtual void Capture_Bone(int bindex) override; + virtual void Release_Bone(int bindex) override; + virtual bool Is_Bone_Captured(int bindex) const override; + virtual void Control_Bone(int bindex,const Matrix3D & tm,bool world_space_translation = false) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing // Collision tests are performed on the top-level LOD. ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; ///////////////////////////////////////////////////////////////////////////// // DistLOD Interface @@ -163,8 +163,8 @@ class DistLODLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_LODMODEL; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_LODMODEL; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -220,13 +220,13 @@ class DistLODPrototypeClass : public W3DMPO, public PrototypeClass public: DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DISTLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DISTLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } protected: - virtual ~DistLODPrototypeClass() { delete Definition; } + virtual ~DistLODPrototypeClass() override { delete Definition; } private: DistLODDefClass * Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h index 438268dfae9..7b7f5eee52f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h @@ -90,7 +90,7 @@ class DLNodeClass : public W3DMPO DLListClass* list; public: DLNodeClass() : succ(0), pred(0), list(0) {} - ~DLNodeClass() { Remove(); } + virtual ~DLNodeClass() override { Remove(); } void Insert_Before(DLNodeClass* n) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 27c1179c249..0d9a7a716ac 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -76,7 +76,7 @@ class DX8PolygonRendererClass : public MultiListObjectClass bool strip, unsigned pass); DX8PolygonRendererClass(const DX8PolygonRendererClass& src,MeshModelClass* mmc_); - ~DX8PolygonRendererClass(); + virtual ~DX8PolygonRendererClass() override; void Render(/*const Matrix3D & tm,*/int base_vertex_offset); void Render_Sorted(/*const Matrix3D & tm,*/int base_vertex_offset,const SphereClass & bounding_sphere); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 67d5077e1b2..84b8ebd4e25 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -99,7 +99,7 @@ class DX8TextureTrackerClass : public TextureTrackerClass { } - virtual void Recreate() const + virtual void Recreate() const override { WWASSERT(Texture->Peek_D3D_Base_Texture()==nullptr); Texture->Poke_Texture @@ -136,7 +136,7 @@ class DX8ZTextureTrackerClass : public TextureTrackerClass { } - virtual void Recreate() const + virtual void Recreate() const override { WWASSERT(Texture->Peek_D3D_Base_Texture()==nullptr); Texture->Poke_Texture diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index 37f77948ae1..e9769753273 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -59,12 +59,12 @@ class DynamicMeshModel : public MeshGeometryClass DynamicMeshModel(unsigned int max_polys, unsigned int max_verts); DynamicMeshModel(unsigned int max_polys, unsigned int max_verts, MaterialInfoClass *mat_info); DynamicMeshModel(const DynamicMeshModel &src); - ~DynamicMeshModel(); + virtual ~DynamicMeshModel() override; // Inherited from MeshGeometryClass virtual void Compute_Plane_Equations(); virtual void Compute_Vertex_Normals(); - virtual void Compute_Bounds(Vector3 * verts); + virtual void Compute_Bounds(Vector3 * verts) override; // Reset mesh (with existing max polygon and max vertex counts) void Reset(); @@ -135,31 +135,31 @@ class DynamicMeshClass : public RenderObjClass { DynamicMeshClass( int max_poly, int max_vert); DynamicMeshClass( int max_poly, int max_vert, MaterialInfoClass *mat_info); DynamicMeshClass( const DynamicMeshClass & src); - virtual ~DynamicMeshClass(); + virtual ~DynamicMeshClass() override; // Inherited from RenderObjClass: - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DYNAMESH; } - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DYNAMESH; } + virtual void Render(RenderInfoClass & rinfo) override; virtual MaterialInfoClass *Peek_Material_Info() { return Model->Peek_Material_Info(); } - virtual MaterialInfoClass *Get_Material_Info() { return Model->Get_Material_Info(); } + virtual MaterialInfoClass *Get_Material_Info() override { return Model->Get_Material_Info(); } virtual void Set_Material_Info(MaterialInfoClass *mat_info) { Model->Set_Material_Info(mat_info); } // all render objects should be able to tell you how many polygons were // used in the making of the render object. - virtual int Get_Num_Polys() const { return PolyCount; } + virtual int Get_Num_Polys() const override { return PolyCount; } // return the number of vertices used by this renderobject virtual int Get_Num_Vertices() const { return VertCount; } // Get and set static sort level - virtual int Get_Sort_Level() const { return SortLevel; } - virtual void Set_Sort_Level(int level) { SortLevel = level; if(level != SORT_LEVEL_NONE) Disable_Sort();} + virtual int Get_Sort_Level() const override { return SortLevel; } + virtual void Set_Sort_Level(int level) override { SortLevel = level; if(level != SORT_LEVEL_NONE) Disable_Sort();} // object space bounding volumes - virtual inline void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual inline void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual inline void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual inline void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; // Set the vertex material for the current triangle int Set_Vertex_Material( int idx, int pass = 0); @@ -541,24 +541,24 @@ class DynamicScreenMeshClass : public DynamicMeshClass { // constructor and destructor DynamicScreenMeshClass( int max_poly, int max_vert, float aspect = 1.0f ) : DynamicMeshClass( max_poly, max_vert), Aspect( aspect ) {} DynamicScreenMeshClass( const DynamicScreenMeshClass & src) : DynamicMeshClass(src), Aspect(src.Aspect) {} - virtual ~DynamicScreenMeshClass() {} + virtual ~DynamicScreenMeshClass() override {} // function to clone a dynamic screen mesh class - virtual RenderObjClass * Clone() const { return NEW_REF( DynamicScreenMeshClass, (*this)); } + virtual RenderObjClass * Clone() const override { return NEW_REF( DynamicScreenMeshClass, (*this)); } // class id of this render object - virtual int Class_ID() const { return CLASSID_DYNASCREENMESH; } + virtual int Class_ID() const override { return CLASSID_DYNASCREENMESH; } // Remap locations to match a screen - virtual void Location( float x, float y, float z = 0.0f); + virtual void Location( float x, float y, float z = 0.0f) override; // For moving a vertex after the DynaMesh has already been created. - virtual void Move_Vertex(int index, float x, float y, float z = 0.0f); + virtual void Move_Vertex(int index, float x, float y, float z = 0.0f) override; // Set position - virtual void Set_Position(const Vector3 &v); + virtual void Set_Position(const Vector3 &v) override; - virtual void Reset(); + virtual void Reset() override; virtual void Set_Aspect(float aspect) { Aspect=aspect; }; @@ -570,5 +570,5 @@ class DynamicScreenMeshClass : public DynamicMeshClass { float Aspect; // tells when the triangle needs to be back flipped - virtual bool Flip_Face() { return !DynamicMeshClass::Flip_Face(); } + virtual bool Flip_Face() override { return !DynamicMeshClass::Flip_Face(); } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h index f34f8e4bd05..5d90c75de5f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -73,7 +73,7 @@ class Font3DDataClass : public RefCountClass { ** and Destructor */ Font3DDataClass( const char *filename ); - ~Font3DDataClass(); + virtual ~Font3DDataClass() override; // the name of the font data (used for name matching and the like.) char *Name; @@ -149,7 +149,7 @@ class Font3DInstanceClass : public RefCountClass { ** and Destructor */ Font3DInstanceClass( const char *filename ); - ~Font3DInstanceClass(); + virtual ~Font3DInstanceClass() override; /* ** access texture material diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index 9c288e1a107..440551eaa41 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -76,12 +76,12 @@ class HAnimClass : public RefCountClass, public HashableClass HAnimClass() : EmbeddedSoundBoneIndex (EMBEDDED_SOUND_BONE_INDEX_NOT_SET) { } - virtual ~HAnimClass() { } + virtual ~HAnimClass() override { } virtual const char * Get_Name() const = 0; virtual const char * Get_HName() const = 0; - virtual const char * Get_Key() { return Get_Name(); } + virtual const char * Get_Key() override { return Get_Name(); } virtual int Get_Num_Frames() = 0; virtual float Get_Frame_Rate() = 0; @@ -135,9 +135,9 @@ class PivotMapClass : public DynamicVectorClass, public RefCountClass class NamedPivotMapClass : public PivotMapClass { public: - ~NamedPivotMapClass(); + virtual ~NamedPivotMapClass() override; - virtual NamedPivotMapClass * As_Named_Pivot_Map() { return this; } + virtual NamedPivotMapClass * As_Named_Pivot_Map() override { return this; } // add a name & weight to the arrays void Add(const char *Name, float Weight); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index 23e524ec626..a64805d00fd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -75,31 +75,31 @@ class HCompressedAnimClass : public HAnimClass }; HCompressedAnimClass(); - ~HCompressedAnimClass(); + virtual ~HCompressedAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + virtual const char * Get_Name() const override { return Name; } + virtual const char * Get_HName() const override { return HierarchyName; } + virtual int Get_Num_Frames() override { return NumFrames; } + virtual float Get_Frame_Rate() override { return FrameRate; } + virtual float Get_Total_Time() override { return (float)NumFrames / FrameRate; } int Get_Flavor() { return Flavor; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + virtual bool Is_Node_Motion_Present(int pividx) override; + virtual int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + virtual bool Has_X_Translation (int pividx) override; + virtual bool Has_Y_Translation (int pividx) override; + virtual bool Has_Z_Translation (int pividx) override; + virtual bool Has_Rotation (int pividx) override; + virtual bool Has_Visibility (int pividx) override; private: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index b38bca37b90..8a2d61d9745 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -79,7 +79,7 @@ class HTreeClass : public W3DMPO HTreeClass(); HTreeClass(const HTreeClass & src); - ~HTreeClass(); + virtual ~HTreeClass() override; int Load_W3D(ChunkLoadClass & cload); void Init_Default(); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h index ded4722a7dc..b92316b7abb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -54,7 +54,7 @@ class LayerClass : public LayerNodeClass LayerClass(); LayerClass(SceneClass * s,CameraClass * c,bool clear = false,bool clearz = false,const Vector3 & color = Vector3(0,0,0)); LayerClass(const LayerClass & src); - ~LayerClass(); + virtual ~LayerClass() override; /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 68b9e39e883..3fd1db0c887 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -62,24 +62,24 @@ class Line3DClass : public W3DMPO, public RenderObjClass float r, float g, float b, float opacity = 1.0f); Line3DClass(const Line3DClass & src); Line3DClass & operator = (const Line3DClass & that); - virtual ~Line3DClass(); - virtual RenderObjClass * Clone() const; + virtual ~Line3DClass() override; + virtual RenderObjClass * Clone() const override; // class id of this render object - virtual int Class_ID() const { return CLASSID_LINE3D; } + virtual int Class_ID() const override { return CLASSID_LINE3D; } - virtual void Render(RenderInfoClass & rfinfo); + virtual void Render(RenderInfoClass & rfinfo) override; // scale the 3D line symmetrically about its center. - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; // returns the number of polygons in the render object - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; // Get the object space bounding volumes - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; // The following functions are unique to Line3DClass: @@ -96,8 +96,8 @@ class Line3DClass : public W3DMPO, public RenderObjClass void Set_Opacity(float opacity); // For non-opaque lines, allow them to render last. - void Set_Sort_Level(int level) { SortLevel = level; } - int Get_Sort_Level() const { return SortLevel; } + virtual void Set_Sort_Level(int level) override { SortLevel = level; } + virtual int Get_Sort_Level() const override { return SortLevel; } protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index c57b97e8d5a..74bffa1745b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -70,7 +70,7 @@ class MaterialInfoClass : public W3DMPO, public RefCountClass MaterialInfoClass(); MaterialInfoClass(const MaterialInfoClass & src); - ~MaterialInfoClass(); + virtual ~MaterialInfoClass() override; MaterialInfoClass * Clone() const; void Reset() { Free(); } diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h index 0a5a21cbaa1..2d969892480 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -65,7 +65,7 @@ class MaterialPassClass : public RefCountClass public: MaterialPassClass(); - ~MaterialPassClass(); + virtual ~MaterialPassClass() override; /// MW: Had to make this virtual so app can perform direct/custom D3D setup. virtual void Install_Materials() const; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 82e110a877c..f2a098c19b3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -228,6 +228,6 @@ class SegmentGroupClass : public PointGroupClass { public: SegmentGroupClass(); - virtual ~SegmentGroupClass(); + virtual ~SegmentGroupClass() override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h index 3ab5126bb09..d5e57566220 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h @@ -164,7 +164,7 @@ class LERPAnimationChannelClass : public PrimitiveAnimationChannelClass ///////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////// - virtual T Evaluate (float time); + virtual T Evaluate (float time) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index bebe9cba8e4..c279eac95af 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp @@ -92,15 +92,15 @@ class HModelPrototypeClass : public W3DMPO, public PrototypeClass public: HModelPrototypeClass(HModelDefClass * def) { HModelDef = def; assert(HModelDef); } - virtual const char * Get_Name() const { return HModelDef->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create() { return NEW_REF( HLodClass, (*HModelDef) ); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return HModelDef->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override { return NEW_REF( HLodClass, (*HModelDef) ); } + virtual void DeleteSelf() override { delete this; } HModelDefClass * HModelDef; protected: - virtual ~HModelPrototypeClass() { delete HModelDef; } + virtual ~HModelPrototypeClass() override { delete HModelDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 50768055931..1b5b793e3d9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -108,15 +108,15 @@ class PrimitivePrototypeClass : public W3DMPO, public PrototypeClass public: PrimitivePrototypeClass(RenderObjClass * proto); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } RenderObjClass * Proto; protected: - virtual ~PrimitivePrototypeClass(); + virtual ~PrimitivePrototypeClass() override; }; /* @@ -152,16 +152,16 @@ class MeshLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_MESH; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_MESH; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; class HModelLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_HMODEL; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_HMODEL; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 48c707ccf29..75aabf421ce 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -76,7 +76,7 @@ class FontCharsClass : public W3DMPO, public RefCountClass public: FontCharsClass(); - ~FontCharsClass(); + virtual ~FontCharsClass() override; // TR: Hack for unicode font support FontCharsClass *AlternateUnicodeFont; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index fc3c50da447..6df59cb46c8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -1194,9 +1194,9 @@ void RenderObjClass::Add_Dependencies_To_List class RenderObjPersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index 9fc32ca546a..65b6e139810 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -218,7 +218,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL RenderObjClass(); RenderObjClass(const RenderObjClass & src); RenderObjClass & operator = (const RenderObjClass &); - virtual ~RenderObjClass() { if (RenderHook) delete RenderHook; } + virtual ~RenderObjClass() override { if (RenderHook) delete RenderHook; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -485,9 +485,9 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; // Application-specific render hook: RenderHookClass * Get_Render_Hook() { return RenderHook; } diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index d392a5eee9e..8aaa5ee47c4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -111,45 +111,45 @@ class RingRenderObjClass : public RenderObjClass RingRenderObjClass(const W3dRingStruct & def); RingRenderObjClass(const RingRenderObjClass & src); RingRenderObjClass & operator = (const RingRenderObjClass &); - ~RingRenderObjClass(); + virtual ~RingRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LODBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LODBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(); - virtual int Get_Num_Polys() const; - virtual const char *Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char *Get_Name() const override; + virtual void Set_Name(const char * name) override; unsigned int Get_Flags() {return Flags;} void Set_Flags(unsigned int flags) { Flags = flags; } @@ -317,8 +317,8 @@ inline const AABoxClass & RingRenderObjClass::Get_Box() class RingLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_RING; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_RING; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -332,16 +332,16 @@ class RingPrototypeClass : public W3DMPO, public PrototypeClass RingPrototypeClass (); RingPrototypeClass (RingRenderObjClass *ring); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } bool Load (ChunkLoadClass &cload); bool Save (ChunkSaveClass &csave); protected: - ~RingPrototypeClass (); + virtual ~RingPrototypeClass () override; private: W3dRingStruct Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index 44844a9e92f..86ac8b635d1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -54,7 +54,7 @@ class SegmentedLineClass : public RenderObjClass SegmentedLineClass(); SegmentedLineClass(const SegmentedLineClass & src); SegmentedLineClass & operator = (const SegmentedLineClass &that); - virtual ~SegmentedLineClass(); + virtual ~SegmentedLineClass() override; void Reset_Line(); @@ -117,33 +117,33 @@ class SegmentedLineClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_SEGLINE; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_SEGLINE; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc @@ -153,7 +153,7 @@ class SegmentedLineClass : public RenderObjClass /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index a9f4850cfb1..d787c45a503 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -52,6 +52,6 @@ class SnapPointsClass : public DynamicVectorClass, public RefCountClass protected: - ~SnapPointsClass() {} + virtual ~SnapPointsClass() override {} }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 1a3fc5d5c3c..a632d8478de 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -86,7 +86,7 @@ class SoundRenderObjClass : public RenderObjClass /////////////////////////////////////////////////////////// SoundRenderObjClass (); SoundRenderObjClass (const SoundRenderObjClass &src); - virtual ~SoundRenderObjClass (); + virtual ~SoundRenderObjClass () override; /////////////////////////////////////////////////////////// // Public operators @@ -100,20 +100,20 @@ class SoundRenderObjClass : public RenderObjClass // // From RenderObjClass // - RenderObjClass * Clone () const { return W3DNEW SoundRenderObjClass (*this); } - int Class_ID () const { return CLASSID_SOUND; } - const char * Get_Name () const { return Name; } - void Set_Name (const char *name) { Name = name; } - void Render (RenderInfoClass &rinfo) { } - void On_Frame_Update (); - void Set_Hidden (int onoff); - void Set_Visible (int onoff); - void Set_Animation_Hidden (int onoff); - void Set_Force_Visible (int onoff); - void Notify_Added (SceneClass *scene); - void Notify_Removed (SceneClass *scene); - void Set_Transform(const Matrix3D &m); - void Set_Position(const Vector3 &v); + virtual RenderObjClass * Clone () const override { return W3DNEW SoundRenderObjClass (*this); } + virtual int Class_ID () const override { return CLASSID_SOUND; } + virtual const char * Get_Name () const override { return Name; } + virtual void Set_Name (const char *name) override { Name = name; } + virtual void Render (RenderInfoClass &rinfo) override { } + virtual void On_Frame_Update () override; + virtual void Set_Hidden (int onoff) override; + virtual void Set_Visible (int onoff) override; + virtual void Set_Animation_Hidden (int onoff) override; + virtual void Set_Force_Visible (int onoff) override; + virtual void Notify_Added (SceneClass *scene) override; + virtual void Notify_Removed (SceneClass *scene) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; // // SoundRenderObjClass specific @@ -165,7 +165,7 @@ class SoundRenderObjDefClass : public RefCountClass SoundRenderObjDefClass (); SoundRenderObjDefClass (SoundRenderObjClass &render_obj); SoundRenderObjDefClass (const SoundRenderObjDefClass &src); - virtual ~SoundRenderObjDefClass (); + virtual ~SoundRenderObjDefClass () override; /////////////////////////////////////////////////////////// // Public operators @@ -236,16 +236,16 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass /////////////////////////////////////////////////////////// // Public methods /////////////////////////////////////////////////////////// - const char * Get_Name() const { return Definition->Get_Name (); } - int Get_Class_ID() const { return RenderObjClass::CLASSID_SOUND; } - RenderObjClass * Create () { return Definition->Create (); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name (); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_SOUND; } + virtual RenderObjClass * Create () override { return Definition->Create (); } + virtual void DeleteSelf() override { delete this; } SoundRenderObjDefClass * Peek_Definition () const { return Definition; } void Set_Definition (SoundRenderObjDefClass *def) { REF_PTR_SET (Definition, def); } protected: - virtual ~SoundRenderObjPrototypeClass () { REF_PTR_RELEASE (Definition); } + virtual ~SoundRenderObjPrototypeClass () override { REF_PTR_RELEASE (Definition); } private: @@ -264,8 +264,8 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass class SoundRenderObjLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_SOUNDROBJ; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &cload); + virtual int Chunk_Type () override { return W3D_CHUNK_SOUNDROBJ; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 65710b12a0b..4e88eddf5ba 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -68,7 +68,7 @@ struct AlphaVectorStruct class AlphaVectorChannel : public PrimitiveAnimationChannelClass { public: - AlphaVectorStruct Evaluate (float time) + virtual AlphaVectorStruct Evaluate (float time) override { int key_count = m_Data.Count (); AlphaVectorStruct value = m_Data[key_count - 1].Get_Value (); @@ -238,45 +238,45 @@ class SphereRenderObjClass : public RenderObjClass SphereRenderObjClass(const W3dSphereStruct & def); SphereRenderObjClass(const SphereRenderObjClass & src); SphereRenderObjClass & operator = (const SphereRenderObjClass &); - ~SphereRenderObjClass(); + virtual ~SphereRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; - - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LODBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; + + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LODBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; unsigned int Get_Flags() { return Flags; } void Set_Flags(unsigned int flags) { Flags = flags; } @@ -340,7 +340,7 @@ class SphereRenderObjClass : public RenderObjClass protected: virtual void update_cached_box(); - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Update_On_Visibility(); // Initialization stuff @@ -428,8 +428,8 @@ inline const AABoxClass & SphereRenderObjClass::Get_Box() class SphereLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_SPHERE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_SPHERE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -442,16 +442,16 @@ class SpherePrototypeClass : public W3DMPO, public PrototypeClass SpherePrototypeClass (); SpherePrototypeClass (SphereRenderObjClass *sphere); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } bool Load (ChunkLoadClass &cload); bool Save (ChunkSaveClass &csave); protected: - ~SpherePrototypeClass (); + virtual ~SpherePrototypeClass () override; private: W3dSphereStruct Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 882798ec60b..0095b60a746 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -64,10 +64,10 @@ class DefaultStaticSortListClass : public StaticSortListClass /////////////////////////////////////////////////////////////////////////////////// // Construction. DefaultStaticSortListClass(); - virtual ~DefaultStaticSortListClass(); + virtual ~DefaultStaticSortListClass() override; - virtual void Add_To_List(RenderObjClass * robj, unsigned int sort_level); - virtual void Render_And_Clear(RenderInfoClass & rinfo); + virtual void Add_To_List(RenderObjClass * robj, unsigned int sort_level) override; + virtual void Render_And_Clear(RenderInfoClass & rinfo) override; unsigned int Get_Min_Sort() const {return MinSort;}; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index 1d5c60153d1..c80432d7314 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -123,33 +123,33 @@ class StreakLineClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_SEGLINE; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_SEGLINE; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render( RenderInfoClass & rinfo ); + virtual void Render( RenderInfoClass & rinfo ) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc @@ -159,7 +159,7 @@ class StreakLineClass : public RenderObjClass /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; void Set_LocsWidthsColors( unsigned int num_points, Vector3 *locs, diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h index 2a0460ad30a..a12fe791acb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -74,7 +74,7 @@ class SurfaceClass : public W3DMPO, public RefCountClass // Create the surface from a D3D pointer SurfaceClass(IDirect3DSurface8 *d3d_surface); - ~SurfaceClass(); + virtual ~SurfaceClass() override; // Get surface description void Get_Description(SurfaceDescription &surface_desc); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h index 55a1eb05b58..d8a7fa3caeb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -101,7 +101,7 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult public: TexProjectClass(); - virtual ~TexProjectClass(); + virtual ~TexProjectClass() override; /* ** Material settings @@ -135,8 +135,8 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult ** 2 - call Set_Projection_Perspective -or- Set_Projection_Ortho ** 3 - call Set_Texture. */ - virtual void Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar); - virtual void Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar); + virtual void Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar) override; + virtual void Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar) override; void Set_Texture(TextureClass * texture); TextureClass * Get_Texture() const; @@ -181,7 +181,7 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult void Set_Flag(uint32 flag,bool onoff); bool Get_Flag(uint32 flag) const; - virtual void Update_WS_Bounding_Volume(); + virtual void Update_WS_Bounding_Volume() override; void Configure_Camera(CameraClass & camera); enum FlagsType diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h index ff76270f796..767e93625a8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -61,19 +61,19 @@ class TextDrawClass : public DynamicMeshClass ** Constructor and Destructor */ TextDrawClass( int max_chars ); - ~TextDrawClass(); + virtual ~TextDrawClass() override; // Set Coordinate Range void Set_Coordinate_Ranges( const Vector2 & param_ul, const Vector2 & param_lr, const Vector2 & dest_ul, const Vector2 & dest_lr ); // Reset all polys and verts - virtual void Reset(); + virtual void Reset() override; /* ** class id of this render object */ - virtual int Class_ID() const { return CLASSID_TEXTDRAW; } + virtual int Class_ID() const override { return CLASSID_TEXTDRAW; } /* ** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h index a2a9baf0e7a..3c810c79f88 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h @@ -96,7 +96,7 @@ class TextureBaseClass : public RefCountClass bool reducible=true ); - virtual ~TextureBaseClass(); + virtual ~TextureBaseClass() override; virtual TexAssetType Get_Asset_Type() const=0; @@ -315,12 +315,12 @@ class TextureClass : public TextureBaseClass ) : TextureBaseClass(width,height,mip_level_count,pool,rendertarget,allow_reduction), TextureFormat(format), Filter(mip_level_count) { } - virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_REGULAR; } - virtual void Init(); + virtual void Init() override; // Background texture loader will call this when texture has been loaded - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised // Get the surface of one of the mipmap levels (defaults to highest-resolution one) SurfaceClass *Get_Surface_Level(unsigned int level = 0); @@ -331,11 +331,11 @@ class TextureClass : public TextureBaseClass WW3DFormat Get_Texture_Format() const { return TextureFormat; } - virtual void Apply(unsigned int stage); + virtual void Apply(unsigned int stage) override; - virtual unsigned Get_Texture_Memory_Usage() const; + virtual unsigned Get_Texture_Memory_Usage() const override; - virtual TextureClass* As_TextureClass() { return this; } + virtual TextureClass* As_TextureClass() override { return this; } protected: @@ -360,17 +360,17 @@ class ZTextureClass : public TextureBaseClass WW3DZFormat Get_Texture_Format() const { return DepthStencilTextureFormat; } - virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_REGULAR; } - virtual void Init() {} + virtual void Init() override {} // Background texture loader will call this when texture has been loaded - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual void Apply(unsigned int stage); + virtual void Apply(unsigned int stage) override; IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0); - virtual unsigned Get_Texture_Memory_Usage() const; + virtual unsigned Get_Texture_Memory_Usage() const override; private: @@ -414,11 +414,11 @@ class CubeTextureClass : public TextureClass CubeTextureClass(IDirect3DBaseTexture8* d3d_texture); - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual TexAssetType Get_Asset_Type() const { return TEX_CUBEMAP; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_CUBEMAP; } - virtual CubeTextureClass* As_CubeTextureClass() { return this; } + virtual CubeTextureClass* As_CubeTextureClass() override { return this; } }; @@ -460,11 +460,11 @@ class VolumeTextureClass : public TextureClass VolumeTextureClass(IDirect3DBaseTexture8* d3d_texture); - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual TexAssetType Get_Asset_Type() const { return TEX_VOLUME; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_VOLUME; } - virtual VolumeTextureClass* As_VolumeTextureClass() { return this; } + virtual VolumeTextureClass* As_VolumeTextureClass() override { return this; } protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index a2a83eec2cc..f46cffff6ee 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -235,7 +235,7 @@ static class LoaderThreadClass : public ThreadClass LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name) {} #endif - void Thread_Function(); + virtual void Thread_Function() override; } _TextureLoadThread; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h index 19a2e370c56..0fe4b1f17eb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -272,19 +272,19 @@ class CubeTextureLoadTaskClass : public TextureLoadTaskClass public: CubeTextureLoadTaskClass(); - virtual void Destroy (); - virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority); - virtual void Deinit (); + virtual void Destroy () override; + virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority) override; + virtual void Deinit () override; protected: - virtual bool Begin_Compressed_Load (); - virtual bool Begin_Uncompressed_Load (); + virtual bool Begin_Compressed_Load () override; + virtual bool Begin_Uncompressed_Load () override; - virtual bool Load_Compressed_Mipmap (); + virtual bool Load_Compressed_Mipmap () override; // virtual bool Load_Uncompressed_Mipmap(); - virtual void Lock_Surfaces (); - virtual void Unlock_Surfaces (); + virtual void Lock_Surfaces () override; + virtual void Unlock_Surfaces () override; private: unsigned char* Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level); @@ -301,18 +301,18 @@ class VolumeTextureLoadTaskClass : public TextureLoadTaskClass public: VolumeTextureLoadTaskClass(); - virtual void Destroy (); - virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority); + virtual void Destroy () override; + virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority) override; protected: - virtual bool Begin_Compressed_Load (); - virtual bool Begin_Uncompressed_Load (); + virtual bool Begin_Compressed_Load () override; + virtual bool Begin_Uncompressed_Load () override; - virtual bool Load_Compressed_Mipmap (); + virtual bool Load_Compressed_Mipmap () override; // virtual bool Load_Uncompressed_Mipmap(); - virtual void Lock_Surfaces (); - virtual void Unlock_Surfaces (); + virtual void Lock_Surfaces () override; + virtual void Unlock_Surfaces () override; private: unsigned char* Get_Locked_Volume_Pointer(unsigned int level); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index 465bcc367eb..cc21d126159 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -96,7 +96,7 @@ class ThumbnailManagerClass : public DLNodeClass unsigned long DateTime; ThumbnailManagerClass(const char* thumbnail_filename); - ~ThumbnailManagerClass(); + virtual ~ThumbnailManagerClass() override; void Remove_From_Hash(ThumbnailClass* thumb); void Insert_To_Hash(ThumbnailClass* thumb); diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h index c54c3cf7054..2f501056a47 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -126,7 +126,7 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// AudibleSoundClass (const AudibleSoundClass &src); AudibleSoundClass (); - virtual ~AudibleSoundClass (); + virtual ~AudibleSoundClass () override; ////////////////////////////////////////////////////////////////////// // Public operators @@ -143,12 +143,12 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // Conversion methods ////////////////////////////////////////////////////////////////////// - virtual AudibleSoundClass * As_AudibleSoundClass() { return this; } + virtual AudibleSoundClass * As_AudibleSoundClass() override { return this; } ////////////////////////////////////////////////////////////////////// // Update methods ////////////////////////////////////////////////////////////////////// - virtual bool On_Frame_Update (unsigned int milliseconds); + virtual bool On_Frame_Update (unsigned int milliseconds) override; ////////////////////////////////////////////////////////////////////// // State control methods @@ -235,24 +235,24 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // Position/direction methods ////////////////////////////////////////////////////////////////////// - virtual void Set_Position (const Vector3 &position); - virtual Vector3 Get_Position () const { return m_Transform.Get_Translation (); } + virtual void Set_Position (const Vector3 &position) override; + virtual Vector3 Get_Position () const override { return m_Transform.Get_Translation (); } - virtual void Set_Listener_Transform (const Matrix3D &tm) { m_ListenerTransform = tm; } - virtual void Set_Transform (const Matrix3D &transform); - virtual Matrix3D Get_Transform () const { return m_Transform; } + virtual void Set_Listener_Transform (const Matrix3D &tm) override { m_ListenerTransform = tm; } + virtual void Set_Transform (const Matrix3D &transform) override; + virtual Matrix3D Get_Transform () const override { return m_Transform; } ////////////////////////////////////////////////////////////////////// // Culling methods ////////////////////////////////////////////////////////////////////// - virtual void Cull_Sound (bool culled = true); - virtual bool Is_Sound_Culled () const { return m_IsCulled; } + virtual void Cull_Sound (bool culled = true) override; + virtual bool Is_Sound_Culled () const override { return m_IsCulled; } ////////////////////////////////////////////////////////////////////// // Scene integration ////////////////////////////////////////////////////////////////////// - virtual void Add_To_Scene (bool start_playing = true); - virtual void Remove_From_Scene (); + virtual void Add_To_Scene (bool start_playing = true) override; + virtual void Remove_From_Scene () override; ////////////////////////////////////////////////////////////////////// // Attenuation settings @@ -261,8 +261,8 @@ class AudibleSoundClass : public SoundSceneObjClass // // This is the distance where the sound can not be heard any longer. (its vol is 0) // - virtual void Set_DropOff_Radius (float radius = 1); - virtual float Get_DropOff_Radius () const { return m_DropOffRadius; } + virtual void Set_DropOff_Radius (float radius = 1) override; + virtual float Get_DropOff_Radius () const override { return m_DropOffRadius; } ////////////////////////////////////////////////////////////////////// // Update methods @@ -287,9 +287,9 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // From PersistClass ////////////////////////////////////////////////////////////////////// - const PersistFactoryClass & Get_Factory () const; - bool Save (ChunkSaveClass &csave); - bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; protected: @@ -388,16 +388,16 @@ class AudibleSoundDefinitionClass : public DefinitionClass // Public constructors/destructors ////////////////////////////////////////////////////////////// AudibleSoundDefinitionClass (); - virtual ~AudibleSoundDefinitionClass () { } + virtual ~AudibleSoundDefinitionClass () override { } // From DefinitionClass - virtual uint32 Get_Class_ID () const; + virtual uint32 Get_Class_ID () const override; // From PersistClass - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); - virtual PersistClass * Create () const; + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; + virtual PersistClass * Create () const override; virtual AudibleSoundClass * Create_Sound (int classid_hint) const; // Initialization diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 64f483bc4ba..0e92f856e35 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -154,7 +154,7 @@ class AudioCallbackListClass : public SimpleDynVecClass< AUDIO_CALLBACK_STRUCT // If object was created but not Init'd, ThreadID will be -1 and Count == 0 // If object was created and Init'd, ThreadID will not be -1. We expect Count to return to 1 after all Pop's - ~ActiveCategoryStackClass() { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } + ~ActiveCategoryStackClass() override { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } ActiveCategoryStackClass & operator = (const ActiveCategoryStackClass & that); diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h index e4f09a93d66..8b5d6288a8c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h @@ -43,23 +43,23 @@ class RAMFileClass : public FileClass { public: RAMFileClass(void * buffer, int len); - virtual ~RAMFileClass(); + virtual ~RAMFileClass() override; - virtual char const * File_Name() const {return("UNKNOWN");} - virtual char const * Set_Name(char const * ) {return(File_Name());} - virtual int Create(); - virtual int Delete(); - virtual bool Is_Available(int forced=false); - virtual bool Is_Open() const; - virtual int Open(char const * filename, int access=READ); - virtual int Open(int access=READ); - virtual int Read(void * buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const * buffer, int size); - virtual void Close(); - virtual unsigned long Get_Date_Time() {return(0);} - virtual bool Set_Date_Time(unsigned long ) {return(true);} + virtual char const * File_Name() const override {return("UNKNOWN");} + virtual char const * Set_Name(char const * ) override {return(File_Name());} + virtual int Create() override; + virtual int Delete() override; + virtual bool Is_Available(int forced=false) override; + virtual bool Is_Open() const override; + virtual int Open(char const * filename, int access=READ) override; + virtual int Open(int access=READ) override; + virtual int Read(void * buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const * buffer, int size) override; + virtual void Close() override; + virtual unsigned long Get_Date_Time() override {return(0);} + virtual bool Set_Date_Time(unsigned long ) override {return(true);} virtual void Error(int , int = false, char const * =nullptr) {} virtual void Bias(int start, int length=-1); diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h index ace62f5b077..173f547ef7f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h @@ -81,26 +81,26 @@ class RawFileClass : public FileClass RawFileClass(); RawFileClass (RawFileClass const & f); RawFileClass & operator = (RawFileClass const & f); - virtual ~RawFileClass(); - - virtual char const * File_Name() const; - virtual char const * Set_Name(char const *filename); - virtual int Create(); - virtual int Delete(); - virtual bool Is_Available(int forced=false); - virtual bool Is_Open() const; - virtual int Open(char const *filename, int rights=READ); - virtual int Open(int rights=READ); - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const *buffer, int size); - virtual void Close(); - virtual unsigned long Get_Date_Time(); - virtual bool Set_Date_Time(unsigned long datetime); + virtual ~RawFileClass() override; + + virtual char const * File_Name() const override; + virtual char const * Set_Name(char const *filename) override; + virtual int Create() override; + virtual int Delete() override; + virtual bool Is_Available(int forced=false) override; + virtual bool Is_Open() const override; + virtual int Open(char const *filename, int rights=READ) override; + virtual int Open(int rights=READ) override; + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const *buffer, int size) override; + virtual void Close() override; + virtual unsigned long Get_Date_Time() override; + virtual bool Set_Date_Time(unsigned long datetime) override; virtual void Error(int error, int canretry = false, char const * filename=nullptr); virtual void Bias(int start, int length=-1); - virtual void * Get_File_Handle() { return Handle; } + virtual void * Get_File_Handle() override { return Handle; } virtual void Attach (void *handle, int rights=READ); virtual void Detach (); diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.h b/Core/Libraries/Source/WWVegas/WWLib/Vector.h index 5a3da08fdf2..0843cc54f04 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Vector.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.h @@ -496,10 +496,10 @@ class DynamicVectorClass : public VectorClass bool operator!= (const DynamicVectorClass &src) { return true; } // Change maximum size of vector. - virtual bool Resize(int newsize, T const * array=nullptr); + virtual bool Resize(int newsize, T const * array=nullptr) override; // Resets and frees the vector array. - virtual void Clear() {ActiveCount = 0;VectorClass::Clear();}; + virtual void Clear() override {ActiveCount = 0;VectorClass::Clear();}; // retains the memory but zeros the active count void Reset_Active() { ActiveCount = 0; } @@ -529,8 +529,8 @@ class DynamicVectorClass : public VectorClass // Fetch current growth step rate. int Growth_Step() {return GrowthStep;}; - virtual int ID(T const * ptr) {return(VectorClass::ID(ptr));}; - virtual int ID(T const & ptr); + virtual int ID(T const * ptr) override {return(VectorClass::ID(ptr));}; + virtual int ID(T const & ptr) override; DynamicVectorClass & operator =(DynamicVectorClass const & rvalue) { VectorClass::operator = (rvalue); diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h index 849d7ed3ae5..28b775e30d2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h @@ -50,7 +50,7 @@ class BufferPipe : public Pipe public: BufferPipe(Buffer const & buffer) : BufferPtr(buffer), Index(0) {} BufferPipe(void * buffer, int length) : BufferPtr(buffer, length), Index(0) {} - virtual int Put(void const * source, int slen); + virtual int Put(void const * source, int slen) override; private: Buffer BufferPtr; @@ -72,10 +72,10 @@ class FilePipe : public Pipe public: FilePipe(FileClass * file) : File(file), HasOpened(false) {} FilePipe(FileClass & file) : File(&file), HasOpened(false) {} - virtual ~FilePipe(); + virtual ~FilePipe() override; - virtual int Put(void const * source, int slen); - virtual int End(); + virtual int Put(void const * source, int slen) override; + virtual int End() override; private: FileClass * File; diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h index 33f471265f6..f5f86f51138 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h +++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h @@ -50,7 +50,7 @@ class BufferStraw : public Straw public: BufferStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0) {} BufferStraw(void const * buffer, int length) : BufferPtr((void*)buffer, length), Index(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: Buffer BufferPtr; @@ -72,8 +72,8 @@ class FileStraw : public Straw public: FileStraw(FileClass * file) : File(file), HasOpened(false) {} FileStraw(FileClass & file) : File(&file), HasOpened(false) {} - virtual ~FileStraw(); - virtual int Get(void * source, int slen); + virtual ~FileStraw() override; + virtual int Get(void * source, int slen) override; private: FileClass * File; diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h index 8299247dcf9..a3826485543 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h @@ -52,8 +52,8 @@ class Base64Pipe : public Pipe Base64Pipe(CodeControl control) : Control(control), Counter(0) {} - virtual int Flush(); - virtual int Put(void const * source, int slen); + virtual int Flush() override; + virtual int Put(void const * source, int slen) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h index fe24b323235..584b592afb0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h @@ -51,7 +51,7 @@ class Base64Straw : public Straw } CodeControl; Base64Straw(CodeControl control) : Control(control), Counter(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h index d981e5f42cd..db1a41ba19d 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h @@ -56,12 +56,12 @@ class BufferedFileClass : public RawFileClass BufferedFileClass(); BufferedFileClass (RawFileClass const & f); BufferedFileClass & operator = (BufferedFileClass const & f); - virtual ~BufferedFileClass(); + virtual ~BufferedFileClass() override; - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Write(void const *buffer, int size); - virtual void Close(); + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Write(void const *buffer, int size) override; + virtual void Close() override; protected: diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h index fd4f24e66e1..f39ec863d38 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h @@ -50,7 +50,7 @@ class CacheStraw : public Straw public: CacheStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0), Length(0) {} CacheStraw(int length=4096) : BufferPtr(length), Index(0), Length(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: Buffer BufferPtr; diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h index 0c99ebb3e81..6c031039744 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h @@ -121,10 +121,10 @@ class SimpleFileFactoryClass : public FileFactoryClass { public: SimpleFileFactoryClass(); - ~SimpleFileFactoryClass() {} + virtual ~SimpleFileFactoryClass() override {} - virtual FileClass * Get_File( char const *filename ); - virtual void Return_File( FileClass *file ); + virtual FileClass * Get_File( char const *filename ) override; + virtual void Return_File( FileClass *file ) override; // sub_directory may be a semicolon separated search path. New files will always // go in the last dir in the path. diff --git a/Core/Libraries/Source/WWVegas/WWLib/inisup.h b/Core/Libraries/Source/WWVegas/WWLib/inisup.h index 80837b24a92..13e852d22f8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/inisup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/inisup.h @@ -53,7 +53,7 @@ */ struct INIEntry : public Node { INIEntry(char * entry = nullptr, char * value = nullptr) : Entry(entry), Value(value) {} - ~INIEntry(); + virtual ~INIEntry() override; // ~INIEntry() {free(Entry);Entry = nullptr;free(Value);Value = nullptr;} // int Index_ID() const {return(CRCEngine()(Entry, strlen(Entry)));}; int Index_ID() const { return CRC::String(Entry);}; @@ -68,7 +68,7 @@ struct INIEntry : public Node { */ struct INISection : public Node { INISection(char * section) : Section(section) {} - ~INISection(); + virtual ~INISection() override; // ~INISection() {free(Section);Section = 0;EntryList.Delete();} INIEntry * Find_Entry(char const * entry) const; // int Index_ID() const {return(CRCEngine()(Section, strlen(Section)));}; diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h index 15966402427..640a16d29be 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h @@ -53,23 +53,23 @@ class ResourceFileClass : public FileClass public: ResourceFileClass(HMODULE hmodule, char const *filename); - virtual ~ResourceFileClass(); + virtual ~ResourceFileClass() override; - virtual char const * File_Name() const { return ResourceName; } - virtual char const * Set_Name(char const *filename); - virtual int Create() { return false; } - virtual int Delete() { return false; } - virtual bool Is_Available(int /*forced=false*/) { return Is_Open (); } - virtual bool Is_Open() const { return (FileBytes != nullptr); } + virtual char const * File_Name() const override { return ResourceName; } + virtual char const * Set_Name(char const *filename) override; + virtual int Create() override { return false; } + virtual int Delete() override { return false; } + virtual bool Is_Available(int /*forced=false*/) override { return Is_Open (); } + virtual bool Is_Open() const override { return (FileBytes != nullptr); } - virtual int Open(char const * /*fname*/, int /*rights=READ*/) { return Is_Open(); } - virtual int Open(int /*rights=READ*/) { return Is_Open(); } + virtual int Open(char const * /*fname*/, int /*rights=READ*/) override { return Is_Open(); } + virtual int Open(int /*rights=READ*/) override { return Is_Open(); } - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const * /*buffer*/, int /*size*/) { return 0; } - virtual void Close() { } + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const * /*buffer*/, int /*size*/) override { return 0; } + virtual void Close() override { } virtual void Error(int error, int canretry = false, char const * filename=nullptr); virtual void Bias(int start, int length=-1) {} diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index 15e54ca2348..c722ab020c7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -51,7 +51,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass public: ShareBufferClass(int count, const char* msg); ShareBufferClass(const ShareBufferClass & that); - ~ShareBufferClass(); + virtual ~ShareBufferClass() override; // Get the internal pointer to the array // CAUTION! This pointer is not refcounted so only use it in a context diff --git a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h index 9e73cbcf380..1bf6dd01af7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h @@ -252,7 +252,7 @@ template class SimpleDynVecClass : public SimpleVecClass public: SimpleDynVecClass(int size = 0); - virtual ~SimpleDynVecClass(); + virtual ~SimpleDynVecClass() override; // Array-like access (does not grow) int Count() const { return(ActiveCount); } @@ -260,7 +260,7 @@ template class SimpleDynVecClass : public SimpleVecClass T const & operator[](int index) const { assert(index < ActiveCount); return(Vector[index]); } // Change maximum size of vector - virtual bool Resize(int newsize); + virtual bool Resize(int newsize) override; // Add object to vector (growing as necessary). bool Add(T const & object,int new_size_hint = 0); diff --git a/Core/Libraries/Source/WWVegas/WWLib/textfile.h b/Core/Libraries/Source/WWVegas/WWLib/textfile.h index 6f52d4233b9..bf022ffd5c1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/textfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/textfile.h @@ -60,7 +60,7 @@ class TextFileClass : public RawFileClass TextFileClass (); TextFileClass (char const *filename); TextFileClass (const TextFileClass &src); - virtual ~TextFileClass (); + virtual ~TextFileClass () override; ///////////////////////////////////////////////////////////////// // Public operators diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h index 08f2028b2ae..4385093a502 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h @@ -58,7 +58,7 @@ class AABTreeCullSystemClass : public CullSystemClass public: AABTreeCullSystemClass(); - virtual ~AABTreeCullSystemClass(); + virtual ~AABTreeCullSystemClass() override; /* ** Re-partition the tree. Two methods can be used to accomplish this. The @@ -82,7 +82,7 @@ class AABTreeCullSystemClass : public CullSystemClass /* ** Re-insert an object into the tree */ - virtual void Update_Culling(CullableClass * obj); + virtual void Update_Culling(CullableClass * obj) override; /* ** Statistics about the AAB-Tree @@ -94,10 +94,10 @@ class AABTreeCullSystemClass : public CullSystemClass /* ** Collect objects which overlap the given primitive */ - virtual void Collect_Objects(const Vector3 & point); - virtual void Collect_Objects(const AABoxClass & box); - virtual void Collect_Objects(const OBBoxClass & box); - virtual void Collect_Objects(const FrustumClass & frustum); + virtual void Collect_Objects(const Vector3 & point) override; + virtual void Collect_Objects(const AABoxClass & box) override; + virtual void Collect_Objects(const OBBoxClass & box) override; + virtual void Collect_Objects(const FrustumClass & frustum) override; virtual void Collect_Objects(const SphereClass & sphere); /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h index de50056b0c5..3139354af87 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h @@ -46,19 +46,19 @@ class CardinalSpline3DClass : public HermiteSpline3DClass { public: - virtual int Add_Key(const Vector3 & point,float t); - virtual void Remove_Key(int i); - virtual void Clear_Keys(); + virtual int Add_Key(const Vector3 & point,float t) override; + virtual void Remove_Key(int i) override; + virtual void Clear_Keys() override; virtual void Set_Tightness(int i,float tightness); virtual float Get_Tightness(int i); - virtual void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; protected: @@ -75,18 +75,18 @@ class CardinalSpline1DClass : public HermiteSpline1DClass public: virtual int Add_Key(float point,float t); - virtual void Remove_Key(int i); - virtual void Clear_Keys(); + virtual void Remove_Key(int i) override; + virtual void Clear_Keys() override; virtual void Set_Tightness(int i,float tightness); virtual float Get_Tightness(int i); - virtual void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h index 513cbac2c65..21ec4b147bf 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h @@ -45,12 +45,12 @@ class CatmullRomSpline3DClass : public HermiteSpline3DClass { public: - void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; @@ -61,10 +61,10 @@ class CatmullRomSpline3DClass : public HermiteSpline3DClass class CatmullRomSpline1DClass : public HermiteSpline1DClass { public: - void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h index f71bffcff3f..5539f7ed164 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h @@ -76,7 +76,7 @@ class CullableClass : public RefCountClass public: CullableClass(); - virtual ~CullableClass(); + virtual ~CullableClass() override; /* ** Access to the culling box for this object. When you set the cull box, you are diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h index 7bc973e48ab..4e65d52e9b8 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h @@ -51,7 +51,7 @@ class Curve3DClass : public PersistClass Curve3DClass(); Curve3DClass(const Curve3DClass & that); - virtual ~Curve3DClass(); + virtual ~Curve3DClass() override; Curve3DClass & operator = (const Curve3DClass & that); virtual void Evaluate(float time,Vector3 * set_val) = 0; @@ -67,8 +67,8 @@ class Curve3DClass : public PersistClass float Get_End_Time(); // persistent object support - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; protected: @@ -91,12 +91,12 @@ class Curve3DClass : public PersistClass class LinearCurve3DClass : public Curve3DClass { public: - virtual void Evaluate(float time,Vector3 * set_val); + virtual void Evaluate(float time,Vector3 * set_val) override; // persistent object support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; @@ -109,7 +109,7 @@ class Curve1DClass : public PersistClass Curve1DClass(); Curve1DClass(const Curve1DClass & that); - virtual ~Curve1DClass(); + virtual ~Curve1DClass() override; Curve1DClass & operator = (const Curve1DClass & that); virtual void Evaluate(float time,float * set_val) = 0; @@ -125,8 +125,8 @@ class Curve1DClass : public PersistClass float Get_End_Time(); // persistent object support - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; protected: @@ -150,10 +150,10 @@ class Curve1DClass : public PersistClass class LinearCurve1DClass : public Curve1DClass { public: - virtual void Evaluate(float time,float * set_val); + virtual void Evaluate(float time,float * set_val) override; // persistent object support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h index 8af39a0ae76..11dfe80d769 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h @@ -85,15 +85,15 @@ class GridCullSystemClass : public CullSystemClass public: GridCullSystemClass(); - ~GridCullSystemClass(); + virtual ~GridCullSystemClass() override; - virtual void Collect_Objects(const Vector3 & point); - virtual void Collect_Objects(const AABoxClass & box); - virtual void Collect_Objects(const OBBoxClass & box); - virtual void Collect_Objects(const FrustumClass & frustum); + virtual void Collect_Objects(const Vector3 & point) override; + virtual void Collect_Objects(const AABoxClass & box) override; + virtual void Collect_Objects(const OBBoxClass & box) override; + virtual void Collect_Objects(const FrustumClass & frustum) override; virtual void Re_Partition(const Vector3 & min,const Vector3 & max,float objdim); - virtual void Update_Culling(CullableClass * obj); + virtual void Update_Culling(CullableClass * obj) override; virtual void Load(ChunkLoadClass & cload); virtual void Save(ChunkSaveClass & csave); @@ -245,7 +245,7 @@ class GridLinkClass : public CullLinkClass, public AutoPoolClass *list); DefIDListParameterClass (const DefIDListParameterClass &src); - virtual ~DefIDListParameterClass () {} + virtual ~DefIDListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const DefIDListParameterClass & operator= (const DefIDListParameterClass &src); bool operator== (const DefIDListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_DEFINITIONIDLIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_DEFINITIONIDLIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_DEFINITIONIDLIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_DEFINITIONIDLIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual void Set_Selected_Class_ID (uint32 *id) { m_SelectedClassID = id; } @@ -953,7 +953,7 @@ class DefIDListParameterClass : public ParameterClass virtual DynamicVectorClass &Get_List () const { return (*m_IDList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -980,22 +980,22 @@ class ZoneParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// ZoneParameterClass (OBBoxClass *box); ZoneParameterClass (const ZoneParameterClass &src); - virtual ~ZoneParameterClass () {} + virtual ~ZoneParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const ZoneParameterClass & operator= (const ZoneParameterClass &src); bool operator== (const ZoneParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_ZONE; } - virtual bool Is_Type (Type type) const { return (type == TYPE_ZONE) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_ZONE; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_ZONE) || ParameterClass::Is_Type (type); } // Data manipulation virtual void Set_Zone (const OBBoxClass &box) { (*m_OBBox) = box; Set_Modified (); } @@ -1003,7 +1003,7 @@ class ZoneParameterClass : public ParameterClass // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1028,28 +1028,28 @@ class FilenameListParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// FilenameListParameterClass (DynamicVectorClass *list); FilenameListParameterClass (const FilenameListParameterClass &src); - virtual ~FilenameListParameterClass () {} + virtual ~FilenameListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const FilenameListParameterClass & operator= (const FilenameListParameterClass &src); bool operator== (const FilenameListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_FILENAMELIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_FILENAMELIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_FILENAMELIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_FILENAMELIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual DynamicVectorClass &Get_List () const { return (*m_FilenameList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1075,29 +1075,29 @@ class ScriptListParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// ScriptListParameterClass (DynamicVectorClass *name_list, DynamicVectorClass *param_list); ScriptListParameterClass (const ScriptListParameterClass &src); - virtual ~ScriptListParameterClass () {} + virtual ~ScriptListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const ScriptListParameterClass & operator= (const ScriptListParameterClass &src); bool operator== (const ScriptListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_SCRIPTLIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_SCRIPTLIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_SCRIPTLIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_SCRIPTLIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual DynamicVectorClass &Get_Name_List () const { return (*m_NameList); } virtual DynamicVectorClass &Get_Param_List () const { return (*m_ParamList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1128,23 +1128,23 @@ class SeparatorParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// SeparatorParameterClass () {} SeparatorParameterClass (const SeparatorParameterClass &src); - virtual ~SeparatorParameterClass () {} + virtual ~SeparatorParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const SeparatorParameterClass & operator= (const SeparatorParameterClass &src); bool operator== (const SeparatorParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_SEPARATOR; } - virtual bool Is_Type (Type type) const { return (type == TYPE_SEPARATOR) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_SEPARATOR; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_SEPARATOR) || ParameterClass::Is_Type (type); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h index be03e5ec0e0..a3b88b6d65c 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h @@ -55,7 +55,7 @@ class ParameterListClass : public DynamicVectorClass ///////////////////////////////////////////////////////////////////// // Public constructurs/destructors ///////////////////////////////////////////////////////////////////// - ~ParameterListClass (); + virtual ~ParameterListClass () override; ///////////////////////////////////////////////////////////////////// // Public methods diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h index 71e3aa7d16c..4cb2f181a54 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h @@ -81,9 +81,9 @@ template class SimplePersistFactoryClass : public PersistF { public: - virtual uint32 Chunk_ID() const { return CHUNKID; } - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override { return CHUNKID; } + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; /* ** Internal chunk id's diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h index 052e4c07f6c..0a1f2b975a7 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h @@ -63,7 +63,7 @@ class SaveLoadSubSystemClass : public PostLoadableClass public: SaveLoadSubSystemClass (); - virtual ~SaveLoadSubSystemClass (); + virtual ~SaveLoadSubSystemClass () override; virtual uint32 Chunk_ID () const = 0; diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index ea3aba4e541..e9762bbfa12 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -41,10 +41,10 @@ class SimpleDefinitionFactoryClass : public DefinitionFactoryClass ////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////// - virtual DefinitionClass * Create () const; - virtual const char * Get_Name () const; - virtual uint32 Get_Class_ID () const; - virtual bool Is_Displayed () const { return IsDisplayed; } + virtual DefinitionClass * Create () const override; + virtual const char * Get_Name () const override; + virtual uint32 Get_Class_ID () const override; + virtual bool Is_Displayed () const override { return IsDisplayed; } protected: diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h index 91b5a676e59..743b52b6e5b 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h @@ -63,7 +63,7 @@ class SimpleParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; /////////////////////////////////////////////////////////////////////// // Public methods @@ -72,8 +72,8 @@ class SimpleParameterClass : public ParameterClass void Set_Value (const T &new_value); // From Parameter class - ParameterClass::Type Get_Type () const; - void Copy_Value (const ParameterClass &src); + virtual ParameterClass::Type Get_Type () const override; + virtual void Copy_Value (const ParameterClass &src) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h index 55e22eabef7..17536562095 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h @@ -58,7 +58,7 @@ class TwiddlerClass : public DefinitionClass // Public constructors/destructors ///////////////////////////////////////////////////////////////////// TwiddlerClass (); - virtual ~TwiddlerClass (); + virtual ~TwiddlerClass () override; ///////////////////////////////////////////////////////////////////// // Public methods @@ -67,15 +67,15 @@ class TwiddlerClass : public DefinitionClass // // Type identification // - uint32 Get_Class_ID () const { return CLASSID_TWIDDLERS; } - PersistClass * Create () const; + virtual uint32 Get_Class_ID () const override { return CLASSID_TWIDDLERS; } + virtual PersistClass * Create () const override; // // From PersistClass // - bool Save (ChunkSaveClass &csave); - bool Load (ChunkLoadClass &cload); - const PersistFactoryClass & Get_Factory () const; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; + virtual const PersistFactoryClass & Get_Factory () const override; // // Twiddler specific diff --git a/Core/Libraries/Source/profile/internal_result.h b/Core/Libraries/Source/profile/internal_result.h index 14256fec651..a058ee4fca3 100644 --- a/Core/Libraries/Source/profile/internal_result.h +++ b/Core/Libraries/Source/profile/internal_result.h @@ -39,8 +39,8 @@ class ProfileResultFileCSV: public ProfileResultInterface public: static ProfileResultInterface *Create(int argn, const char * const *); virtual const char *GetName() const { return "file_csv"; } - virtual void WriteResults(); - virtual void Delete(); + virtual void WriteResults() override; + virtual void Delete() override; }; /** @@ -75,8 +75,8 @@ class ProfileResultFileDOT: public ProfileResultInterface static ProfileResultInterface *Create(int argn, const char * const *); virtual const char *GetName() const { return "file_dot"; } - virtual void WriteResults(); - virtual void Delete(); + virtual void WriteResults() override; + virtual void Delete() override; private: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 80f29bb80da..19e73ef2926 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -62,49 +62,49 @@ class Animatable3DObjClass : public CompositeRenderObjClass Animatable3DObjClass(const char * htree_name); Animatable3DObjClass(const Animatable3DObjClass & src); Animatable3DObjClass & operator = (const Animatable3DObjClass &); - virtual ~Animatable3DObjClass(); + virtual ~Animatable3DObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; virtual void Set_Animation_Frame_Rate_Multiplier(float multiplier); // 020607 srj -- added virtual HAnimClass * Peek_Animation_And_Info(float& frame, int& numFrames, int& mode, float& mult); // 020710 srj -- added - virtual HAnimClass * Peek_Animation(); + virtual HAnimClass * Peek_Animation() override; virtual bool Is_Animation_Complete() const; - virtual int Get_Num_Bones(); - virtual const char * Get_Bone_Name(int bone_index); - virtual int Get_Bone_Index(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(int boneindex); - virtual void Capture_Bone(int boneindex); - virtual void Release_Bone(int boneindex); - virtual bool Is_Bone_Captured(int boneindex) const; - virtual void Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false); - virtual const HTreeClass * Get_HTree() const { return HTree; } + virtual int Get_Num_Bones() override; + virtual const char * Get_Bone_Name(int bone_index) override; + virtual int Get_Bone_Index(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(int boneindex) override; + virtual void Capture_Bone(int boneindex) override; + virtual void Release_Bone(int boneindex) override; + virtual bool Is_Bone_Captured(int boneindex) const override; + virtual void Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false) override; + virtual const HTreeClass * Get_HTree() const override { return HTree; } // // Simple bone evaluation methods for when the caller doesn't want @@ -126,7 +126,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass float Compute_Current_Frame(float *newDirection=nullptr) const; // Update the sub-object transforms according to the current anim state and root transform. - virtual void Update_Sub_Object_Transforms(); + virtual void Update_Sub_Object_Transforms() override; // Update the transforms using the base pose only void Base_Update(const Matrix3D & root); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index 70b16ad0dd2..44c5edeecbf 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -134,9 +134,9 @@ static NullPrototypeClass _NullPrototype; class RObjIterator : public RenderObjIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); - virtual int Current_Item_Class_ID(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; + virtual int Current_Item_Class_ID() override; protected: friend class WW3DAssetManager; }; @@ -151,10 +151,10 @@ class HAnimIterator : public AssetIterator public: HAnimIterator() : Iterator( WW3DAssetManager::Get_Instance()->HAnimManager ) { }; - virtual void First() { Iterator.First(); } - virtual void Next() { Iterator.Next(); } - virtual bool Is_Done() { return Iterator.Is_Done(); } - virtual const char * Current_Item_Name() { return Iterator.Get_Current_Anim()->Get_Name(); } + virtual void First() override { Iterator.First(); } + virtual void Next() override { Iterator.Next(); } + virtual bool Is_Done() override { return Iterator.Is_Done(); } + virtual const char * Current_Item_Name() override { return Iterator.Get_Current_Anim()->Get_Name(); } protected: HAnimManagerIterator Iterator; @@ -164,8 +164,8 @@ class HAnimIterator : public AssetIterator class HTreeIterator : public AssetIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -174,10 +174,10 @@ class Font3DDataIterator : public AssetIterator { public: - virtual void First() { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - virtual void Next() { Node = Node->Next(); } - virtual bool Is_Done() { return Node==nullptr; } - virtual const char * Current_Item_Name() { return Node->Data()->Name; } + virtual void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + virtual void Next() override { Node = Node->Next(); } + virtual bool Is_Done() override { return Node==nullptr; } + virtual const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 1f710081020..d69025ef28b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -77,9 +77,9 @@ class BoxRenderObjClass : public RenderObjClass BoxRenderObjClass(const BoxRenderObjClass & src); BoxRenderObjClass & operator = (const BoxRenderObjClass &); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; void Set_Color(const Vector3 & color); void Set_Opacity(float opacity) { Opacity = opacity; } @@ -143,19 +143,19 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // AABoxRenderObjClass Interface @@ -164,7 +164,7 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; AABoxClass CachedBox; @@ -194,19 +194,19 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // OBBoxRenderObjClass Interface @@ -215,7 +215,7 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; OBBoxClass CachedBox; @@ -228,8 +228,8 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass class BoxLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_BOX; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_BOX; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -242,10 +242,10 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass W3DMPO_GLUE(BoxPrototypeClass) public: BoxPrototypeClass(W3dBoxStruct box); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } private: W3dBoxStruct Definition; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index 1502f293848..5b5d7549213 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -120,28 +120,28 @@ class CameraClass : public RenderObjClass CameraClass(); CameraClass(const CameraClass & src); CameraClass & operator = (const CameraClass &); - virtual ~CameraClass(); - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_CAMERA; } + virtual ~CameraClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_CAMERA; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering, cameras don't "render" ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Cameras cache their frustum description, this is invalidated whenever // the transform/position is changed ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////// // Camera parameter control diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 9374826cff8..5016c7253ac 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1327,9 +1327,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index bfb263fc50c..c903098bf91 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -271,15 +271,15 @@ class DazzleRenderObjClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DAZZLE; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DAZZLE; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - virtual void Scale(float scale) { radius*=scale; }; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + virtual void Scale(float scale) override { radius*=scale; }; void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; } void Set_Halo_Color(const Vector3& col) { halo_color=col; } @@ -300,7 +300,7 @@ class DazzleRenderObjClass : public RenderObjClass // Persistent object save-load interface // Dazzles save their "dazzle-type" and transform - virtual const PersistFactoryClass & Get_Factory () const; + virtual const PersistFactoryClass & Get_Factory () const override; // Set the static "current layer" variable. This variable is used in the // Render() call so that the dazzle knows which list to add itself to if @@ -359,10 +359,10 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass public: DazzlePrototypeClass() : DazzleType(0) { } - virtual const char * Get_Name() const { return Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DAZZLE; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DAZZLE; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } WW3DErrorType Load_W3D(ChunkLoadClass & cload); @@ -384,8 +384,8 @@ class DazzleLoaderClass : public PrototypeLoaderClass DazzleLoaderClass() { } ~DazzleLoaderClass() { } - virtual int Chunk_Type() { return W3D_CHUNK_DAZZLE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_DAZZLE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern DazzleLoaderClass _DazzleLoader; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 27d053f9098..a61be107dfa 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -55,7 +55,7 @@ class IndexBufferClass : public W3DMPO, public RefCountClass // nope, it's an ABC //W3DMPO_GLUE(IndexBufferClass) protected: - virtual ~IndexBufferClass(); + virtual ~IndexBufferClass() override; public: IndexBufferClass(unsigned type, unsigned short index_count); @@ -122,7 +122,7 @@ class DynamicIBAccessClass : public W3DMPO public: DynamicIBAccessClass(unsigned short type, unsigned short index_count); - ~DynamicIBAccessClass(); + virtual ~DynamicIBAccessClass() override; unsigned Get_Type() const { return Type; } unsigned short Get_Index_Count() const { return IndexCount; } @@ -168,7 +168,7 @@ class DX8IndexBufferClass : public IndexBufferClass }; DX8IndexBufferClass(unsigned short index_count,UsageType usage=USAGE_DEFAULT); - ~DX8IndexBufferClass(); + virtual ~DX8IndexBufferClass() override; void Copy(unsigned int* indices,unsigned start_index,unsigned index_count); void Copy(unsigned short* indices,unsigned start_index,unsigned index_count); @@ -192,7 +192,7 @@ class SortingIndexBufferClass : public IndexBufferClass friend DynamicIBAccessClass::WriteLockClass; public: SortingIndexBufferClass(unsigned short index_count); - ~SortingIndexBufferClass(); + virtual ~SortingIndexBufferClass() override; protected: unsigned short* index_buffer; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 1fb49fd3ff4..eafd2dfe452 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -86,7 +86,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass public: DX8TextureCategoryClass(DX8FVFCategoryContainer* container,TextureClass** textures, ShaderClass shd, VertexMaterialClass* mat,int pass); - ~DX8TextureCategoryClass(); + virtual ~DX8TextureCategoryClass() override; void Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh); @@ -172,7 +172,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass public: DX8FVFCategoryContainer(unsigned FVF,bool sorting); - virtual ~DX8FVFCategoryContainer(); + virtual ~DX8FVFCategoryContainer() override; static unsigned Define_FVF(MeshModelClass* mmc,bool enable_lighting); bool Is_Sorting() const { return sorting; } @@ -236,13 +236,13 @@ class DX8RigidFVFCategoryContainer : public DX8FVFCategoryContainer { public: DX8RigidFVFCategoryContainer(unsigned FVF,bool sorting); - ~DX8RigidFVFCategoryContainer(); + virtual ~DX8RigidFVFCategoryContainer() override; - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; - void Render(); // Generic render function + virtual void Render() override; // Generic render function protected: @@ -260,12 +260,12 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer { public: DX8SkinFVFCategoryContainer(bool sorting); - ~DX8SkinFVFCategoryContainer(); + virtual ~DX8SkinFVFCategoryContainer() override; - void Render(); - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Render() override; + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; void Add_Visible_Skin(MeshClass * mesh); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index a6609136cde..668b1ab411d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -79,7 +79,7 @@ class VertexBufferClass : public W3DMPO, public RefCountClass protected: VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount); - virtual ~VertexBufferClass(); + virtual ~VertexBufferClass() override; public: const FVFInfoClass& FVF_Info() const { return *fvf_info; } @@ -201,7 +201,7 @@ class DX8VertexBufferClass : public VertexBufferClass { W3DMPO_GLUE(DX8VertexBufferClass) protected: - ~DX8VertexBufferClass(); + virtual ~DX8VertexBufferClass() override; public: enum UsageType { USAGE_DEFAULT=0, @@ -249,7 +249,7 @@ class SortingVertexBufferClass : public VertexBufferClass VertexFormatXYZNDUV2* VertexBuffer; protected: - ~SortingVertexBufferClass(); + virtual ~SortingVertexBufferClass() override; public: SortingVertexBufferClass(unsigned short VertexCount); }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index 6c74312ff97..2eaa9be3744 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -53,9 +53,9 @@ class MissingAnimClass : public HashableClass { public: MissingAnimClass( const char * name ) : Name( name ) {} - virtual ~MissingAnimClass() {} + virtual ~MissingAnimClass() override {} - virtual const char * Get_Key() { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 662c23b611d..377e74b1663 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -69,14 +69,14 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass HLodClass(const HModelDefClass & def); HLodClass & operator = (const HLodClass &); - virtual ~HLodClass(); + virtual ~HLodClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_HLOD; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_HLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // HLod Interface - Editing and information @@ -107,102 +107,102 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; - virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const; - virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const; - virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const; - virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const override; + virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const override; + virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const override; + virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const override; + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Recalculate_Static_LOD_Factors(); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias); - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - virtual RenderObjClass * Get_Current_LOD(); + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Recalculate_Static_LOD_Factors() override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override; + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + virtual RenderObjClass * Get_Current_LOD() override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const SphereClass & Get_Bounding_Sphere() const; - virtual const AABoxClass & Get_Bounding_Box() const; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual const SphereClass & Get_Bounding_Sphere() const override; + virtual const AABoxClass & Get_Bounding_Box() const override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// // virtual void Set_Texture_Reduction_Factor(float trf); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez) { } - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Set_Hidden(int onoff); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override { } + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Set_Hidden(int onoff) override; // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS! - virtual void Set_HTree(HTreeClass * htree); + virtual void Set_HTree(HTreeClass * htree) override; protected: HLodClass(); void Free(); - virtual void Update_Sub_Object_Transforms(); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Update_Sub_Object_Transforms() override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: @@ -266,8 +266,8 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass class HLodLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_HLOD; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_HLOD; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -283,7 +283,7 @@ class HLodDefClass : public W3DMPO HLodDefClass(); HLodDefClass(HLodClass &src_lod); - ~HLodDefClass(); + virtual ~HLodDefClass() override; WW3DErrorType Load_W3D(ChunkLoadClass & cload); WW3DErrorType Save(ChunkSaveClass & csave); @@ -348,15 +348,15 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass public: HLodPrototypeClass( HLodDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } HLodDefClass * Get_Definition() const { return Definition; } protected: - virtual ~HLodPrototypeClass() { delete Definition; } + virtual ~HLodPrototypeClass() override { delete Definition; } private: HLodDefClass * Definition; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index a8b600d0118..42e5953c035 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -75,30 +75,30 @@ class HMorphAnimClass : public HAnimClass }; HMorphAnimClass(); - ~HMorphAnimClass(); + virtual ~HMorphAnimClass() override; void Free_Morph(); int Create_New_Morph(const int channels, HAnimClass *anim[]); int Load_W3D(ChunkLoadClass & cload); int Save_W3D(ChunkSaveClass & csave); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } + virtual const char * Get_Name() const override { return Name; } + virtual const char * Get_HName() const override { return HierarchyName; } - int Get_Num_Frames() { return FrameCount; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)FrameCount / FrameRate; } + virtual int Get_Num_Frames() override { return FrameCount; } + virtual float Get_Frame_Rate() override { return FrameRate; } + virtual float Get_Total_Time() override { return (float)FrameCount / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame) { return true; } + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override { return true; } void Insert_Morph_Key (const int channel, uint32 morph_frame, uint32 pose_frame); void Release_Keys (); - bool Is_Node_Motion_Present(int pividx) { return true; } - int Get_Num_Pivots() const { return NumNodes; } + virtual bool Is_Node_Motion_Present(int pividx) override { return true; } + virtual int Get_Num_Pivots() const override { return NumNodes; } void Set_Name(const char * name); void Set_HName(const char * hname); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 80efcc735e0..23c1658f62d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -82,32 +82,32 @@ class HRawAnimClass : public HAnimClass }; HRawAnimClass(); - ~HRawAnimClass(); + virtual ~HRawAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + virtual const char * Get_Name() const override { return Name; } + virtual const char * Get_HName() const override { return HierarchyName; } + virtual int Get_Num_Frames() override { return NumFrames; } + virtual float Get_Frame_Rate() override { return FrameRate; } + virtual float Get_Total_Time() override { return (float)NumFrames / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + virtual bool Is_Node_Motion_Present(int pividx) override; + virtual int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + virtual bool Has_X_Translation (int pividx) override; + virtual bool Has_Y_Translation (int pividx) override; + virtual bool Has_Z_Translation (int pividx) override; + virtual bool Has_Rotation (int pividx) override; + virtual bool Has_Visibility (int pividx) override; NodeMotionStruct *Get_Node_Motion_Array() {return NodeMotion;} - virtual int Class_ID() const { return CLASSID_HRAWANIM; } + virtual int Class_ID() const override { return CLASSID_HRAWANIM; } private: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index d8674b146ee..9c78380db2e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -68,30 +68,30 @@ class LightClass : public RenderObjClass LightClass(LightType type = POINT); LightClass(const LightClass & src); LightClass & operator = (const LightClass &); - virtual ~LightClass(); - RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_LIGHT; } + virtual ~LightClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_LIGHT; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering // Lights do not "Render" but they are vertex processors. ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } virtual bool Is_Vertex_Processor() { return true; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Lights register themselves with the scene as VertexProcessors. ///////////////////////////////////////////////////////////////////////////// - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes // Bounding volume of a light extends to its attenuation radius ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // LightClass Interface @@ -145,9 +145,9 @@ class LightClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface ///////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; //bool isDonut() {return Donut; }; //void setDonut(bool donut) { Donut = donut; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 38ef8598e13..6c0d256c537 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -113,11 +113,11 @@ class ScaleTextureMapperClass : public TextureMapperClass ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ScaleTextureMapperClass(const ScaleTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SCALE;} + virtual int Mapper_ID() const override { return MAPPER_ID_SCALE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ScaleTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ScaleTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: Vector2 Scale; // Scale @@ -135,14 +135,14 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass LinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); LinearOffsetTextureMapperClass(const LinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } + virtual bool Is_Time_Variant() override { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { Set_Current_UV_Offset(Vector2(0.0f, 0.0f)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { Set_Current_UV_Offset(Vector2(0.0f, 0.0f)); } void Set_Current_UV_Offset(const Vector2 &cur) { CurrentUVOffset = cur; @@ -175,13 +175,13 @@ class GridTextureMapperClass : public TextureMapperClass GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridTextureMapperClass(const GridTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID;} + virtual int Mapper_ID() const override { return MAPPER_ID_GRID;} - virtual TextureMapperClass *Clone() const { return NEW_REF( GridTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( GridTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; void Set_Frame(unsigned int frame) { CurrentFrame=frame; } void Set_Frame_Per_Second(float fps); @@ -217,13 +217,13 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RotateTextureMapperClass(const RotateTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ROTATE;} + virtual int Mapper_ID() const override { return MAPPER_ID_ROTATE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RotateTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RotateTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { CurrentAngle = 0.0f; } + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { CurrentAngle = 0.0f; } private: float CurrentAngle; @@ -244,13 +244,13 @@ class SineLinearOffsetTextureMapperClass : public TextureMapperClass SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); SineLinearOffsetTextureMapperClass(const SineLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SINE_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_SINE_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { CurrentAngle = 0.0f; } + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { CurrentAngle = 0.0f; } private: Vector3 UAFP; // U Coordinate Amplitude frequency phase @@ -271,13 +271,13 @@ class StepLinearOffsetTextureMapperClass : public TextureMapperClass StepLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); StepLinearOffsetTextureMapperClass(const StepLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_STEP_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_STEP_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; private: Vector2 Step; // Size of step @@ -298,13 +298,13 @@ class ZigZagLinearOffsetTextureMapperClass : public TextureMapperClass ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; private: Vector2 Speed; // Speed of zigzag @@ -325,10 +325,10 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass public: ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class EnvironmentMapperClass : public TextureMapperClass @@ -337,10 +337,10 @@ class EnvironmentMapperClass : public TextureMapperClass public: EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class EdgeMapperClass : public TextureMapperClass @@ -350,12 +350,12 @@ class EdgeMapperClass : public TextureMapperClass EdgeMapperClass(unsigned int stage); EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage); EdgeMapperClass(const EdgeMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_EDGE;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EdgeMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_EDGE;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EdgeMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } + virtual bool Needs_Normals() override { return true; } protected: unsigned int LastUsedSyncTime; // Sync time last used to update offset @@ -369,10 +369,10 @@ class WSClassicEnvironmentMapperClass : public TextureMapperClass public: WSClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class WSEnvironmentMapperClass : public TextureMapperClass @@ -381,10 +381,10 @@ class WSEnvironmentMapperClass : public TextureMapperClass public: WSEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } WSEnvironmentMapperClass(const WSEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class GridClassicEnvironmentMapperClass : public GridTextureMapperClass @@ -394,10 +394,10 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass GridClassicEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { } GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { } GridClassicEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class GridEnvironmentMapperClass : public GridTextureMapperClass @@ -407,10 +407,10 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass GridEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { } GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { } GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; // ---------------------------------------------------------------------------- @@ -426,9 +426,9 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass ScreenMapperClass(const Vector2 &offset_per_sec, const Vector2 &scale, unsigned int stage):LinearOffsetTextureMapperClass(offset_per_sec,scale,stage) { } ScreenMapperClass(const INIClass &ini, const char *section, unsigned int stage):LinearOffsetTextureMapperClass(ini,section,stage) { } ScreenMapperClass(const LinearOffsetTextureMapperClass & src):LinearOffsetTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_SCREEN;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ScreenMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_SCREEN;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ScreenMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; /** @@ -443,13 +443,13 @@ class RandomTextureMapperClass : public TextureMapperClass RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RandomTextureMapperClass(const RandomTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_RANDOM;} + virtual int Mapper_ID() const override { return MAPPER_ID_RANDOM;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RandomTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RandomTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } protected: float FPS; @@ -472,11 +472,11 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage); BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_BUMPENV;} + virtual int Mapper_ID() const override { return MAPPER_ID_BUMPENV;} - virtual TextureMapperClass *Clone() const { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index b6f3bac9ad3..f5961f7f51b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -94,9 +94,9 @@ class MatrixMapperClass : public TextureMapperClass void Compute_Texture_Coordinate(const Vector3 & point,Vector3 * set_stq); - TextureMapperClass* Clone() const { WWASSERT(0); return nullptr; } + virtual TextureMapperClass* Clone() const override { WWASSERT(0); return nullptr; } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index da78f40d4cf..244883fe068 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -73,51 +73,51 @@ class MeshClass : public W3DMPO, public RenderObjClass MeshClass(); MeshClass(const MeshClass & src); MeshClass & operator = (const MeshClass &); - virtual ~MeshClass(); + virtual ~MeshClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_MESH; } - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual int Get_Num_Polys() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_MESH; } + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual int Get_Num_Polys() const override; + virtual void Render(RenderInfoClass & rinfo) override; void Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass * ib); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual MaterialInfoClass * Get_Material_Info(); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual MaterialInfoClass * Get_Material_Info() override; - virtual int Get_Sort_Level() const; - virtual void Set_Sort_Level(int level); + virtual int Get_Sort_Level() const override; + virtual void Set_Sort_Level(int level) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals ///////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // MeshClass Interface @@ -165,9 +165,9 @@ class MeshClass : public W3DMPO, public RenderObjClass protected: - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Free(); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index 093a948772d..4b315d43e6f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp @@ -103,7 +103,7 @@ class FaceHasherClass : public HashCalculatorClass { public: - virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) + virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override { // Note: if we want this to detect duplicates that are "rotated", must change // both this function and the Compute_Hash function... @@ -115,7 +115,7 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) + virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override { HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; } @@ -130,7 +130,7 @@ class FaceHasherClass : public HashCalculatorClass return 1; } - virtual int Get_Hash_Value(int /*index*/) + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 3ff2f7187f1..1d04e255aba 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -89,7 +89,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO MeshGeometryClass(); MeshGeometryClass(const MeshGeometryClass & that); - virtual ~MeshGeometryClass(); + virtual ~MeshGeometryClass() override; MeshGeometryClass & operator = (const MeshGeometryClass & that); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index ec74ec611ae..61341f1d76b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO MeshMatDescClass(); MeshMatDescClass(const MeshMatDescClass & that); - ~MeshMatDescClass(); + virtual ~MeshMatDescClass() override; void Reset(int polycount,int vertcount,int passcount); MeshMatDescClass & operator = (const MeshMatDescClass & that); @@ -234,7 +234,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * > public: MatBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } MatBufferClass(const MatBufferClass & that); - ~MatBufferClass(); + virtual ~MatBufferClass() override; void Set_Element(int index,VertexMaterialClass * mat); VertexMaterialClass * Get_Element(int index); @@ -256,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * > public: TexBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } TexBufferClass(const TexBufferClass & that); - ~TexBufferClass(); + virtual ~TexBufferClass() override; void Set_Element(int index,TextureClass * mat); TextureClass * Get_Element(int index); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index bc4e130a392..82bf3df2884 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO public: GapFillerClass(MeshModelClass* mmc); GapFillerClass(const GapFillerClass& that); - ~GapFillerClass(); + virtual ~GapFillerClass() override; WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; } WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; } @@ -154,7 +154,7 @@ class MeshModelClass : public MeshGeometryClass MeshModelClass(); MeshModelClass(const MeshModelClass & that); - ~MeshModelClass(); + virtual ~MeshModelClass() override; MeshModelClass & operator = (const MeshModelClass & that); void Reset(int polycount,int vertcount,int passcount); @@ -224,7 +224,7 @@ class MeshModelClass : public MeshGeometryClass void Make_Color_Array_Unique(int array_index=0); // Load the w3d file format - WW3DErrorType Load_W3D(ChunkLoadClass & cload); + virtual WW3DErrorType Load_W3D(ChunkLoadClass & cload) override; ///////////////////////////////////////////////////////////////////////////////////// // Decal interface diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index 27573d49e3b..418b4b1586c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -114,7 +114,7 @@ class MeshLoadContextClass : public W3DMPO W3DMPO_GLUE(MeshLoadContextClass) private: MeshLoadContextClass(); - ~MeshLoadContextClass(); + ~MeshLoadContextClass() override; W3dTexCoordStruct * Get_Texcoord_Array(); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 0ff5860e613..c1dc763e043 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -63,7 +63,7 @@ class MotionChannelClass : public W3DMPO public: MotionChannelClass(); - ~MotionChannelClass(); + virtual ~MotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -154,7 +154,7 @@ class BitChannelClass : public W3DMPO public: BitChannelClass(); - ~BitChannelClass(); + virtual ~BitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -210,7 +210,7 @@ class TimeCodedMotionChannelClass : public W3DMPO public: TimeCodedMotionChannelClass(); - ~TimeCodedMotionChannelClass(); + virtual ~TimeCodedMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -248,7 +248,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO public: AdaptiveDeltaMotionChannelClass(); - ~AdaptiveDeltaMotionChannelClass(); + virtual ~AdaptiveDeltaMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -297,7 +297,7 @@ class TimeCodedBitChannelClass : public W3DMPO public: TimeCodedBitChannelClass(); - ~TimeCodedBitChannelClass(); + virtual ~TimeCodedBitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 4fa3f11f214..5652c0e9de1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -47,12 +47,12 @@ class Null3DObjClass : public RenderObjClass Null3DObjClass(const Null3DObjClass & src); Null3DObjClass & operator = (const Null3DObjClass & that); - virtual int Class_ID() const; - virtual RenderObjClass * Clone() const; - virtual const char * Get_Name() const { return Name; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual int Class_ID() const override; + virtual RenderObjClass * Clone() const override; + virtual const char * Get_Name() const override { return Name; } + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; protected: @@ -67,10 +67,10 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass NullPrototypeClass(); NullPrototypeClass(const W3dNullObjectStruct &null); - virtual const char * Get_Name() const { return Definition.Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_NULL; } - virtual RenderObjClass * Create() { return NEW_REF(Null3DObjClass,(Definition.Name)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition.Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_NULL; } + virtual RenderObjClass * Create() override { return NEW_REF(Null3DObjClass,(Definition.Name)); } + virtual void DeleteSelf() override { delete this; } protected: W3dNullObjectStruct Definition; @@ -80,8 +80,8 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass class NullLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_NULL_OBJECT; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_NULL_OBJECT; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 31ee182c80c..2331a8573dd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -92,23 +92,23 @@ class ParticleBufferClass : public RenderObjClass ParticleBufferClass(const ParticleBufferClass & src); ParticleBufferClass & operator = (const ParticleBufferClass &); - virtual ~ParticleBufferClass(); + virtual ~ParticleBufferClass() override; /* ** RenderObjClass Interface: */ - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_PARTICLEBUFFER; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_PARTICLEBUFFER; } - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; int Get_Particle_Count() const; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; // Scales the size of the individual particles but doesn't affect their // position (and therefore the size of the particle system as a whole) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // The particle buffer never receives a Set_Transform/Position call, // evem though its bounding volume changes. Since bounding volume @@ -116,29 +116,29 @@ class ParticleBufferClass : public RenderObjClass // the cached bounding volumes will not be invalidated unless we do // it elsewhere (such as here). We also need to call the particle // emitter's Emit() function (done here to avoid order dependence). - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LodBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LodBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; /* ** These members are not part of the RenderObjClass Interface: @@ -161,7 +161,7 @@ class ParticleBufferClass : public RenderObjClass void Set_Emitter(ParticleEmitterClass *emitter); // from RenderObj... - virtual bool Is_Complete() { return IsEmitterDead && !NonNewNum && !NewNum; } + virtual bool Is_Complete() override { return IsEmitterDead && !NonNewNum && !NewNum; } // This adds an uninitialized NewParticleStuct to the new particle // buffer and returns its address so the particle emitter can @@ -227,7 +227,7 @@ class ParticleBufferClass : public RenderObjClass protected: - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // render the particle system as a collection of particles void Render_Particles(RenderInfoClass & rinfo); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 52477dcc204..b26f67b6e63 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -121,42 +121,42 @@ class ParticleEmitterClass : public RenderObjClass ParticleEmitterClass(const ParticleEmitterClass & src); ParticleEmitterClass & operator = (const ParticleEmitterClass &); - virtual ~ParticleEmitterClass(); + virtual ~ParticleEmitterClass() override; // Creation/serialization methods - virtual RenderObjClass * Clone() const; + virtual RenderObjClass * Clone() const override; static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition); ParticleEmitterDefClass * Build_Definition () const; WW3DErrorType Save (ChunkSaveClass &chunk_save) const; // Identification methods - virtual int Class_ID () const { return CLASSID_PARTICLEEMITTER; } - virtual const char * Get_Name () const { return NameString; } - virtual void Set_Name (const char *pname); + virtual int Class_ID () const override { return CLASSID_PARTICLEEMITTER; } + virtual const char * Get_Name () const override { return NameString; } + virtual void Set_Name (const char *pname) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo) { } - virtual void Restart(); + virtual void Render(RenderInfoClass & rinfo) override { } + virtual void Restart() override; // Scales the size of all particles and effects positions/velocities of // particles emitted after the Scale() call (but not before) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // Put particle buffer in scene if this is the first time (clunky code // - hopefully can be rewritten more cleanly in future)... - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere.Center.Set(0,0,0); sphere.Radius = 0; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } - virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } + virtual void Set_LOD_Bias(float bias) override { if (Buffer) Buffer->Set_LOD_Bias(bias); } // These are not part of the renderobject interface: @@ -202,7 +202,7 @@ class ParticleEmitterClass : public RenderObjClass void Remove_Buffer_From_Scene () { Buffer->Remove (); FirstTime = true; BufferSceneNeeded = true; } // from RenderObj... - virtual bool Is_Complete() { return IsComplete; } + virtual bool Is_Complete() override { return IsComplete; } // Auto deletion behavior controls bool Is_Remove_On_Complete_Enabled() { return RemoveOnComplete; } @@ -274,7 +274,7 @@ class ParticleEmitterClass : public RenderObjClass protected: // Used to build a list of filenames this emitter is dependent on - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; // This method is called each time the visibility state of the emitter changes. virtual void Update_On_Visibility (); @@ -284,7 +284,7 @@ class ParticleEmitterClass : public RenderObjClass // Collision sphere is a point - emitter emits also when not visible, // so this is only important to avoid affecting the collision spheres // of hierarchy objects into which the emitter is inserted. - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // Create new particles and pass them to the particle buffer. Receives // the end-of-interval quaternion and origin and interpolates between diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 3777bcfe9eb..72368f13138 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -327,14 +327,14 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name () const { return m_pDefinition->Get_Name(); } - virtual int Get_Class_ID () const { return RenderObjClass::CLASSID_PARTICLEEMITTER; } - virtual RenderObjClass * Create (); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name () const override { return m_pDefinition->Get_Name(); } + virtual int Get_Class_ID () const override { return RenderObjClass::CLASSID_PARTICLEEMITTER; } + virtual RenderObjClass * Create () override; + virtual void DeleteSelf() override { delete this; } virtual ParticleEmitterDefClass * Get_Definition () const { return m_pDefinition; } protected: - virtual ~ParticleEmitterPrototypeClass () { delete m_pDefinition; } + virtual ~ParticleEmitterPrototypeClass () override { delete m_pDefinition; } protected: /////////////////////////////////////////////////////////// @@ -353,8 +353,8 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_EMITTER; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_EMITTER; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index 7c5d0f12b25..57cf782d41c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -95,7 +95,7 @@ class Render2DClass : public W3DMPO W3DMPO_GLUE(Render2DClass) public: Render2DClass( TextureClass* tex = nullptr ); - virtual ~Render2DClass(); + virtual ~Render2DClass() override; virtual void Reset(); void Render(); @@ -189,9 +189,9 @@ class Render2DClass : public W3DMPO class Render2DTextClass : public Render2DClass { public: Render2DTextClass(Font3DInstanceClass *font=nullptr); - ~Render2DTextClass(); + virtual ~Render2DTextClass() override; - virtual void Reset(); + virtual void Reset() override; Font3DInstanceClass * Peek_Font() { return Font; } void Set_Font( Font3DInstanceClass *font ); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index 3e9b74d5d44..f30876585f2 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -92,10 +92,10 @@ enum class SimpleSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 09bbd21f614..b8392ebffbc 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -88,7 +88,7 @@ class SceneClass : public RefCountClass { public: SceneClass(); - virtual ~SceneClass(); + virtual ~SceneClass() override; /////////////////////////////////////////////////////////////////////////////////// // RTTI information. @@ -218,20 +218,20 @@ class SimpleSceneClass : public SceneClass public: SimpleSceneClass(); - virtual ~SimpleSceneClass(); + virtual ~SimpleSceneClass() override; virtual int Get_Scene_ID() { return SCENE_ID_SIMPLE; } - virtual void Add_Render_Object(RenderObjClass * obj); - virtual void Remove_Render_Object(RenderObjClass * obj); + virtual void Add_Render_Object(RenderObjClass * obj) override; + virtual void Remove_Render_Object(RenderObjClass * obj) override; virtual void Remove_All_Render_Objects(); - virtual void Register(RenderObjClass * obj,RegType for_what); - virtual void Unregister(RenderObjClass * obj,RegType for_what); + virtual void Register(RenderObjClass * obj,RegType for_what) override; + virtual void Unregister(RenderObjClass * obj,RegType for_what) override; - virtual SceneIterator * Create_Iterator(bool onlyvisible = false); - virtual void Destroy_Iterator(SceneIterator * it); + virtual SceneIterator * Create_Iterator(bool onlyvisible = false) override; + virtual void Destroy_Iterator(SceneIterator * it) override; // Set visibility status for my render objects. If not called explicitly // beforehand, will be called inside Render(). @@ -241,7 +241,7 @@ class SimpleSceneClass : public SceneClass // Point visibility - used by DazzleRenderObj when no custom handler is installed /////////////////////////////////////////////////////////////////////////////////// virtual float Compute_Point_Visibility( RenderInfoClass & rinfo, - const Vector3 & point); + const Vector3 & point) override; protected: @@ -255,6 +255,6 @@ class SimpleSceneClass : public SceneClass friend class SimpleSceneIterator; - virtual void Customized_Render(RenderInfoClass & rinfo); - virtual void Post_Render_Processing(RenderInfoClass& rinfo); + virtual void Customized_Render(RenderInfoClass & rinfo) override; + virtual void Post_Render_Processing(RenderInfoClass& rinfo) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index b2703c87f85..9540ffc28c8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -101,7 +101,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass VertexMaterialClass(); VertexMaterialClass(const VertexMaterialClass & src); - ~VertexMaterialClass(); + virtual ~VertexMaterialClass() override; VertexMaterialClass & operator = (const VertexMaterialClass &src); VertexMaterialClass * Clone() { VertexMaterialClass * mat = NEW_REF (VertexMaterialClass,()); *mat = *this; return mat;} diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 385fd0ff7bc..53e2d3e3042 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -62,49 +62,49 @@ class Animatable3DObjClass : public CompositeRenderObjClass Animatable3DObjClass(const char * htree_name); Animatable3DObjClass(const Animatable3DObjClass & src); Animatable3DObjClass & operator = (const Animatable3DObjClass &); - virtual ~Animatable3DObjClass(); + virtual ~Animatable3DObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; virtual void Set_Animation_Frame_Rate_Multiplier(float multiplier); // 020607 srj -- added virtual HAnimClass * Peek_Animation_And_Info(float& frame, int& numFrames, int& mode, float& mult); // 020710 srj -- added - virtual HAnimClass * Peek_Animation(); + virtual HAnimClass * Peek_Animation() override; virtual bool Is_Animation_Complete() const; - virtual int Get_Num_Bones(); - virtual const char * Get_Bone_Name(int bone_index); - virtual int Get_Bone_Index(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(int boneindex); - virtual void Capture_Bone(int boneindex); - virtual void Release_Bone(int boneindex); - virtual bool Is_Bone_Captured(int boneindex) const; - virtual void Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false); - virtual const HTreeClass * Get_HTree() const { return HTree; } + virtual int Get_Num_Bones() override; + virtual const char * Get_Bone_Name(int bone_index) override; + virtual int Get_Bone_Index(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(int boneindex) override; + virtual void Capture_Bone(int boneindex) override; + virtual void Release_Bone(int boneindex) override; + virtual bool Is_Bone_Captured(int boneindex) const override; + virtual void Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false) override; + virtual const HTreeClass * Get_HTree() const override { return HTree; } // // Simple bone evaluation methods for when the caller doesn't want @@ -126,7 +126,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass float Compute_Current_Frame(float *newDirection=nullptr) const; // Update the sub-object transforms according to the current anim state and root transform. - virtual void Update_Sub_Object_Transforms(); + virtual void Update_Sub_Object_Transforms() override; // Update the transforms using the base pose only void Base_Update(const Matrix3D & root); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index 978060415bc..5735c6e81ec 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -137,9 +137,9 @@ static NullPrototypeClass _NullPrototype; class RObjIterator : public RenderObjIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); - virtual int Current_Item_Class_ID(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; + virtual int Current_Item_Class_ID() override; protected: friend class WW3DAssetManager; }; @@ -154,10 +154,10 @@ class HAnimIterator : public AssetIterator public: HAnimIterator() : Iterator( WW3DAssetManager::Get_Instance()->HAnimManager ) { }; - virtual void First() { Iterator.First(); } - virtual void Next() { Iterator.Next(); } - virtual bool Is_Done() { return Iterator.Is_Done(); } - virtual const char * Current_Item_Name() { return Iterator.Get_Current_Anim()->Get_Name(); } + virtual void First() override { Iterator.First(); } + virtual void Next() override { Iterator.Next(); } + virtual bool Is_Done() override { return Iterator.Is_Done(); } + virtual const char * Current_Item_Name() override { return Iterator.Get_Current_Anim()->Get_Name(); } protected: HAnimManagerIterator Iterator; @@ -167,8 +167,8 @@ class HAnimIterator : public AssetIterator class HTreeIterator : public AssetIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -177,10 +177,10 @@ class Font3DDataIterator : public AssetIterator { public: - virtual void First() { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - virtual void Next() { Node = Node->Next(); } - virtual bool Is_Done() { return Node==nullptr; } - virtual const char * Current_Item_Name() { return Node->Data()->Name; } + virtual void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + virtual void Next() override { Node = Node->Next(); } + virtual bool Is_Done() override { return Node==nullptr; } + virtual const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 398b237c830..47cd00273a9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -77,9 +77,9 @@ class BoxRenderObjClass : public RenderObjClass BoxRenderObjClass(const BoxRenderObjClass & src); BoxRenderObjClass & operator = (const BoxRenderObjClass &); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; void Set_Color(const Vector3 & color); void Set_Opacity(float opacity) { Opacity = opacity; } @@ -143,19 +143,19 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // AABoxRenderObjClass Interface @@ -164,7 +164,7 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; AABoxClass CachedBox; @@ -194,19 +194,19 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // OBBoxRenderObjClass Interface @@ -215,7 +215,7 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; OBBoxClass CachedBox; @@ -228,8 +228,8 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass class BoxLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_BOX; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_BOX; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -242,10 +242,10 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass W3DMPO_GLUE(BoxPrototypeClass) public: BoxPrototypeClass(W3dBoxStruct box); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } private: W3dBoxStruct Definition; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index ed18badc1cf..6465fcd2a6d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -120,28 +120,28 @@ class CameraClass : public RenderObjClass CameraClass(); CameraClass(const CameraClass & src); CameraClass & operator = (const CameraClass &); - virtual ~CameraClass(); - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_CAMERA; } + virtual ~CameraClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_CAMERA; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering, cameras don't "render" ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Cameras cache their frustum description, this is invalidated whenever // the transform/position is changed ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////// // Camera parameter control diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index e37a774733a..90bf25bda7e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1430,9 +1430,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index b2446d8ff85..4fdc4408672 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -271,15 +271,15 @@ class DazzleRenderObjClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DAZZLE; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DAZZLE; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - virtual void Scale(float scale) { current_scale*=scale; }; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + virtual void Scale(float scale) override { current_scale*=scale; }; void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; } void Set_Halo_Color(const Vector3& col) { halo_color=col; } @@ -300,7 +300,7 @@ class DazzleRenderObjClass : public RenderObjClass // Persistent object save-load interface // Dazzles save their "dazzle-type" and transform - virtual const PersistFactoryClass & Get_Factory () const; + virtual const PersistFactoryClass & Get_Factory () const override; // Set the static "current layer" variable. This variable is used in the // Render() call so that the dazzle knows which list to add itself to if @@ -359,10 +359,10 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass public: DazzlePrototypeClass() : DazzleType(0) { } - virtual const char * Get_Name() const { return Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DAZZLE; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DAZZLE; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } WW3DErrorType Load_W3D(ChunkLoadClass & cload); @@ -384,8 +384,8 @@ class DazzleLoaderClass : public PrototypeLoaderClass DazzleLoaderClass() { } ~DazzleLoaderClass() { } - virtual int Chunk_Type() { return W3D_CHUNK_DAZZLE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_DAZZLE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern DazzleLoaderClass _DazzleLoader; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 53bd7a5e7b1..02a112a4448 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -55,7 +55,7 @@ class IndexBufferClass : public W3DMPO, public RefCountClass // nope, it's an ABC //W3DMPO_GLUE(IndexBufferClass) protected: - virtual ~IndexBufferClass(); + virtual ~IndexBufferClass() override; public: IndexBufferClass(unsigned type, unsigned short index_count); @@ -122,7 +122,7 @@ class DynamicIBAccessClass : public W3DMPO public: DynamicIBAccessClass(unsigned short type, unsigned short index_count); - ~DynamicIBAccessClass(); + virtual ~DynamicIBAccessClass() override; unsigned Get_Type() const { return Type; } unsigned short Get_Index_Count() const { return IndexCount; } @@ -168,7 +168,7 @@ class DX8IndexBufferClass : public IndexBufferClass }; DX8IndexBufferClass(unsigned short index_count,UsageType usage=USAGE_DEFAULT); - ~DX8IndexBufferClass(); + virtual ~DX8IndexBufferClass() override; void Copy(unsigned int* indices,unsigned start_index,unsigned index_count); void Copy(unsigned short* indices,unsigned start_index,unsigned index_count); @@ -192,7 +192,7 @@ class SortingIndexBufferClass : public IndexBufferClass friend DynamicIBAccessClass::WriteLockClass; public: SortingIndexBufferClass(unsigned short index_count); - ~SortingIndexBufferClass(); + virtual ~SortingIndexBufferClass() override; protected: unsigned short* index_buffer; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 166668552b7..0fc178728db 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -88,7 +88,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass public: DX8TextureCategoryClass(DX8FVFCategoryContainer* container,TextureClass** textures, ShaderClass shd, VertexMaterialClass* mat,int pass); - ~DX8TextureCategoryClass(); + virtual ~DX8TextureCategoryClass() override; void Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh); @@ -178,7 +178,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass public: DX8FVFCategoryContainer(unsigned FVF,bool sorting); - virtual ~DX8FVFCategoryContainer(); + virtual ~DX8FVFCategoryContainer() override; static unsigned Define_FVF(MeshModelClass* mmc,bool enable_lighting); bool Is_Sorting() const { return sorting; } @@ -235,20 +235,20 @@ class DX8RigidFVFCategoryContainer : public DX8FVFCategoryContainer { public: DX8RigidFVFCategoryContainer(unsigned FVF,bool sorting); - ~DX8RigidFVFCategoryContainer(); + virtual ~DX8RigidFVFCategoryContainer() override; - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; - void Render(); // Generic render function + virtual void Render() override; // Generic render function /* ** This method adds a material pass which must be rendered after all of the other rendering is complete. ** This is needed whenever a mesh turns off its base passes and renders a translucent pass on its geometry. */ - virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh); - virtual void Render_Delayed_Procedural_Material_Passes(); + virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) override; + virtual void Render_Delayed_Procedural_Material_Passes() override; protected: @@ -270,12 +270,12 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer { public: DX8SkinFVFCategoryContainer(bool sorting); - ~DX8SkinFVFCategoryContainer(); + virtual ~DX8SkinFVFCategoryContainer() override; - void Render(); - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Render() override; + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; void Add_Visible_Skin(MeshClass * mesh); @@ -283,8 +283,8 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer ** Since skins are already rendered after the rigid meshes, the Add_Delayed_Material_Pass function simply ** routes into the Add_Visible_Material_Pass method and no extra overhead is added. */ - virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) { Add_Visible_Material_Pass(pass,mesh); } - virtual void Render_Delayed_Procedural_Material_Passes() { } + virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) override { Add_Visible_Material_Pass(pass,mesh); } + virtual void Render_Delayed_Procedural_Material_Passes() override { } private: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index a5e502c4d6e..202a587bec6 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -80,7 +80,7 @@ class VertexBufferClass : public W3DMPO, public RefCountClass protected: VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount, unsigned vertex_size=0); - virtual ~VertexBufferClass(); + virtual ~VertexBufferClass() override; public: const FVFInfoClass& FVF_Info() const { return *fvf_info; } @@ -202,7 +202,7 @@ class DX8VertexBufferClass : public VertexBufferClass { W3DMPO_GLUE(DX8VertexBufferClass) protected: - ~DX8VertexBufferClass(); + virtual ~DX8VertexBufferClass() override; public: enum UsageType { USAGE_DEFAULT=0, @@ -250,7 +250,7 @@ class SortingVertexBufferClass : public VertexBufferClass VertexFormatXYZNDUV2* VertexBuffer; protected: - ~SortingVertexBufferClass(); + virtual ~SortingVertexBufferClass() override; public: SortingVertexBufferClass(unsigned short VertexCount); }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index ad4c88f9034..01352a78e55 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -53,9 +53,9 @@ class MissingAnimClass : public HashableClass { public: MissingAnimClass( const char * name ) : Name( name ) {} - virtual ~MissingAnimClass() {} + virtual ~MissingAnimClass() override {} - virtual const char * Get_Key() { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 5b516de3071..49d85036081 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -70,14 +70,14 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass HLodClass(const HModelDefClass & def); HLodClass & operator = (const HLodClass &); - virtual ~HLodClass(); + virtual ~HLodClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_HLOD; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_HLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // HLod Interface - Editing and information @@ -108,102 +108,102 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; - virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const; - virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const; - virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const; - virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const override; + virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const override; + virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const override; + virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const override; + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Recalculate_Static_LOD_Factors(); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias); - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - virtual RenderObjClass * Get_Current_LOD(); + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Recalculate_Static_LOD_Factors() override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override; + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + virtual RenderObjClass * Get_Current_LOD() override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const SphereClass & Get_Bounding_Sphere() const; - virtual const AABoxClass & Get_Bounding_Box() const; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual const SphereClass & Get_Bounding_Sphere() const override; + virtual const AABoxClass & Get_Bounding_Box() const override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// // virtual void Set_Texture_Reduction_Factor(float trf); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez) { } - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Set_Hidden(int onoff); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override { } + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Set_Hidden(int onoff) override; // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS! - virtual void Set_HTree(HTreeClass * htree); + virtual void Set_HTree(HTreeClass * htree) override; protected: HLodClass(); void Free(); - virtual void Update_Sub_Object_Transforms(); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Update_Sub_Object_Transforms() override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: @@ -267,8 +267,8 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass class HLodLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_HLOD; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_HLOD; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -284,7 +284,7 @@ class HLodDefClass : public W3DMPO HLodDefClass(); HLodDefClass(HLodClass &src_lod); - ~HLodDefClass(); + virtual ~HLodDefClass() override; WW3DErrorType Load_W3D(ChunkLoadClass & cload); WW3DErrorType Save(ChunkSaveClass & csave); @@ -349,15 +349,15 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass public: HLodPrototypeClass( HLodDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } HLodDefClass * Get_Definition() const { return Definition; } protected: - virtual ~HLodPrototypeClass() { delete Definition; } + virtual ~HLodPrototypeClass() override { delete Definition; } private: HLodDefClass * Definition; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index 34cdae93bae..f190e276ba2 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -75,30 +75,30 @@ class HMorphAnimClass : public HAnimClass }; HMorphAnimClass(); - ~HMorphAnimClass(); + virtual ~HMorphAnimClass() override; void Free_Morph(); int Create_New_Morph(const int channels, HAnimClass *anim[]); int Load_W3D(ChunkLoadClass & cload); int Save_W3D(ChunkSaveClass & csave); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } + virtual const char * Get_Name() const override { return Name; } + virtual const char * Get_HName() const override { return HierarchyName; } - int Get_Num_Frames() { return FrameCount; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)FrameCount / FrameRate; } + virtual int Get_Num_Frames() override { return FrameCount; } + virtual float Get_Frame_Rate() override { return FrameRate; } + virtual float Get_Total_Time() override { return (float)FrameCount / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame) { return true; } + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override { return true; } void Insert_Morph_Key (const int channel, uint32 morph_frame, uint32 pose_frame); void Release_Keys (); - bool Is_Node_Motion_Present(int pividx) { return true; } - int Get_Num_Pivots() const { return NumNodes; } + virtual bool Is_Node_Motion_Present(int pividx) override { return true; } + virtual int Get_Num_Pivots() const override { return NumNodes; } void Set_Name(const char * name); void Set_HName(const char * hname); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index ce557423cd7..ddd7ee7b146 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -82,32 +82,32 @@ class HRawAnimClass : public HAnimClass }; HRawAnimClass(); - ~HRawAnimClass(); + virtual ~HRawAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + virtual const char * Get_Name() const override { return Name; } + virtual const char * Get_HName() const override { return HierarchyName; } + virtual int Get_Num_Frames() override { return NumFrames; } + virtual float Get_Frame_Rate() override { return FrameRate; } + virtual float Get_Total_Time() override { return (float)NumFrames / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + virtual bool Is_Node_Motion_Present(int pividx) override; + virtual int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + virtual bool Has_X_Translation (int pividx) override; + virtual bool Has_Y_Translation (int pividx) override; + virtual bool Has_Z_Translation (int pividx) override; + virtual bool Has_Rotation (int pividx) override; + virtual bool Has_Visibility (int pividx) override; NodeMotionStruct *Get_Node_Motion_Array() {return NodeMotion;} - virtual int Class_ID() const { return CLASSID_HRAWANIM; } + virtual int Class_ID() const override { return CLASSID_HRAWANIM; } private: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index 12033bbd1ca..2f9f5f90c90 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -68,30 +68,30 @@ class LightClass : public RenderObjClass LightClass(LightType type = POINT); LightClass(const LightClass & src); LightClass & operator = (const LightClass &); - virtual ~LightClass(); - RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_LIGHT; } + virtual ~LightClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_LIGHT; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering // Lights do not "Render" but they are vertex processors. ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } virtual bool Is_Vertex_Processor() { return true; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Lights register themselves with the scene as VertexProcessors. ///////////////////////////////////////////////////////////////////////////// - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes // Bounding volume of a light extends to its attenuation radius ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // LightClass Interface @@ -146,9 +146,9 @@ class LightClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface ///////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; //bool isDonut() {return Donut; }; //void setDonut(bool donut) { Donut = donut; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 97e91f7c311..1b2c6d5047b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -86,7 +86,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass TextureMapperClass(unsigned int stage=0); TextureMapperClass(const TextureMapperClass & src) : Stage(src.Stage) { } - virtual ~TextureMapperClass() { } + virtual ~TextureMapperClass() override { } virtual int Mapper_ID() const { return MAPPER_ID_UNKNOWN;} @@ -119,12 +119,12 @@ class ScaleTextureMapperClass : public TextureMapperClass ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ScaleTextureMapperClass(const ScaleTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SCALE;} + virtual int Mapper_ID() const override { return MAPPER_ID_SCALE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ScaleTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ScaleTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: Vector2 Scale; // Scale @@ -143,14 +143,14 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass LinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); LinearOffsetTextureMapperClass(const LinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } + virtual bool Is_Time_Variant() override { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; void Set_Current_UV_Offset(const Vector2 &cur) { CurrentUVOffset = cur; @@ -185,14 +185,14 @@ class GridTextureMapperClass : public TextureMapperClass GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridTextureMapperClass(const GridTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID;} + virtual int Mapper_ID() const override { return MAPPER_ID_GRID;} - virtual TextureMapperClass *Clone() const { return NEW_REF( GridTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( GridTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; void Set_Frame(unsigned int frame) { CurrentFrame=frame; } void Set_Frame_Per_Second(float fps); @@ -229,13 +229,13 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RotateTextureMapperClass(const RotateTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ROTATE;} + virtual int Mapper_ID() const override { return MAPPER_ID_ROTATE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RotateTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RotateTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: float CurrentAngle; @@ -256,13 +256,13 @@ class SineLinearOffsetTextureMapperClass : public ScaleTextureMapperClass SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); SineLinearOffsetTextureMapperClass(const SineLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SINE_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_SINE_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector3 UAFP; // U Coordinate Amplitude frequency phase @@ -284,13 +284,13 @@ class StepLinearOffsetTextureMapperClass : public ScaleTextureMapperClass StepLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); StepLinearOffsetTextureMapperClass(const StepLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_STEP_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_STEP_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector2 Step; // Size of step @@ -313,13 +313,13 @@ class ZigZagLinearOffsetTextureMapperClass : public ScaleTextureMapperClass ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector2 Speed; // Speed of zigzag in units per millisecond @@ -342,11 +342,11 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass public: ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class EnvironmentMapperClass : public TextureMapperClass @@ -355,11 +355,11 @@ class EnvironmentMapperClass : public TextureMapperClass public: EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class EdgeMapperClass : public TextureMapperClass @@ -369,13 +369,13 @@ class EdgeMapperClass : public TextureMapperClass EdgeMapperClass(unsigned int stage); EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage); EdgeMapperClass(const EdgeMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_EDGE;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EdgeMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_EDGE;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EdgeMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: unsigned int LastUsedSyncTime; // Sync time last used to update offset @@ -390,8 +390,8 @@ class WSEnvMapperClass : public TextureMapperClass WSEnvMapperClass(AxisType axis, unsigned int stage) : TextureMapperClass(stage), Axis(axis) { } WSEnvMapperClass(const WSEnvMapperClass & src) : TextureMapperClass(src), Axis(src.Axis) { } WSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: AxisType Axis; }; @@ -403,9 +403,9 @@ class WSClassicEnvironmentMapperClass : public WSEnvMapperClass WSClassicEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { } WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { } WSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class WSEnvironmentMapperClass : public WSEnvMapperClass @@ -415,9 +415,9 @@ class WSEnvironmentMapperClass : public WSEnvMapperClass WSEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { } WSEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { } WSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class GridClassicEnvironmentMapperClass : public GridTextureMapperClass @@ -427,11 +427,11 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass GridClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { } GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { } GridClassicEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class GridEnvironmentMapperClass : public GridTextureMapperClass @@ -441,11 +441,11 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass GridEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { } GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { } GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; // ---------------------------------------------------------------------------- @@ -462,10 +462,10 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass const Vector2 &scale, unsigned int stage) : LinearOffsetTextureMapperClass(offset_per_sec, start_offset, clamp_fix, scale, stage) { } ScreenMapperClass(const INIClass &ini, const char *section, unsigned int stage) : LinearOffsetTextureMapperClass(ini, section, stage) { } ScreenMapperClass(const ScreenMapperClass & src) : LinearOffsetTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_SCREEN;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ScreenMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_SCREEN;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ScreenMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; /** @@ -480,13 +480,13 @@ class RandomTextureMapperClass : public ScaleTextureMapperClass RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RandomTextureMapperClass(const RandomTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_RANDOM;} + virtual int Mapper_ID() const override { return MAPPER_ID_RANDOM;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RandomTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RandomTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: void randomize(); @@ -512,11 +512,11 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage); BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_BUMPENV;} + virtual int Mapper_ID() const override { return MAPPER_ID_BUMPENV;} - virtual TextureMapperClass *Clone() const { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: @@ -533,8 +533,8 @@ class GridWSEnvMapperClass : public GridTextureMapperClass GridWSEnvMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSEnvMapperClass(const GridWSEnvMapperClass & src); GridWSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); - virtual bool Needs_Normals() { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; + virtual bool Needs_Normals() override { return true; } protected: AxisType Axis; }; @@ -545,9 +545,9 @@ class GridWSClassicEnvironmentMapperClass : public GridWSEnvMapperClass GridWSClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridWSClassicEnvironmentMapperClass(const GridWSEnvMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridWSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass @@ -556,9 +556,9 @@ class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass GridWSEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridWSEnvironmentMapperClass(const GridWSEnvMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridWSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 50031967d14..935ebce02de 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -94,10 +94,10 @@ class MatrixMapperClass : public TextureMapperClass void Compute_Texture_Coordinate(const Vector3 & point,Vector3 * set_stq); - TextureMapperClass* Clone() const { WWASSERT(0); return nullptr; } + virtual TextureMapperClass* Clone() const override { WWASSERT(0); return nullptr; } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: @@ -126,12 +126,12 @@ class CompositeMatrixMapperClass : public MatrixMapperClass CompositeMatrixMapperClass(TextureMapperClass *internal_mapper, unsigned int stage); CompositeMatrixMapperClass(const CompositeMatrixMapperClass & src); - virtual ~CompositeMatrixMapperClass(); + virtual ~CompositeMatrixMapperClass() override; - virtual TextureMapperClass *Clone() const { return NEW_REF( CompositeMatrixMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( CompositeMatrixMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index b1109cad995..d248a1f9a6b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -73,51 +73,51 @@ class MeshClass : public W3DMPO, public RenderObjClass MeshClass(); MeshClass(const MeshClass & src); MeshClass & operator = (const MeshClass &); - virtual ~MeshClass(); + virtual ~MeshClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_MESH; } - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual int Get_Num_Polys() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_MESH; } + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual int Get_Num_Polys() const override; + virtual void Render(RenderInfoClass & rinfo) override; void Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass * ib); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual MaterialInfoClass * Get_Material_Info(); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual MaterialInfoClass * Get_Material_Info() override; - virtual int Get_Sort_Level() const; - virtual void Set_Sort_Level(int level); + virtual int Get_Sort_Level() const override; + virtual void Set_Sort_Level(int level) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals ///////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // MeshClass Interface @@ -160,9 +160,9 @@ class MeshClass : public W3DMPO, public RenderObjClass protected: - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Free(); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index ece1bdd7515..7455905379f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp @@ -103,7 +103,7 @@ class FaceHasherClass : public HashCalculatorClass { public: - virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) + virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override { // Note: if we want this to detect duplicates that are "rotated", must change // both this function and the Compute_Hash function... @@ -115,7 +115,7 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) + virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override { HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; } @@ -130,7 +130,7 @@ class FaceHasherClass : public HashCalculatorClass return 1; } - virtual int Get_Hash_Value(int /*index*/) + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index e6618216a69..37db2d915c7 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -91,7 +91,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO MeshGeometryClass(); MeshGeometryClass(const MeshGeometryClass & that); - virtual ~MeshGeometryClass(); + virtual ~MeshGeometryClass() override; MeshGeometryClass & operator = (const MeshGeometryClass & that); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index 687ed8989fd..3c96ccbf0e2 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO MeshMatDescClass(); MeshMatDescClass(const MeshMatDescClass & that); - ~MeshMatDescClass(); + virtual ~MeshMatDescClass() override; void Reset(int polycount,int vertcount,int passcount); MeshMatDescClass & operator = (const MeshMatDescClass & that); @@ -234,7 +234,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * > public: MatBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } MatBufferClass(const MatBufferClass & that); - ~MatBufferClass(); + virtual ~MatBufferClass() override; void Set_Element(int index,VertexMaterialClass * mat); VertexMaterialClass * Get_Element(int index); @@ -256,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * > public: TexBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } TexBufferClass(const TexBufferClass & that); - ~TexBufferClass(); + virtual ~TexBufferClass() override; void Set_Element(int index,TextureClass * mat); TextureClass * Get_Element(int index); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index e188bb38684..50d20fe9bdf 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO public: GapFillerClass(MeshModelClass* mmc); GapFillerClass(const GapFillerClass& that); - ~GapFillerClass(); + virtual ~GapFillerClass() override; WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; } WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; } @@ -153,7 +153,7 @@ class MeshModelClass : public MeshGeometryClass MeshModelClass(); MeshModelClass(const MeshModelClass & that); - ~MeshModelClass(); + virtual ~MeshModelClass() override; MeshModelClass & operator = (const MeshModelClass & that); void Reset(int polycount,int vertcount,int passcount); @@ -223,7 +223,7 @@ class MeshModelClass : public MeshGeometryClass void Make_Color_Array_Unique(int array_index=0); // Load the w3d file format - WW3DErrorType Load_W3D(ChunkLoadClass & cload); + virtual WW3DErrorType Load_W3D(ChunkLoadClass & cload) override; ///////////////////////////////////////////////////////////////////////////////////// // Decal interface diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index f020efa16b8..9643e68bb38 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -114,7 +114,7 @@ class MeshLoadContextClass : public W3DMPO W3DMPO_GLUE(MeshLoadContextClass) private: MeshLoadContextClass(); - ~MeshLoadContextClass(); + ~MeshLoadContextClass() override; W3dTexCoordStruct * Get_Texcoord_Array(); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 25182483f71..067708080f5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -64,7 +64,7 @@ class MotionChannelClass : public W3DMPO void Get_Vector(int frame,float * setvec) const; MotionChannelClass(); - ~MotionChannelClass(); + virtual ~MotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -159,7 +159,7 @@ class BitChannelClass : public W3DMPO public: BitChannelClass(); - ~BitChannelClass(); + virtual ~BitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -215,7 +215,7 @@ class TimeCodedMotionChannelClass : public W3DMPO public: TimeCodedMotionChannelClass(); - ~TimeCodedMotionChannelClass(); + virtual ~TimeCodedMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -253,7 +253,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO public: AdaptiveDeltaMotionChannelClass(); - ~AdaptiveDeltaMotionChannelClass(); + virtual ~AdaptiveDeltaMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -302,7 +302,7 @@ class TimeCodedBitChannelClass : public W3DMPO public: TimeCodedBitChannelClass(); - ~TimeCodedBitChannelClass(); + virtual ~TimeCodedBitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 31362c645fa..fcd16c43eb1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -47,12 +47,12 @@ class Null3DObjClass : public RenderObjClass Null3DObjClass(const Null3DObjClass & src); Null3DObjClass & operator = (const Null3DObjClass & that); - virtual int Class_ID() const; - virtual RenderObjClass * Clone() const; - virtual const char * Get_Name() const { return Name; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual int Class_ID() const override; + virtual RenderObjClass * Clone() const override; + virtual const char * Get_Name() const override { return Name; } + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; protected: @@ -67,10 +67,10 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass NullPrototypeClass(); NullPrototypeClass(const W3dNullObjectStruct &null); - virtual const char * Get_Name() const { return Definition.Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_NULL; } - virtual RenderObjClass * Create() { return NEW_REF(Null3DObjClass,(Definition.Name)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition.Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_NULL; } + virtual RenderObjClass * Create() override { return NEW_REF(Null3DObjClass,(Definition.Name)); } + virtual void DeleteSelf() override { delete this; } protected: W3dNullObjectStruct Definition; @@ -80,8 +80,8 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass class NullLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_NULL_OBJECT; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_NULL_OBJECT; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 66f21cd5fb6..aa5f1b7900e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -94,23 +94,23 @@ class ParticleBufferClass : public RenderObjClass ParticleBufferClass(const ParticleBufferClass & src); ParticleBufferClass & operator = (const ParticleBufferClass &); - virtual ~ParticleBufferClass(); + virtual ~ParticleBufferClass() override; /* ** RenderObjClass Interface: */ - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_PARTICLEBUFFER; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_PARTICLEBUFFER; } - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; int Get_Particle_Count() const; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; // Scales the size of the individual particles but doesn't affect their // position (and therefore the size of the particle system as a whole) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // The particle buffer never receives a Set_Transform/Position call, // even though its bounding volume changes. Since bounding volume @@ -118,29 +118,29 @@ class ParticleBufferClass : public RenderObjClass // the cached bounding volumes will not be invalidated unless we do // it elsewhere (such as here). We also need to call the particle // emitter's Emit() function (done here to avoid order dependence). - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LodBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LodBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; /* ** These members are not part of the RenderObjClass Interface: @@ -163,7 +163,7 @@ class ParticleBufferClass : public RenderObjClass void Set_Emitter(ParticleEmitterClass *emitter); // from RenderObj... - virtual bool Is_Complete() { return IsEmitterDead && !NonNewNum && !NewNum; } + virtual bool Is_Complete() override { return IsEmitterDead && !NonNewNum && !NewNum; } // This adds an uninitialized NewParticleStuct to the new particle // buffer and returns its address so the particle emitter can @@ -232,7 +232,7 @@ class ParticleBufferClass : public RenderObjClass protected: - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // render the particle system as a collection of particles void Render_Particles(RenderInfoClass & rinfo); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 396b0226dfa..09f97eba971 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -121,42 +121,42 @@ class ParticleEmitterClass : public RenderObjClass ParticleEmitterClass(const ParticleEmitterClass & src); ParticleEmitterClass & operator = (const ParticleEmitterClass &); - virtual ~ParticleEmitterClass(); + virtual ~ParticleEmitterClass() override; // Creation/serialization methods - virtual RenderObjClass * Clone() const; + virtual RenderObjClass * Clone() const override; static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition); ParticleEmitterDefClass * Build_Definition () const; WW3DErrorType Save (ChunkSaveClass &chunk_save) const; // Identification methods - virtual int Class_ID () const { return CLASSID_PARTICLEEMITTER; } - virtual const char * Get_Name () const { return NameString; } - virtual void Set_Name (const char *pname); + virtual int Class_ID () const override { return CLASSID_PARTICLEEMITTER; } + virtual const char * Get_Name () const override { return NameString; } + virtual void Set_Name (const char *pname) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo) { } - virtual void Restart(); + virtual void Render(RenderInfoClass & rinfo) override { } + virtual void Restart() override; // Scales the size of all particles and effects positions/velocities of // particles emitted after the Scale() call (but not before) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // Put particle buffer in scene if this is the first time (clunky code // - hopefully can be rewritten more cleanly in future)... - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere.Center.Set(0,0,0); sphere.Radius = 0; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } - virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } + virtual void Set_LOD_Bias(float bias) override { if (Buffer) Buffer->Set_LOD_Bias(bias); } // These are not part of the renderobject interface: @@ -208,7 +208,7 @@ class ParticleEmitterClass : public RenderObjClass void Remove_Buffer_From_Scene () { Buffer->Remove (); FirstTime = true; BufferSceneNeeded = true; } // from RenderObj... - virtual bool Is_Complete() { return IsComplete; } + virtual bool Is_Complete() override { return IsComplete; } // Auto deletion behavior controls bool Is_Remove_On_Complete_Enabled() { return RemoveOnComplete; } @@ -281,7 +281,7 @@ class ParticleEmitterClass : public RenderObjClass protected: // Used to build a list of filenames this emitter is dependent on - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; // This method is called each time the visibility state of the emitter changes. virtual void Update_On_Visibility (); @@ -291,7 +291,7 @@ class ParticleEmitterClass : public RenderObjClass // Collision sphere is a point - emitter emits also when not visible, // so this is only important to avoid affecting the collision spheres // of hierarchy objects into which the emitter is inserted. - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // Create new particles and pass them to the particle buffer. Receives // the end-of-interval quaternion and origin and interpolates between diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index b671bef6926..ee5ee16c56e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -332,14 +332,14 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name () const { return m_pDefinition->Get_Name(); } - virtual int Get_Class_ID () const { return RenderObjClass::CLASSID_PARTICLEEMITTER; } - virtual RenderObjClass * Create (); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name () const override { return m_pDefinition->Get_Name(); } + virtual int Get_Class_ID () const override { return RenderObjClass::CLASSID_PARTICLEEMITTER; } + virtual RenderObjClass * Create () override; + virtual void DeleteSelf() override { delete this; } virtual ParticleEmitterDefClass * Get_Definition () const { return m_pDefinition; } protected: - virtual ~ParticleEmitterPrototypeClass () { delete m_pDefinition; } + virtual ~ParticleEmitterPrototypeClass () override { delete m_pDefinition; } protected: /////////////////////////////////////////////////////////// @@ -358,8 +358,8 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_EMITTER; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_EMITTER; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index a96d904cad2..efafbef9043 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -96,7 +96,7 @@ class Render2DClass : public W3DMPO W3DMPO_GLUE(Render2DClass) public: Render2DClass( TextureClass* tex = nullptr ); - virtual ~Render2DClass(); + virtual ~Render2DClass() override; virtual void Reset(); void Render(); @@ -198,9 +198,9 @@ class Render2DClass : public W3DMPO class Render2DTextClass : public Render2DClass { public: Render2DTextClass(Font3DInstanceClass *font=nullptr); - ~Render2DTextClass(); + virtual ~Render2DTextClass() override; - virtual void Reset(); + virtual void Reset() override; Font3DInstanceClass * Peek_Font() { return Font; } void Set_Font( Font3DInstanceClass *font ); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index f4aeaf23aed..a45afeac30f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -96,10 +96,10 @@ enum class SimpleSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 46afcd6ab24..47a54cdc993 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -88,7 +88,7 @@ class SceneClass : public RefCountClass { public: SceneClass(); - virtual ~SceneClass(); + virtual ~SceneClass() override; /////////////////////////////////////////////////////////////////////////////////// // RTTI information. @@ -218,20 +218,20 @@ class SimpleSceneClass : public SceneClass public: SimpleSceneClass(); - virtual ~SimpleSceneClass(); + virtual ~SimpleSceneClass() override; virtual int Get_Scene_ID() { return SCENE_ID_SIMPLE; } - virtual void Add_Render_Object(RenderObjClass * obj); - virtual void Remove_Render_Object(RenderObjClass * obj); + virtual void Add_Render_Object(RenderObjClass * obj) override; + virtual void Remove_Render_Object(RenderObjClass * obj) override; virtual void Remove_All_Render_Objects(); - virtual void Register(RenderObjClass * obj,RegType for_what); - virtual void Unregister(RenderObjClass * obj,RegType for_what); + virtual void Register(RenderObjClass * obj,RegType for_what) override; + virtual void Unregister(RenderObjClass * obj,RegType for_what) override; - virtual SceneIterator * Create_Iterator(bool onlyvisible = false); - virtual void Destroy_Iterator(SceneIterator * it); + virtual SceneIterator * Create_Iterator(bool onlyvisible = false) override; + virtual void Destroy_Iterator(SceneIterator * it) override; // Set visibility status for my render objects. If not called explicitly // beforehand, will be called inside Render(). @@ -241,7 +241,7 @@ class SimpleSceneClass : public SceneClass // Point visibility - used by DazzleRenderObj when no custom handler is installed /////////////////////////////////////////////////////////////////////////////////// virtual float Compute_Point_Visibility( RenderInfoClass & rinfo, - const Vector3 & point); + const Vector3 & point) override; protected: @@ -255,6 +255,6 @@ class SimpleSceneClass : public SceneClass friend class SimpleSceneIterator; - virtual void Customized_Render(RenderInfoClass & rinfo); - virtual void Post_Render_Processing(RenderInfoClass& rinfo); + virtual void Customized_Render(RenderInfoClass & rinfo) override; + virtual void Post_Render_Processing(RenderInfoClass& rinfo) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index afe80876628..4a3f6f92441 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -101,7 +101,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass VertexMaterialClass(); VertexMaterialClass(const VertexMaterialClass & src); - ~VertexMaterialClass(); + virtual ~VertexMaterialClass() override; VertexMaterialClass & operator = (const VertexMaterialClass &src); VertexMaterialClass * Clone() { VertexMaterialClass * mat = NEW_REF (VertexMaterialClass,()); *mat = *this; return mat;}