diff --git a/SDK/include/NDK/Components/CameraComponent.hpp b/SDK/include/NDK/Components/CameraComponent.hpp index 4eea340e8..f96d32da4 100644 --- a/SDK/include/NDK/Components/CameraComponent.hpp +++ b/SDK/include/NDK/Components/CameraComponent.hpp @@ -33,20 +33,20 @@ namespace Ndk inline void EnsureViewMatrixUpdate() const; inline void EnsureViewportUpdate() const; - inline float GetAspectRatio() const; - inline Nz::Vector3f GetEyePosition() const; - inline Nz::Vector3f GetForward() const; + inline float GetAspectRatio() const override; + inline Nz::Vector3f GetEyePosition() const override; + inline Nz::Vector3f GetForward() const override; inline float GetFOV() const; - inline const Nz::Frustumf& GetFrustum() const; + inline const Nz::Frustumf& GetFrustum() const override; inline unsigned int GetLayer() const; - inline const Nz::Matrix4f& GetProjectionMatrix() const; + inline const Nz::Matrix4f& GetProjectionMatrix() const override; inline Nz::ProjectionType GetProjectionType() const; - inline const Nz::RenderTarget* GetTarget() const; + inline const Nz::RenderTarget* GetTarget() const override; inline const Nz::Rectf& GetTargetRegion() const; - inline const Nz::Matrix4f& GetViewMatrix() const; - inline const Nz::Recti& GetViewport() const; - inline float GetZFar() const; - inline float GetZNear() const; + inline const Nz::Matrix4f& GetViewMatrix() const override; + inline const Nz::Recti& GetViewport() const override; + inline float GetZFar() const override; + inline float GetZNear() const override; inline void SetFOV(float fov); inline void SetLayer(unsigned int layer); diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index 600e23b25..f7922254d 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -23,8 +23,8 @@ namespace Nz void Begin() override; ByteArray End() override; - std::size_t GetDigestLength() const; - const char* GetHashName() const; + std::size_t GetDigestLength() const override; + const char* GetHashName() const override; private: HashWhirlpool_state* m_state; diff --git a/include/Nazara/Graphics/DeferredRenderQueue.hpp b/include/Nazara/Graphics/DeferredRenderQueue.hpp index 76bff6926..fecd507be 100644 --- a/include/Nazara/Graphics/DeferredRenderQueue.hpp +++ b/include/Nazara/Graphics/DeferredRenderQueue.hpp @@ -42,7 +42,7 @@ namespace Nz void AddMesh(int renderOrder, const Material* material, const MeshData& meshData, const Boxf& meshAABB, const Matrix4f& transformMatrix) override; void AddSprites(int renderOrder, const Material* material, const VertexStruct_XYZ_Color_UV* vertices, unsigned int spriteCount, const Texture* overlay = nullptr) override; - void Clear(bool fully = false); + void Clear(bool fully = false) override; struct MeshDataComparator { diff --git a/include/Nazara/Graphics/ForwardRenderQueue.hpp b/include/Nazara/Graphics/ForwardRenderQueue.hpp index 3a5d3ef33..9a17f5d2f 100644 --- a/include/Nazara/Graphics/ForwardRenderQueue.hpp +++ b/include/Nazara/Graphics/ForwardRenderQueue.hpp @@ -44,7 +44,7 @@ namespace Nz void AddMesh(int renderOrder, const Material* material, const MeshData& meshData, const Boxf& meshAABB, const Matrix4f& transformMatrix) override; void AddSprites(int renderOrder, const Material* material, const VertexStruct_XYZ_Color_UV* vertices, unsigned int spriteCount, const Texture* overlay = nullptr) override; - void Clear(bool fully = false); + void Clear(bool fully = false) override; void Sort(const AbstractViewer* viewer); diff --git a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp index b40e4f610..42449712c 100644 --- a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp +++ b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp @@ -19,7 +19,7 @@ namespace Nz GuillotineTextureAtlas() = default; ~GuillotineTextureAtlas() = default; - UInt32 GetStorage() const; + UInt32 GetStorage() const override; private: AbstractImage* ResizeImage(AbstractImage* oldImage, const Vector2ui& size) const override; diff --git a/include/Nazara/Graphics/ParticleSystem.hpp b/include/Nazara/Graphics/ParticleSystem.hpp index 34dcbb137..76b834f6e 100644 --- a/include/Nazara/Graphics/ParticleSystem.hpp +++ b/include/Nazara/Graphics/ParticleSystem.hpp @@ -33,7 +33,7 @@ namespace Nz void AddController(ParticleControllerRef controller); void AddEmitter(ParticleEmitter* emitter); void AddGenerator(ParticleGeneratorRef generator); - void AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix) const; + void AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix) const override; void ApplyControllers(ParticleMapper& mapper, unsigned int particleCount, float elapsedTime); diff --git a/include/Nazara/Graphics/SkeletalModel.hpp b/include/Nazara/Graphics/SkeletalModel.hpp index 059d6b835..6ae25923e 100644 --- a/include/Nazara/Graphics/SkeletalModel.hpp +++ b/include/Nazara/Graphics/SkeletalModel.hpp @@ -54,7 +54,7 @@ namespace Nz bool HasAnimation() const; - bool IsAnimated() const; + bool IsAnimated() const override; bool IsAnimationEnabled() const; bool LoadFromFile(const String& filePath, const SkeletalModelParameters& params = SkeletalModelParameters()); diff --git a/include/Nazara/Physics/Geom.hpp b/include/Nazara/Physics/Geom.hpp index 3db143292..3e3d14164 100644 --- a/include/Nazara/Physics/Geom.hpp +++ b/include/Nazara/Physics/Geom.hpp @@ -225,7 +225,7 @@ namespace Nz public: NullGeom(); - void ComputeInertialMatrix(Vector3f* inertia, Vector3f* center) const; + void ComputeInertialMatrix(Vector3f* inertia, Vector3f* center) const override; GeomType GetType() const override; diff --git a/include/Nazara/Renderer/RenderTexture.hpp b/include/Nazara/Renderer/RenderTexture.hpp index c197f50c0..798e441ee 100644 --- a/include/Nazara/Renderer/RenderTexture.hpp +++ b/include/Nazara/Renderer/RenderTexture.hpp @@ -43,12 +43,12 @@ namespace Nz void Detach(AttachmentPoint attachmentPoint, UInt8 index); unsigned int GetHeight() const override; - RenderTargetParameters GetParameters() const; + RenderTargetParameters GetParameters() const override; Vector2ui GetSize() const; unsigned int GetWidth() const override; bool IsComplete() const; - bool IsRenderable() const; + bool IsRenderable() const override; inline bool IsValid() const; bool Lock() const; diff --git a/include/Nazara/Renderer/RenderWindow.hpp b/include/Nazara/Renderer/RenderWindow.hpp index 0e283151b..d9889d803 100644 --- a/include/Nazara/Renderer/RenderWindow.hpp +++ b/include/Nazara/Renderer/RenderWindow.hpp @@ -46,11 +46,11 @@ namespace Nz void EnableVerticalSync(bool enabled); - unsigned int GetHeight() const; - RenderTargetParameters GetParameters() const; - unsigned int GetWidth() const; + unsigned int GetHeight() const override; + RenderTargetParameters GetParameters() const override; + unsigned int GetWidth() const override; - bool IsRenderable() const; + bool IsRenderable() const override; bool IsValid() const; void SetFramerateLimit(unsigned int limit); diff --git a/include/Nazara/Utility/SimpleTextDrawer.hpp b/include/Nazara/Utility/SimpleTextDrawer.hpp index 22b52f293..68fdc1daa 100644 --- a/include/Nazara/Utility/SimpleTextDrawer.hpp +++ b/include/Nazara/Utility/SimpleTextDrawer.hpp @@ -24,7 +24,7 @@ namespace Nz SimpleTextDrawer(SimpleTextDrawer&& drawer); virtual ~SimpleTextDrawer(); - const Rectui& GetBounds() const; + const Rectui& GetBounds() const override; unsigned int GetCharacterSize() const; const Color& GetColor() const; Font* GetFont() const; diff --git a/src/Nazara/Audio/Formats/sndfileLoader.cpp b/src/Nazara/Audio/Formats/sndfileLoader.cpp index 4cf99fee7..2aca17976 100644 --- a/src/Nazara/Audio/Formats/sndfileLoader.cpp +++ b/src/Nazara/Audio/Formats/sndfileLoader.cpp @@ -180,7 +180,7 @@ namespace Nz return true; } - unsigned int Read(void* buffer, unsigned int sampleCount) + unsigned int Read(void* buffer, unsigned int sampleCount) override { // Si la musique a été demandée en mono, nous devons la convertir à la volée lors de la lecture if (m_mixToMono)