sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various little fixes (#118)

Browse Source 
* Add missing override qualifier

* Mostly shadowing, virtual destructor and other little things
This commit is contained in:
Gawaboumga
2017-02-19 23:15:13 +01:00
committed by Jérôme Leclercq
parent ee9712fdcd
commit c2e4ccaf72
38 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/Nazara/Audio/Music.hpp
View File

@@ -43,27 +43,27 @@ namespace Nz
bool Create(SoundStream* soundStream);
void Destroy();
void EnableLooping(bool loop);
void EnableLooping(bool loop) override;
UInt32 GetDuration() const;
UInt32 GetDuration() const override;
AudioFormat GetFormat() const;
UInt32 GetPlayingOffset() const;
UInt32 GetPlayingOffset() const override;
UInt64 GetSampleCount() const;
UInt32 GetSampleRate() const;
SoundStatus GetStatus() const;
SoundStatus GetStatus() const override;
bool IsLooping() const;
bool IsLooping() const override;
bool OpenFromFile(const String& filePath, const MusicParams& params = MusicParams());
bool OpenFromMemory(const void* data, std::size_t size, const MusicParams& params = MusicParams());
bool OpenFromStream(Stream& stream, const MusicParams& params = MusicParams());
void Pause();
void Play();
void Pause() override;
void Play() override;
void SetPlayingOffset(UInt32 offset);
void Stop();
void Stop() override;
Music& operator=(const Music&) = delete;
Music& operator=(Music&&) = delete; ///TODO

16
include/Nazara/Audio/Sound.hpp
View File

@@ -23,14 +23,14 @@ namespace Nz
Sound(Sound&&) = default;
~Sound();
void EnableLooping(bool loop);
void EnableLooping(bool loop) override;
const SoundBuffer* GetBuffer() const;
UInt32 GetDuration() const;
UInt32 GetPlayingOffset() const;
SoundStatus GetStatus() const;
UInt32 GetDuration() const override;
UInt32 GetPlayingOffset() const override;
SoundStatus GetStatus() const override;
bool IsLooping() const;
bool IsLooping() const override;
bool IsPlayable() const;
bool IsPlaying() const;
@@ -38,13 +38,13 @@ namespace Nz
bool LoadFromMemory(const void* data, std::size_t size, const SoundBufferParams& params = SoundBufferParams());
bool LoadFromStream(Stream& stream, const SoundBufferParams& params = SoundBufferParams());
void Pause();
void Play();
void Pause() override;
void Play() override;
void SetBuffer(const SoundBuffer* buffer);
void SetPlayingOffset(UInt32 offset);
void Stop();
void Stop() override;
Sound& operator=(const Sound&) = delete; ///TODO?
Sound& operator=(Sound&&) = default;

2
include/Nazara/Core/ByteStream.hpp
View File

@@ -24,7 +24,7 @@ namespace Nz
ByteStream(const void* ptr, Nz::UInt64 size);
ByteStream(const ByteStream&) = delete;
inline ByteStream(ByteStream&& stream);
~ByteStream();
virtual ~ByteStream();
inline Endianness GetDataEndianness() const;
inline Nz::UInt64 GetSize() const;

6
include/Nazara/Core/Functor.hpp
View File

@@ -25,7 +25,7 @@ namespace Nz
{
FunctorWithoutArgs(F func);
void Run();
void Run() override;
private:
F m_func;
@@ -36,7 +36,7 @@ namespace Nz
{
FunctorWithArgs(F func, Args&&... args);
void Run();
void Run() override;
private:
F m_func;
@@ -48,7 +48,7 @@ namespace Nz
{
MemberWithoutArgs(void (C::*func)(), C* object);
void Run();
void Run() override;
private:
void (C::*m_func)();

4
include/Nazara/Graphics/ColorBackground.hpp
View File

@@ -26,9 +26,9 @@ namespace Nz
ColorBackground(const ColorBackground&) = default;
ColorBackground(ColorBackground&&) = delete;
void Draw(const AbstractViewer* viewer) const;
void Draw(const AbstractViewer* viewer) const override;
BackgroundType GetBackgroundType() const;
BackgroundType GetBackgroundType() const override;
Color GetColor() const;
void SetColor(const Color& color);

4
include/Nazara/Graphics/DeferredBloomPass.hpp
View File

@@ -29,8 +29,8 @@ namespace Nz
float GetBrightThreshold() const;
Texture* GetTexture(unsigned int i) const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Resize(const Vector2ui& dimensions);
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
bool Resize(const Vector2ui& dimensions) override;
void SetBlurPassCount(unsigned int passCount);
void SetBrightLuminance(float luminance);

4
include/Nazara/Graphics/DeferredDOFPass.hpp
View File

@@ -23,8 +23,8 @@ namespace Nz
DeferredDOFPass();
virtual ~DeferredDOFPass();
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Resize(const Vector2ui& dimensions);
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
bool Resize(const Vector2ui& dimensions) override;
protected:
RenderTexture m_dofRTT;

2
include/Nazara/Graphics/DeferredFXAAPass.hpp
View File

@@ -21,7 +21,7 @@ namespace Nz
DeferredFXAAPass();
virtual ~DeferredFXAAPass();
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
protected:
RenderStates m_states;

2
include/Nazara/Graphics/DeferredFinalPass.hpp
View File

@@ -21,7 +21,7 @@ namespace Nz
DeferredFinalPass();
virtual ~DeferredFinalPass();
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
protected:
RenderStates m_states;

2
include/Nazara/Graphics/DeferredFogPass.hpp
View File

@@ -21,7 +21,7 @@ namespace Nz
DeferredFogPass();
virtual ~DeferredFogPass();
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
protected:
RenderStates m_states;

4
include/Nazara/Graphics/DeferredForwardPass.hpp
View File

@@ -20,8 +20,8 @@ namespace Nz
DeferredForwardPass();
virtual ~DeferredForwardPass();
void Initialize(DeferredRenderTechnique* technique);
bool Process(const SceneData& sceneData, unsigned int workTexture, unsigned int sceneTexture) const;
void Initialize(DeferredRenderTechnique* technique) override;
bool Process(const SceneData& sceneData, unsigned int workTexture, unsigned int sceneTexture) const override;
protected:
const ForwardRenderTechnique* m_forwardTechnique;

4
include/Nazara/Graphics/DeferredGeometryPass.hpp
View File

@@ -21,8 +21,8 @@ namespace Nz
DeferredGeometryPass();
virtual ~DeferredGeometryPass();
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Resize(const Vector2ui& dimensions);
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
bool Resize(const Vector2ui& dimensions) override;
protected:
struct ShaderUniforms;

2
include/Nazara/Graphics/DeferredPhongLightingPass.hpp
View File

@@ -28,7 +28,7 @@ namespace Nz
bool IsLightMeshesDrawingEnabled() const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const;
bool Process(const SceneData& sceneData, unsigned int firstWorkTexture, unsigned int secondWorkTexture) const override;
protected:
LightUniforms m_directionalLightUniforms;

4
include/Nazara/Graphics/TextureBackground.hpp
View File

@@ -24,9 +24,9 @@ namespace Nz
public:
TextureBackground(TextureRef texture = TextureRef());
void Draw(const AbstractViewer* viewer) const;
void Draw(const AbstractViewer* viewer) const override;
BackgroundType GetBackgroundType() const;
BackgroundType GetBackgroundType() const override;
inline const TextureRef& GetTexture() const;
inline void SetTexture(TextureRef texture);

2
include/Nazara/Noise/MixerBase.hpp
View File

@@ -15,7 +15,7 @@ namespace Nz
{
public:
MixerBase();
~MixerBase() = default;
virtual ~MixerBase() = default;
virtual float Get(float x, float y, float scale) const = 0;
virtual float Get(float x, float y, float z, float scale) const = 0;

2
include/Nazara/Noise/NoiseBase.hpp
View File

@@ -19,7 +19,7 @@ namespace Nz
{
public:
NoiseBase(unsigned int seed = 0);
~NoiseBase() = default;
virtual ~NoiseBase() = default;
virtual float Get(float x, float y, float scale) const = 0;
virtual float Get(float x, float y, float z, float scale) const = 0;

2
include/Nazara/Renderer/UberShaderInstancePreprocessor.hpp
View File

@@ -18,7 +18,7 @@ namespace Nz
UberShaderInstancePreprocessor(const Shader* shader);
virtual ~UberShaderInstancePreprocessor();
bool Activate() const;
bool Activate() const override;
};
}

2
include/Nazara/Renderer/UberShaderPreprocessor.hpp
View File

@@ -29,7 +29,7 @@ namespace Nz
UberShaderPreprocessor() = default;
~UberShaderPreprocessor();
UberShaderInstance* Get(const ParameterList& parameters) const;
UberShaderInstance* Get(const ParameterList& parameters) const override;
void SetShader(ShaderStageType stage, const String& source, const String& shaderFlags, const String& requiredFlags = String());
bool SetShaderFromFile(ShaderStageType stage, const String& filePath, const String& shaderFlags, const String& requiredFlags = String());

3
include/Nazara/Utility/EventHandler.inl
View File

@@ -8,7 +8,8 @@
namespace Nz
{
inline EventHandler::EventHandler(const EventHandler&)
inline EventHandler::EventHandler(const EventHandler& other) :
HandledObject(other)
{
}

26
include/Nazara/Utility/Image.hpp
View File

@@ -78,18 +78,18 @@ namespace Nz
bool FlipVertically();
const UInt8* GetConstPixels(unsigned int x = 0, unsigned int y = 0, unsigned int z = 0, UInt8 level = 0) const;
unsigned int GetDepth(UInt8 level = 0) const;
PixelFormatType GetFormat() const;
unsigned int GetHeight(UInt8 level = 0) const;
UInt8 GetLevelCount() const;
UInt8 GetMaxLevel() const;
std::size_t GetMemoryUsage() const;
std::size_t GetMemoryUsage(UInt8 level) const;
unsigned int GetDepth(UInt8 level = 0) const override;
PixelFormatType GetFormat() const override;
unsigned int GetHeight(UInt8 level = 0) const override;
UInt8 GetLevelCount() const override;
UInt8 GetMaxLevel() const override;
std::size_t GetMemoryUsage() const override;
std::size_t GetMemoryUsage(UInt8 level) const override;
Color GetPixelColor(unsigned int x, unsigned int y = 0, unsigned int z = 0) const;
UInt8* GetPixels(unsigned int x = 0, unsigned int y = 0, unsigned int z = 0, UInt8 level = 0);
Vector3ui GetSize(UInt8 level = 0) const;
ImageType GetType() const;
unsigned int GetWidth(UInt8 level = 0) const;
Vector3ui GetSize(UInt8 level = 0) const override;
ImageType GetType() const override;
unsigned int GetWidth(UInt8 level = 0) const override;
bool HasAlpha() const;
@@ -126,9 +126,9 @@ namespace Nz
void SetLevelCount(UInt8 levelCount);
bool SetPixelColor(const Color& color, unsigned int x, unsigned int y = 0, unsigned int z = 0);
bool Update(const UInt8* pixels, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0);
bool Update(const UInt8* pixels, const Boxui& box, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0);
bool Update(const UInt8* pixels, const Rectui& rect, unsigned int z = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0);
bool Update(const UInt8* pixels, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0) override;
bool Update(const UInt8* pixels, const Boxui& box, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0) override;
bool Update(const UInt8* pixels, const Rectui& rect, unsigned int z = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0) override;
Image& operator=(const Image& image);

2
include/Nazara/Utility/Joint.hpp
View File

@@ -35,7 +35,7 @@ namespace Nz
void SetName(const String& name);
private:
void InvalidateNode();
void InvalidateNode() override;
void UpdateSkinningMatrix() const;
Matrix4f m_inverseBindMatrix;

4
include/Nazara/Utility/SkeletalMesh.hpp
View File

@@ -29,13 +29,13 @@ namespace Nz
void Destroy();
const Boxf& GetAABB() const override;
AnimationType GetAnimationType() const final;
AnimationType GetAnimationType() const final override;
const IndexBuffer* GetIndexBuffer() const override;
VertexBuffer* GetVertexBuffer();
const VertexBuffer* GetVertexBuffer() const;
unsigned int GetVertexCount() const override;
bool IsAnimated() const final;
bool IsAnimated() const final override;
bool IsValid() const;
void SetAABB(const Boxf& aabb);

4
include/Nazara/Utility/StaticMesh.hpp
View File

@@ -32,13 +32,13 @@ namespace Nz
bool GenerateAABB();
const Boxf& GetAABB() const override;
AnimationType GetAnimationType() const final;
AnimationType GetAnimationType() const final override;
const IndexBuffer* GetIndexBuffer() const override;
VertexBuffer* GetVertexBuffer();
const VertexBuffer* GetVertexBuffer() const;
unsigned int GetVertexCount() const override;
bool IsAnimated() const final;
bool IsAnimated() const final override;
bool IsValid() const;
void SetAABB(const Boxf& aabb);