mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
rest of virtuals removed
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
marauder2k7
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -42,17 +42,17 @@ private:
|
|||
public:
|
||||
|
||||
///
|
||||
virtual const String &getRendererString() const { static String sRS("GFX Null Device Renderer"); return sRS; }
|
||||
const String &getRendererString() const override { static String sRS("GFX Null Device Renderer"); return sRS; }
|
||||
|
||||
protected:
|
||||
|
||||
virtual void setupCardCapabilities() { };
|
||||
void setupCardCapabilities() override { };
|
||||
|
||||
virtual bool _queryCardCap(const String &query, U32 &foundResult){ return false; }
|
||||
virtual bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) { inOutAutogenMips = false; return false; }
|
||||
bool _queryCardCap(const String &query, U32 &foundResult) override{ return false; }
|
||||
bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override { inOutAutogenMips = false; return false; }
|
||||
|
||||
public:
|
||||
virtual void init()
|
||||
void init() override
|
||||
{
|
||||
mCardDescription = "GFX Null Device Card";
|
||||
mChipSet = "NULL Device";
|
||||
|
|
@ -68,14 +68,14 @@ public:
|
|||
GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile);
|
||||
~GFXNullTextureObject() { kill(); };
|
||||
|
||||
virtual void pureVirtualCrash() { };
|
||||
void pureVirtualCrash() override { };
|
||||
|
||||
virtual GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) { return NULL; };
|
||||
virtual void unlock( U32 mipLevel = 0) {};
|
||||
virtual bool copyToBmp(GBitmap *) { return false; };
|
||||
GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) override { return NULL; };
|
||||
void unlock( U32 mipLevel = 0) override {};
|
||||
bool copyToBmp(GBitmap *) override { return false; };
|
||||
|
||||
virtual void zombify() {}
|
||||
virtual void resurrect() {}
|
||||
void zombify() override {}
|
||||
void resurrect() override {}
|
||||
};
|
||||
|
||||
GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile) :
|
||||
|
|
@ -88,13 +88,13 @@ GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfil
|
|||
class GFXNullTextureManager : public GFXTextureManager
|
||||
{
|
||||
public:
|
||||
GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; } // _createNullTextureObject();}
|
||||
GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) { return nullptr; }
|
||||
GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) { return nullptr; }
|
||||
GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; }
|
||||
GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; } // _createNullTextureObject();}
|
||||
GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) override { return nullptr; }
|
||||
GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) override { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) override { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) override { return nullptr; }
|
||||
GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) override { return nullptr; }
|
||||
GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; }
|
||||
protected:
|
||||
GFXTextureObject *_createTextureObject( U32 height,
|
||||
U32 width,
|
||||
|
|
@ -104,7 +104,7 @@ protected:
|
|||
U32 numMipLevels,
|
||||
bool forceMips = false,
|
||||
S32 antialiasLevel = 0,
|
||||
GFXTextureObject *inTex = NULL )
|
||||
GFXTextureObject *inTex = NULL ) override
|
||||
{
|
||||
GFXNullTextureObject *retTex;
|
||||
if ( inTex )
|
||||
|
|
@ -124,26 +124,26 @@ protected:
|
|||
};
|
||||
|
||||
/// Load a texture from a proper DDSFile instance.
|
||||
virtual bool _loadTexture(GFXTextureObject *texture, DDSFile *dds){ return true; };
|
||||
bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override{ return true; };
|
||||
|
||||
/// Load data into a texture from a GBitmap using the internal API.
|
||||
virtual bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp){ return true; };
|
||||
bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override{ return true; };
|
||||
|
||||
/// Load data into a texture from a raw buffer using the internal API.
|
||||
///
|
||||
/// Note that the size of the buffer is assumed from the parameters used
|
||||
/// for this GFXTextureObject's _createTexture call.
|
||||
virtual bool _loadTexture(GFXTextureObject *texture, void *raw){ return true; };
|
||||
bool _loadTexture(GFXTextureObject *texture, void *raw) override{ return true; };
|
||||
|
||||
/// Refresh a texture using the internal API.
|
||||
virtual bool _refreshTexture(GFXTextureObject *texture){ return true; };
|
||||
bool _refreshTexture(GFXTextureObject *texture) override{ return true; };
|
||||
|
||||
/// Free a texture (but do not delete the GFXTextureObject) using the internal
|
||||
/// API.
|
||||
///
|
||||
/// This is only called during zombification for textures which need it, so you
|
||||
/// don't need to do any internal safety checks.
|
||||
virtual bool _freeTexture(GFXTextureObject *texture, bool zombify=false) { return true; };
|
||||
bool _freeTexture(GFXTextureObject *texture, bool zombify=false) override { return true; };
|
||||
|
||||
virtual U32 _getTotalVideoMemory() { return 0; };
|
||||
virtual U32 _getFreeVideoMemory() { return 0; };
|
||||
|
|
@ -154,19 +154,19 @@ class GFXNullCubemap : public GFXCubemap
|
|||
friend class GFXDevice;
|
||||
private:
|
||||
// should only be called by GFXDevice
|
||||
virtual void setToTexUnit( U32 tuNum ) { };
|
||||
void setToTexUnit( U32 tuNum ) override { };
|
||||
|
||||
public:
|
||||
virtual void initStatic( GFXTexHandle *faces ) { };
|
||||
virtual void initStatic( DDSFile *dds ) { };
|
||||
virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) { };
|
||||
virtual U32 getSize() const { return 0; }
|
||||
virtual GFXFormat getFormat() const { return GFXFormatR8G8B8A8; }
|
||||
void initStatic( GFXTexHandle *faces ) override { };
|
||||
void initStatic( DDSFile *dds ) override { };
|
||||
void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override { };
|
||||
U32 getSize() const override { return 0; }
|
||||
GFXFormat getFormat() const override { return GFXFormatR8G8B8A8; }
|
||||
|
||||
virtual ~GFXNullCubemap(){};
|
||||
|
||||
virtual void zombify() {}
|
||||
virtual void resurrect() {}
|
||||
void zombify() override {}
|
||||
void resurrect() override {}
|
||||
};
|
||||
|
||||
class GFXNullCubemapArray : public GFXCubemapArray
|
||||
|
|
@ -174,16 +174,16 @@ class GFXNullCubemapArray : public GFXCubemapArray
|
|||
friend class GFXDevice;
|
||||
private:
|
||||
// should only be called by GFXDevice
|
||||
virtual void setToTexUnit(U32 tuNum) { };
|
||||
void setToTexUnit(U32 tuNum) override { };
|
||||
|
||||
public:
|
||||
virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) { };
|
||||
virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) { };
|
||||
virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) { };
|
||||
virtual void copyTo(GFXCubemapArray *pDstCubemap) { }
|
||||
void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override { };
|
||||
void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override { };
|
||||
void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override { };
|
||||
void copyTo(GFXCubemapArray *pDstCubemap) override { }
|
||||
virtual ~GFXNullCubemapArray() {};
|
||||
virtual void zombify() {}
|
||||
virtual void resurrect() {}
|
||||
void zombify() override {}
|
||||
void resurrect() override {}
|
||||
};
|
||||
|
||||
class GFXNullTextureArray : public GFXTextureArray
|
||||
|
|
@ -209,12 +209,12 @@ public:
|
|||
U32 vertexSize,
|
||||
GFXBufferType bufferType ) :
|
||||
GFXVertexBuffer(device, numVerts, vertexFormat, vertexSize, bufferType) {tempBuf =NULL;};
|
||||
virtual void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr);
|
||||
virtual void unlock();
|
||||
virtual void prepare();
|
||||
void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override;
|
||||
void unlock() override;
|
||||
void prepare() override;
|
||||
|
||||
virtual void zombify() {}
|
||||
virtual void resurrect() {}
|
||||
void zombify() override {}
|
||||
void resurrect() override {}
|
||||
};
|
||||
|
||||
void GFXNullVertexBuffer::lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr)
|
||||
|
|
@ -246,12 +246,12 @@ public:
|
|||
GFXBufferType bufferType ) :
|
||||
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), temp( NULL ) {};
|
||||
|
||||
virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); ///< locks this primitive buffer for writing into
|
||||
virtual void unlock(); ///< unlocks this primitive buffer.
|
||||
virtual void prepare() { }; ///< prepares this primitive buffer for use on the device it was allocated on
|
||||
void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; ///< locks this primitive buffer for writing into
|
||||
void unlock() override; ///< unlocks this primitive buffer.
|
||||
void prepare() override { }; ///< prepares this primitive buffer for use on the device it was allocated on
|
||||
|
||||
virtual void zombify() {}
|
||||
virtual void resurrect() {}
|
||||
void zombify() override {}
|
||||
void resurrect() override {}
|
||||
};
|
||||
|
||||
void GFXNullPrimitiveBuffer::lock(U32 indexStart, U32 indexEnd, void **indexPtr)
|
||||
|
|
@ -273,17 +273,17 @@ class GFXNullStateBlock : public GFXStateBlock
|
|||
{
|
||||
public:
|
||||
/// Returns the hash value of the desc that created this block
|
||||
virtual U32 getHashValue() const { return 0; };
|
||||
U32 getHashValue() const override { return 0; };
|
||||
|
||||
/// Returns a GFXStateBlockDesc that this block represents
|
||||
virtual const GFXStateBlockDesc& getDesc() const { return mDefaultDesc; }
|
||||
const GFXStateBlockDesc& getDesc() const override { return mDefaultDesc; }
|
||||
|
||||
//
|
||||
// GFXResource
|
||||
//
|
||||
virtual void zombify() { }
|
||||
void zombify() override { }
|
||||
/// When called the resource should restore all device sensitive information destroyed by zombify()
|
||||
virtual void resurrect() { }
|
||||
void resurrect() override { }
|
||||
private:
|
||||
GFXStateBlockDesc mDefaultDesc;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,26 +34,26 @@
|
|||
class GFXNullWindowTarget : public GFXWindowTarget
|
||||
{
|
||||
public:
|
||||
virtual bool present()
|
||||
bool present() override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual const Point2I getSize()
|
||||
const Point2I getSize() override
|
||||
{
|
||||
// Return something stupid.
|
||||
return Point2I(1,1);
|
||||
}
|
||||
|
||||
virtual GFXFormat getFormat() { return GFXFormatR8G8B8A8; }
|
||||
GFXFormat getFormat() override { return GFXFormatR8G8B8A8; }
|
||||
|
||||
virtual void resetMode()
|
||||
void resetMode() override
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
virtual void zombify() {};
|
||||
virtual void resurrect() {};
|
||||
void zombify() override {};
|
||||
void resurrect() override {};
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -67,21 +67,21 @@ public:
|
|||
|
||||
static void enumerateAdapters( Vector<GFXAdapter*> &adapterList );
|
||||
|
||||
void init( const GFXVideoMode &mode, PlatformWindow *window = NULL );
|
||||
void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override;
|
||||
|
||||
virtual void activate() { };
|
||||
virtual void deactivate() { };
|
||||
virtual GFXAdapterType getAdapterType() { return NullDevice; };
|
||||
GFXAdapterType getAdapterType() override { return NullDevice; };
|
||||
|
||||
/// @name Debug Methods
|
||||
/// @{
|
||||
virtual void enterDebugEvent(ColorI color, const char *name) { };
|
||||
virtual void leaveDebugEvent() { };
|
||||
virtual void setDebugMarker(ColorI color, const char *name) { };
|
||||
void enterDebugEvent(ColorI color, const char *name) override { };
|
||||
void leaveDebugEvent() override { };
|
||||
void setDebugMarker(ColorI color, const char *name) override { };
|
||||
/// @}
|
||||
|
||||
/// Enumerates the supported video modes of the device
|
||||
virtual void enumerateVideoModes() { };
|
||||
void enumerateVideoModes() override { };
|
||||
|
||||
/// Sets the video mode for the device
|
||||
virtual void setVideoMode( const GFXVideoMode &mode ) { };
|
||||
|
|
@ -89,15 +89,15 @@ protected:
|
|||
static GFXAdapter::CreateDeviceInstanceDelegate mCreateDeviceInstance;
|
||||
|
||||
/// Called by GFXDevice to create a device specific stateblock
|
||||
virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc);
|
||||
GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override;
|
||||
/// Called by GFXDevice to actually set a stateblock.
|
||||
virtual void setStateBlockInternal(GFXStateBlock* block, bool force) { };
|
||||
void setStateBlockInternal(GFXStateBlock* block, bool force) override { };
|
||||
/// @}
|
||||
|
||||
/// Called by base GFXDevice to actually set a const buffer
|
||||
virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) { };
|
||||
void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override { };
|
||||
|
||||
virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) { };
|
||||
void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) override { };
|
||||
|
||||
|
||||
/// @name State Initalization.
|
||||
|
|
@ -105,77 +105,77 @@ protected:
|
|||
|
||||
/// State initalization. This MUST BE CALLED in setVideoMode after the device
|
||||
/// is created.
|
||||
virtual void initStates() { };
|
||||
void initStates() override { };
|
||||
|
||||
virtual GFXVertexBuffer *allocVertexBuffer( U32 numVerts,
|
||||
GFXVertexBuffer *allocVertexBuffer( U32 numVerts,
|
||||
const GFXVertexFormat *vertexFormat,
|
||||
U32 vertSize,
|
||||
GFXBufferType bufferType,
|
||||
void* data = NULL );
|
||||
virtual GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices,
|
||||
void* data = NULL ) override;
|
||||
GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices,
|
||||
U32 numPrimitives,
|
||||
GFXBufferType bufferType,
|
||||
void* data = NULL );
|
||||
void* data = NULL ) override;
|
||||
|
||||
virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) { return NULL; }
|
||||
virtual void setVertexDecl( const GFXVertexDecl *decl ) { }
|
||||
virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) { }
|
||||
virtual void setVertexStreamFrequency( U32 stream, U32 frequency ) { }
|
||||
GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override { return NULL; }
|
||||
void setVertexDecl( const GFXVertexDecl *decl ) override { }
|
||||
void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override { }
|
||||
void setVertexStreamFrequency( U32 stream, U32 frequency ) override { }
|
||||
|
||||
public:
|
||||
virtual GFXCubemap * createCubemap();
|
||||
virtual GFXCubemapArray *createCubemapArray();
|
||||
virtual GFXTextureArray *createTextureArray();
|
||||
GFXCubemap * createCubemap() override;
|
||||
GFXCubemapArray *createCubemapArray() override;
|
||||
GFXTextureArray *createTextureArray() override;
|
||||
|
||||
virtual F32 getFillConventionOffset() const { return 0.0f; };
|
||||
F32 getFillConventionOffset() const override { return 0.0f; };
|
||||
|
||||
///@}
|
||||
|
||||
virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true){return NULL;};
|
||||
virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window)
|
||||
GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true) override{return NULL;};
|
||||
GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override
|
||||
{
|
||||
return new GFXNullWindowTarget();
|
||||
};
|
||||
|
||||
virtual void _updateRenderTargets(){};
|
||||
void _updateRenderTargets() override{};
|
||||
|
||||
virtual F32 getPixelShaderVersion() const { return 0.0f; };
|
||||
virtual void setPixelShaderVersion( F32 version ) { };
|
||||
virtual U32 getNumSamplers() const { return 0; };
|
||||
virtual U32 getNumRenderTargets() const { return 0; };
|
||||
F32 getPixelShaderVersion() const override { return 0.0f; };
|
||||
void setPixelShaderVersion( F32 version ) override { };
|
||||
U32 getNumSamplers() const override { return 0; };
|
||||
U32 getNumRenderTargets() const override { return 0; };
|
||||
|
||||
virtual GFXShader* createShader() { return NULL; };
|
||||
GFXShader* createShader() override { return NULL; };
|
||||
|
||||
virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) { };
|
||||
virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) { };
|
||||
virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color) { };
|
||||
virtual bool beginSceneInternal() { return true; };
|
||||
virtual void endSceneInternal() { };
|
||||
void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override { };
|
||||
void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override { };
|
||||
void clearColorAttachment(const U32 attachment, const LinearColorF& color) override { };
|
||||
bool beginSceneInternal() override { return true; };
|
||||
void endSceneInternal() override { };
|
||||
|
||||
virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) { };
|
||||
virtual void drawIndexedPrimitive( GFXPrimitiveType primType,
|
||||
void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override { };
|
||||
void drawIndexedPrimitive( GFXPrimitiveType primType,
|
||||
U32 startVertex,
|
||||
U32 minIndex,
|
||||
U32 numVerts,
|
||||
U32 startIndex,
|
||||
U32 primitiveCount ) { };
|
||||
U32 primitiveCount ) override { };
|
||||
|
||||
virtual void setClipRect( const RectI &rect ) { };
|
||||
virtual const RectI &getClipRect() const { return clip; };
|
||||
void setClipRect( const RectI &rect ) override { };
|
||||
const RectI &getClipRect() const override { return clip; };
|
||||
|
||||
virtual void preDestroy() { Parent::preDestroy(); };
|
||||
void preDestroy() override { Parent::preDestroy(); };
|
||||
|
||||
virtual U32 getMaxDynamicVerts() { return 16384; };
|
||||
virtual U32 getMaxDynamicIndices() { return 16384; };
|
||||
U32 getMaxDynamicVerts() override { return 16384; };
|
||||
U32 getMaxDynamicIndices() override { return 16384; };
|
||||
|
||||
virtual GFXFormat selectSupportedFormat( GFXTextureProfile *profile,
|
||||
GFXFormat selectSupportedFormat( GFXTextureProfile *profile,
|
||||
const Vector<GFXFormat> &formats,
|
||||
bool texture,
|
||||
bool mustblend,
|
||||
bool mustfilter ) { return GFXFormatR8G8B8A8; };
|
||||
bool mustfilter ) override { return GFXFormatR8G8B8A8; };
|
||||
|
||||
GFXFence *createFence() { return new GFXGeneralFence( this ); }
|
||||
GFXOcclusionQuery* createOcclusionQuery() { return NULL; }
|
||||
GFXFence *createFence() override { return new GFXGeneralFence( this ); }
|
||||
GFXOcclusionQuery* createOcclusionQuery() override { return NULL; }
|
||||
|
||||
private:
|
||||
typedef GFXDevice Parent;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue