mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-28 15:55:39 +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:
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -171,7 +171,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
|
|||
TheoraTextureFrame* mFrame;
|
||||
|
||||
// WorkItem.
|
||||
virtual void execute();
|
||||
void execute() override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -293,8 +293,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
|
|||
private:
|
||||
|
||||
// IPositionable.
|
||||
virtual U32 getPosition() const { return mCurrentTime; }
|
||||
virtual void setPosition( U32 pos ) {}
|
||||
U32 getPosition() const override { return mCurrentTime; }
|
||||
void setPosition( U32 pos ) override {}
|
||||
};
|
||||
|
||||
/// The Theora video file.
|
||||
|
|
@ -351,7 +351,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
|
|||
void _onTextureEvent( GFXTexCallbackCode code );
|
||||
|
||||
// IOutputStream.
|
||||
virtual void write( TheoraTextureFrame* const* frames, U32 num );
|
||||
void write( TheoraTextureFrame* const* frames, U32 num ) override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -410,8 +410,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
|
|||
GFXTexHandle& getTexture() { return mCurrentFrame->mTexture; }
|
||||
|
||||
// IPositionable.
|
||||
virtual U32 getPosition() const { return _getTimeSource()->getPosition(); }
|
||||
virtual void setPosition( U32 pos ) {} // Not (yet?) implemented.
|
||||
U32 getPosition() const override { return _getTimeSource()->getPosition(); }
|
||||
void setPosition( U32 pos ) override {} // Not (yet?) implemented.
|
||||
};
|
||||
|
||||
#endif // TORQUE_OGGTHEORA
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ public:
|
|||
// SimObject.
|
||||
DECLARE_CONOBJECT( TheoraTextureObject );
|
||||
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
static void initPersistFields();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class VideoEncoderPNG : public VideoEncoder
|
|||
|
||||
public:
|
||||
/// Begins accepting frames for encoding
|
||||
bool begin()
|
||||
bool begin() override
|
||||
{
|
||||
mPath += "\\";
|
||||
mCurrentFrame = 0;
|
||||
|
|
@ -42,7 +42,7 @@ public:
|
|||
}
|
||||
|
||||
/// Pushes a new frame into the video stream
|
||||
bool pushFrame( GBitmap * bitmap )
|
||||
bool pushFrame( GBitmap * bitmap ) override
|
||||
{
|
||||
String framePath = mPath + String::ToString("%.6u.png", mCurrentFrame);
|
||||
|
||||
|
|
@ -56,12 +56,12 @@ public:
|
|||
}
|
||||
|
||||
/// Finishes the encoding and closes the video
|
||||
bool end()
|
||||
bool end() override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void setResolution( Point2I* resolution )
|
||||
void setResolution( Point2I* resolution ) override
|
||||
{
|
||||
mResolution = *resolution;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ public:
|
|||
setStatus(false);
|
||||
}
|
||||
|
||||
virtual void run( void* arg )
|
||||
void run( void* arg ) override
|
||||
{
|
||||
_setName( "TheoraEncoderThread" );
|
||||
while (!checkForStop())
|
||||
|
|
@ -214,7 +214,7 @@ public:
|
|||
}
|
||||
|
||||
/// Begins accepting frames for encoding
|
||||
bool begin()
|
||||
bool begin() override
|
||||
{
|
||||
mPath += ".ogv";
|
||||
mCurrentFrame = 0;
|
||||
|
|
@ -340,7 +340,7 @@ public:
|
|||
}
|
||||
|
||||
/// Pushes a new frame into the video stream
|
||||
bool pushFrame( GBitmap * bitmap )
|
||||
bool pushFrame( GBitmap * bitmap ) override
|
||||
{
|
||||
|
||||
// Push the bitmap into the frame list
|
||||
|
|
@ -356,7 +356,7 @@ public:
|
|||
}
|
||||
|
||||
/// Finishes the encoding and closes the video
|
||||
bool end()
|
||||
bool end() override
|
||||
{
|
||||
//Let's wait the thread stop doing whatever it needs to do
|
||||
stop();
|
||||
|
|
@ -375,7 +375,7 @@ public:
|
|||
}
|
||||
|
||||
|
||||
void setResolution( Point2I* resolution )
|
||||
void setResolution( Point2I* resolution ) override
|
||||
{
|
||||
/* Theora has a divisible-by-sixteen restriction for the encoded frame size */
|
||||
/* scale the picture size up to the nearest /16 and calculate offsets */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue