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

Fix a shitload of warnings in 64 bits mode

Browse Source 
Former-commit-id: d3d40b9f364a0a27a3411586e62a16443ee5de00 [formerly 71282c40087232985fa19b8dcbd0d75bd4fcd97b]
Former-commit-id: c11c69d4c1f40bdd33f721cb33c68c4144771510
This commit is contained in:
Lynix
2016-06-13 21:09:55 +02:00
parent 3ab0192300
commit 086de1f71c
39 changed files with 191 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/Nazara/Utility/GuillotineImageAtlas.hpp
View File

@@ -23,16 +23,17 @@ namespace Nz
GuillotineImageAtlas();
virtual ~GuillotineImageAtlas();
void Clear();
void Free(SparsePtr<const Rectui> rects, SparsePtr<unsigned int> layers, unsigned int count);
void Clear() override;
void Free(SparsePtr<const Rectui> rects, SparsePtr<unsigned int> layers, unsigned int count) override;
GuillotineBinPack::FreeRectChoiceHeuristic GetRectChoiceHeuristic() const;
GuillotineBinPack::GuillotineSplitHeuristic GetRectSplitHeuristic() const;
AbstractImage* GetLayer(unsigned int layerIndex) const;
unsigned int GetLayerCount() const;
UInt32 GetStorage() const;
AbstractImage* GetLayer(unsigned int layerIndex) const override;
std::size_t GetLayerCount() const override;
UInt32 GetStorage() const override;
bool Insert(const Image& image, Rectui* rect, bool* flipped, unsigned int* layerIndex);
bool Insert(const Image& image, Rectui* rect, bool* flipped, unsigned int* layerIndex) override;
void SetRectChoiceHeuristic(GuillotineBinPack::FreeRectChoiceHeuristic heuristic);
void SetRectSplitHeuristic(GuillotineBinPack::GuillotineSplitHeuristic heuristic);