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

Add override where missing

Browse Source 
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
This commit is contained in:
Gawaboumga
2015-12-30 15:15:20 +01:00
parent 92eaf8db1f
commit 7f4a7c1012
12 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
{

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

@@ -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);

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

@@ -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;

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

@@ -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);

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

@@ -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());