TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rest of virtuals removed

Browse source 
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 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/sfx/media/sfxVorbisStream.h
View file

@ -60,8 +60,8 @@ class SFXVorbisStream : public SFXFileStream,
static long _tell_func( void *datasource );
// SFXStream
virtual bool _readHeader();
virtual void _close();
bool _readHeader() override;
void _close() override;
public:
@ -92,10 +92,10 @@ class SFXVorbisStream : public SFXFileStream,
S32 *bitstream );
// SFXStream
virtual void reset();
virtual U32 read( U8 *buffer, U32 length );
virtual bool isEOS() const;
virtual SFXStream* clone() const
void reset() override;
U32 read( U8 *buffer, U32 length ) override;
bool isEOS() const override;
SFXStream* clone() const override
{
SFXVorbisStream* stream = new SFXVorbisStream( *this );
if( !stream->mVF )
@ -104,8 +104,8 @@ class SFXVorbisStream : public SFXFileStream,
}
// IPositionable
virtual U32 getPosition() const;
virtual void setPosition( U32 offset );
U32 getPosition() const override;
void setPosition( U32 offset ) override;
};
#endif // TORQUE_OGGVORBIS

14
Engine/source/sfx/media/sfxWavStream.h
View file

@ -44,8 +44,8 @@ class SFXWavStream : public SFXFileStream,
U32 mDataStart;
// SFXFileStream
virtual bool _readHeader();
virtual void _close();
bool _readHeader() override;
void _close() override;
public:
@ -62,9 +62,9 @@ class SFXWavStream : public SFXFileStream,
virtual ~SFXWavStream();
// SFXStream
virtual void reset();
virtual U32 read( U8 *buffer, U32 length );
virtual SFXStream* clone() const
void reset() override;
U32 read( U8 *buffer, U32 length ) override;
SFXStream* clone() const override
{
SFXWavStream* stream = new SFXWavStream( *this );
if( !stream->mStream )
@ -73,8 +73,8 @@ class SFXWavStream : public SFXFileStream,
}
// IPositionable
virtual U32 getPosition() const;
virtual void setPosition( U32 offset );
U32 getPosition() const override;
void setPosition( U32 offset ) override;
};
#endif // _SFXWAVSTREAM_H_

4
Engine/source/sfx/null/sfxNullBuffer.h
View file

@ -38,8 +38,8 @@ class SFXNullBuffer : public SFXBuffer
SFXNullBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
// SFXBuffer.
virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num );
virtual void _flush() {}
void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override;
void _flush() override {}
public:

6
Engine/source/sfx/null/sfxNullDevice.h
View file

@ -55,9 +55,9 @@ class SFXNullDevice : public SFXDevice
public:
// SFXDevice.
virtual SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer );
virtual void update();
SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
void update() override;
};
#endif // _SFXNULLDEVICE_H_

4
Engine/source/sfx/null/sfxNullProvider.cpp
View file

@ -36,11 +36,11 @@ public:
protected:
void addDeviceDesc( const String& name, const String& desc );
void init();
void init() override;
public:
SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers );
SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override;
};

30
Engine/source/sfx/null/sfxNullVoice.h
View file

@ -54,12 +54,12 @@ class SFXNullVoice : public SFXVoice
bool mIsLooping;
// SFXVoice.
virtual SFXStatus _status() const;
virtual void _play();
virtual void _pause();
virtual void _stop();
virtual void _seek( U32 sample );
virtual U32 _tell() const;
SFXStatus _status() const override;
void _play() override;
void _pause() override;
void _stop() override;
void _seek( U32 sample ) override;
U32 _tell() const override;
///
U32 _getPlayTime() const
@ -72,15 +72,15 @@ class SFXNullVoice : public SFXVoice
virtual ~SFXNullVoice();
/// SFXVoice
SFXStatus getStatus() const;
void setPosition( U32 sample );
void play( bool looping );
void setMinMaxDistance( F32 min, F32 max );
void setVelocity( const VectorF& velocity );
void setTransform( const MatrixF& transform );
void setVolume( F32 volume );
void setPitch( F32 pitch );
void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
SFXStatus getStatus() const override;
void setPosition( U32 sample ) override;
void play( bool looping ) override;
void setMinMaxDistance( F32 min, F32 max ) override;
void setVelocity( const VectorF& velocity ) override;
void setTransform( const MatrixF& transform ) override;
void setVolume( F32 volume ) override;
void setPitch( F32 pitch ) override;
void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
};
#endif // _SFXNULLVOICE_H_

4
Engine/source/sfx/openal/sfxALBuffer.h
View file

@ -103,8 +103,8 @@ class SFXALBuffer : public SFXBuffer
}
// SFXBuffer.
virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num );
void _flush();
void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override;
void _flush() override;
public:

14
Engine/source/sfx/openal/sfxALDevice.h
View file

@ -87,12 +87,12 @@ class SFXALDevice : public SFXDevice
public:
// SFXDevice.
virtual SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer );
virtual void setListener( U32 index, const SFXListenerProperties& listener );
virtual void setDistanceModel( SFXDistanceModel model );
virtual void setDopplerFactor( F32 factor );
virtual void setRolloffFactor( F32 factor );
SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
void setListener( U32 index, const SFXListenerProperties& listener ) override;
void setDistanceModel( SFXDistanceModel model ) override;
void setDopplerFactor( F32 factor ) override;
void setRolloffFactor( F32 factor ) override;
#if defined(AL_ALEXT_PROTOTYPES)
//function for openAL to open slots
virtual void openSlots();
@ -103,7 +103,7 @@ class SFXALDevice : public SFXDevice
//get values from sfxreverbproperties and pass it to openal device
virtual void setReverb(const SFXReverbProperties& reverb);
#endif
virtual void resetReverb() {}
void resetReverb() override {}
};
#endif // _SFXALDEVICE_H_

4
Engine/source/sfx/openal/sfxALProvider.cpp
View file

@ -48,10 +48,10 @@ protected:
};
void init();
void init() override;
public:
SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers );
SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override;
};

28
Engine/source/sfx/openal/sfxALVoice.h
View file

@ -79,12 +79,12 @@ class SFXALVoice : public SFXVoice
void _lateBindStaticBufferIfNecessary();
// SFXVoice.
virtual SFXStatus _status() const;
virtual void _play();
virtual void _pause();
virtual void _stop();
virtual void _seek( U32 sample );
virtual U32 _tell() const;
SFXStatus _status() const override;
void _play() override;
void _pause() override;
void _stop() override;
void _seek( U32 sample ) override;
U32 _tell() const override;
public:
@ -94,14 +94,14 @@ class SFXALVoice : public SFXVoice
virtual ~SFXALVoice();
/// SFXVoice
void setMinMaxDistance( F32 min, F32 max );
void play( bool looping );
void setVelocity( const VectorF& velocity );
void setTransform( const MatrixF& transform );
void setVolume( F32 volume );
void setPitch( F32 pitch );
void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
void setRolloffFactor( F32 factor );
void setMinMaxDistance( F32 min, F32 max ) override;
void play( bool looping ) override;
void setVelocity( const VectorF& velocity ) override;
void setTransform( const MatrixF& transform ) override;
void setVolume( F32 volume ) override;
void setPitch( F32 pitch ) override;
void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
void setRolloffFactor( F32 factor ) override;
};
#endif // _SFXALVOICE_H_

16
Engine/source/sfx/sfxController.h
View file

@ -185,14 +185,14 @@ class SFXController : public SFXSource
static SFXController* _create( SFXPlayList* playList );
// SFXSource.
virtual void _play();
virtual void _pause();
virtual void _stop();
virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event );
virtual void _updateVolume( const MatrixF& listener );
virtual void _updatePitch();
virtual void _updatePriority();
virtual void _update();
void _play() override;
void _pause() override;
void _stop() override;
void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override;
void _updateVolume( const MatrixF& listener ) override;
void _updatePitch() override;
void _updatePriority() override;
void _update() override;
public:

10
Engine/source/sfx/sfxEnvironment.h
View file

@ -59,11 +59,11 @@ class SFXEnvironment : public SimDataBlock
static void initPersistFields();
virtual bool onAdd();
virtual bool preload( bool server, String& errorStr );
virtual void packData( BitStream* stream );
virtual void unpackData( BitStream* stream );
virtual void inspectPostApply();
bool onAdd() override;
bool preload( bool server, String& errorStr ) override;
void packData( BitStream* stream ) override;
void unpackData( BitStream* stream ) override;
void inspectPostApply() override;
/// @return The reverb properties of the sound environment.
const SFXReverbProperties& getReverb() const { return mReverb; }

10
Engine/source/sfx/sfxFileStream.h
View file

@ -105,11 +105,11 @@ class SFXFileStream : public SFXStream
void close();
// SFXStream.
const SFXFormat& getFormat() const { return mFormat; }
U32 getSampleCount() const { return mSamples; }
U32 getDataLength() const { return mSamples * mFormat.getBytesPerSample(); }
U32 getDuration() const { return mFormat.getDuration( mSamples ); }
bool isEOS() const;
const SFXFormat& getFormat() const override { return mFormat; }
U32 getSampleCount() const override { return mSamples; }
U32 getDataLength() const override { return mSamples * mFormat.getBytesPerSample(); }
U32 getDuration() const override { return mFormat.getDuration( mSamples ); }
bool isEOS() const override;
};
#endif // _SFXFILESTREAM_H_

14
Engine/source/sfx/sfxInternal.h
View file

@ -120,15 +120,15 @@ class SFXAsyncStream : public AsyncPacketBufferedInputStream< SFXStreamRef, SFXS
bool mReadSilenceAtEnd;
// AsyncPacketStream.
virtual SFXStreamPacket* _newPacket( U32 packetSize )
SFXStreamPacket* _newPacket( U32 packetSize ) override
{
SFXStreamPacket* packet = Parent::_newPacket( packetSize );
packet->mFormat = getSourceStream()->getFormat();
return packet;
}
virtual void _requestNext();
virtual void _onArrival( SFXStreamPacket* const& packet );
virtual void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements )
void _requestNext() override;
void _onArrival( SFXStreamPacket* const& packet ) override;
void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements ) override
{
if( !this->mNumRemainingSourceElements && mReadSilenceAtEnd )
packet->mIsLast = false;
@ -285,7 +285,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
U32 mBufferSize;
// SFXBuffer.
virtual void _flush()
void _flush() override
{
mWriteOffset = 0;
}
@ -294,7 +294,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
virtual bool _copyData( U32 offset, const U8* data, U32 length ) = 0;
// SFXBuffer.
virtual void write( SFXStreamPacket* const* packets, U32 num );
void write( SFXStreamPacket* const* packets, U32 num ) override;
/// @return the sample position in the sound stream as determined from the
/// given buffer offset.
@ -326,7 +326,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
SFXWrapAroundBuffer( SFXDescription* description )
: Parent( description ), mBufferSize( 0 ), mWriteOffset(0) {}
virtual U32 getMemoryUsed() const { return mBufferSize; }
U32 getMemoryUsed() const override { return mBufferSize; }
};
//--------------------------------------------------------------------------

14
Engine/source/sfx/sfxMemoryStream.h
View file

@ -72,13 +72,13 @@ class SFXMemoryStream : public SFXStream,
SFXMemoryStream( const SFXFormat& format, SourceStreamType* stream, U32 numSamples = U32_MAX );
// SFXStream.
const SFXFormat& getFormat() const { return mFormat; }
U32 getSampleCount() const { return mNumSamplesTotal; }
U32 getDataLength() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); }
U32 getDuration() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); }
bool isEOS() const { return ( mNumSamplesLeft != 0 ); }
void reset();
U32 read( U8 *buffer, U32 length );
const SFXFormat& getFormat() const override { return mFormat; }
U32 getSampleCount() const override { return mNumSamplesTotal; }
U32 getDataLength() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); }
U32 getDuration() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); }
bool isEOS() const override { return ( mNumSamplesLeft != 0 ); }
void reset() override;
U32 read( U8 *buffer, U32 length ) override;
};
#endif // !_SFXMEMORYSTREAM_H_

12
Engine/source/sfx/sfxModifier.h
View file

@ -73,7 +73,7 @@ class SFXOneShotModifier : public SFXModifier
SFXOneShotModifier( SFXSource* source, F32 triggerPos, bool removeWhenDone = false );
// IPolled.
virtual bool update();
bool update() override;
};
/// An SFXModifier that is spans a certain range of playback time.
@ -117,7 +117,7 @@ class SFXRangeModifier : public SFXModifier
bool isActive() const { return mIsActive; }
// IPolled.
virtual bool update();
bool update() override;
};
/// A volume fade effect (fade-in or fade-out).
@ -149,9 +149,9 @@ class SFXFadeModifier : public SFXRangeModifier
EOnEnd mOnEnd;
// SFXModifier.
virtual void _onStart();
virtual void _onUpdate();
virtual void _onEnd();
void _onStart() override;
void _onUpdate() override;
void _onEnd() override;
public:
@ -181,7 +181,7 @@ class SFXMarkerModifier : public SFXOneShotModifier
String mMarkerName;
// SFXOneShotModifier
virtual void _onTrigger();
void _onTrigger() override;
public:

38
Engine/source/sfx/sfxSound.h
View file

@ -104,16 +104,16 @@ class SFXSound : public SFXSource,
}
// SFXSource.
virtual void _play();
virtual void _pause();
virtual void _stop();
virtual void _updateStatus();
virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event );
virtual void _updateVolume( const MatrixF& listener );
virtual void _updatePitch();
virtual void _updatePriority();
virtual void _setMinMaxDistance( F32 min, F32 max );
virtual void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
void _play() override;
void _pause() override;
void _stop() override;
void _updateStatus() override;
void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override;
void _updateVolume( const MatrixF& listener ) override;
void _updatePitch() override;
void _updatePriority() override;
void _setMinMaxDistance( F32 min, F32 max ) override;
void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
public:
@ -131,10 +131,10 @@ class SFXSound : public SFXSource,
/// Return the current playback position in milliseconds.
/// @note For looping sources, this returns the position in the current cycle.
U32 getPosition() const;
U32 getPosition() const override;
/// Set the current playback position in milliseconds.
void setPosition( U32 ms );
void setPosition( U32 ms ) override;
/// Returns the source's total playback time in milliseconds.
U32 getDuration() const { return mDuration; }
@ -155,15 +155,15 @@ class SFXSound : public SFXSource,
static S32 QSORT_CALLBACK qsortCompare( const void* item1, const void* item2 );
// SFXSource.
virtual void setTransform( const MatrixF& transform );
virtual void setVelocity( const VectorF& velocity );
virtual bool isVirtualized() const;
virtual F32 getElapsedPlayTimeCurrentCycle() const;
virtual F32 getTotalPlayTime() const;
void setTransform( const MatrixF& transform ) override;
void setVelocity( const VectorF& velocity ) override;
bool isVirtualized() const override;
F32 getElapsedPlayTimeCurrentCycle() const override;
F32 getTotalPlayTime() const override;
// SimObject.
virtual void onRemove();
virtual void onDeleteNotify( SimObject* object );
void onRemove() override;
void onDeleteNotify( SimObject* object ) override;
};
#endif // !_SFXSOUND_H_

8
Engine/source/sfx/sfxState.h
View file

@ -105,10 +105,10 @@ class SFXState : public SimDataBlock
void disable();
// SimDataBlock.
virtual bool onAdd();
virtual bool preload( bool server, String& errorStr );
virtual void packData( BitStream* stream );
virtual void unpackData( BitStream* stream );
bool onAdd() override;
bool preload( bool server, String& errorStr ) override;
void packData( BitStream* stream ) override;
void unpackData( BitStream* stream ) override;
static void initPersistFields();

4
Engine/source/sfx/sfxStream.h
View file

@ -73,12 +73,12 @@ class SFXStream : public ThreadSafeRefCount< SFXStream >,
virtual bool isEOS() const = 0;
/// Resets the stream to restart reading data from the begining.
virtual void reset() = 0;
void reset() override = 0;
/// Reads data from the stream and decompresses it into PCM samples.
///
/// @param length Number of bytes to read.
virtual U32 read( U8 *buffer, U32 length ) = 0;
U32 read( U8 *buffer, U32 length ) override = 0;
};
typedef ThreadSafeRef< SFXStream > SFXStreamRef;

4
Engine/source/sfx/sfxVoice.h
View file

@ -156,14 +156,14 @@ class SFXVoice : public StrongRefBase,
///
/// @note For looping sounds, this will return the position in the
/// current cycle and not the total number of samples played so far.
virtual U32 getPosition() const;
U32 getPosition() const override;
/// Sets the playback position to the given sample count.
///
/// @param sample Offset in number of samples. This is allowed to use an offset
/// accumulated from multiple cycles. Each cycle will wrap around back to the
/// beginning of the buffer.
virtual void setPosition( U32 sample );
void setPosition( U32 sample ) override;
/// @return the current playback status.
/// @note For streaming voices, the reaction to for the voice to update its status