mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -177,14 +177,14 @@ struct DDSFile
|
|||
static S32 smActiveCopies;
|
||||
|
||||
DDSFile():
|
||||
mBytesPerPixel(0),
|
||||
mHeight(0),
|
||||
mWidth(0),
|
||||
mDepth(0),
|
||||
mFormat(GFXFormat_FIRST),
|
||||
mFourCC(0),
|
||||
mPitchOrLinearSize(0),
|
||||
mMipMapCount(0),
|
||||
mPitchOrLinearSize(0)
|
||||
mFormat(GFXFormat_FIRST),
|
||||
mBytesPerPixel(0),
|
||||
mFourCC(0)
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION( mSurfaces );
|
||||
smActiveCopies++;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ public:
|
|||
|
||||
// GFXResource interface
|
||||
/// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
|
||||
/// Get the number of mip maps
|
||||
const U32 getMipMapLevels() const { return mMipMapLevels; }
|
||||
|
|
@ -147,7 +147,7 @@ public:
|
|||
/// Returns the format
|
||||
const GFXFormat getFormat() const { return mFormat; }
|
||||
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
};
|
||||
|
||||
/// A reference counted handle to a cubemap array resource.
|
||||
|
|
|
|||
|
|
@ -91,15 +91,15 @@ public:
|
|||
|
||||
virtual ~GFXGeneralFence();
|
||||
|
||||
virtual void issue();
|
||||
virtual FenceStatus getStatus() const { return GFXFence::Unsupported; };
|
||||
virtual void block();
|
||||
void issue() override;
|
||||
FenceStatus getStatus() const override { return GFXFence::Unsupported; };
|
||||
void block() override;
|
||||
|
||||
// GFXResource interface
|
||||
virtual void zombify();
|
||||
virtual void resurrect();
|
||||
void zombify() override;
|
||||
void resurrect() override;
|
||||
/// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
};
|
||||
|
||||
#endif // _GFXFENCE_H_
|
||||
|
|
@ -77,9 +77,9 @@ public:
|
|||
static String statusToString( OcclusionQueryStatus status );
|
||||
|
||||
// GFXResource
|
||||
virtual void zombify() = 0;
|
||||
virtual void resurrect() = 0;
|
||||
virtual const String describeSelf() const = 0;
|
||||
void zombify() override = 0;
|
||||
void resurrect() override = 0;
|
||||
const String describeSelf() const override = 0;
|
||||
};
|
||||
|
||||
/// Handle for GFXOcclusionQuery than store last valid state
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ public: //protected:
|
|||
|
||||
// GFXResource interface
|
||||
/// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
};
|
||||
|
||||
class GFXPrimitiveBufferHandle : public StrongRefPtr<GFXPrimitiveBuffer>
|
||||
|
|
|
|||
|
|
@ -374,7 +374,7 @@ public:
|
|||
const String& getPixelShaderFile() const { return mPixelFile.getFullPath(); }
|
||||
|
||||
// GFXResource
|
||||
const String describeSelf() const { return mDescription; }
|
||||
const String describeSelf() const override { return mDescription; }
|
||||
|
||||
// Get instancing vertex format
|
||||
GFXVertexFormat *getInstancingFormat() { return mInstancingFormat; }
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ public:
|
|||
virtual const GFXStateBlockDesc& getDesc() const = 0;
|
||||
|
||||
/// Default implementation for GFXResource::describeSelf
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
};
|
||||
|
||||
typedef StrongRefPtr<GFXStateBlock> GFXStateBlockRef;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ public:
|
|||
|
||||
// GFXResourceInterface
|
||||
/// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
|
||||
/// This is called to set the render target.
|
||||
virtual void activate() { }
|
||||
|
|
|
|||
|
|
@ -54,11 +54,11 @@ public:
|
|||
|
||||
|
||||
// GFXResource interface
|
||||
virtual void zombify() = 0;
|
||||
virtual void resurrect() = 0;
|
||||
void zombify() override = 0;
|
||||
void resurrect() override = 0;
|
||||
virtual void Release();
|
||||
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
|
||||
GFXFormat mFormat;
|
||||
bool mIsCompressed;
|
||||
|
|
|
|||
|
|
@ -200,10 +200,10 @@ public:
|
|||
|
||||
// GFXResource interface
|
||||
/// The resource should put a description of itself (number of vertices, size/width of texture, etc.) in buffer
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
|
||||
// StrongRefBase
|
||||
virtual void destroySelf();
|
||||
void destroySelf() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ public:
|
|||
virtual void prepare() = 0;
|
||||
|
||||
// GFXResource
|
||||
virtual const String describeSelf() const;
|
||||
const String describeSelf() const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
CubemapData();
|
||||
~CubemapData();
|
||||
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void initPersistFields();
|
||||
|
||||
DECLARE_CONOBJECT(CubemapData);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
GFXStateBlockData();
|
||||
|
||||
// SimObject
|
||||
virtual bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void initPersistFields();
|
||||
|
||||
// GFXStateBlockData
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue