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

Improved Atlas class

Browse Source 
It now handles layer resize failure and will notify listeners of a
pointer change


Former-commit-id: df5e2a129897128a4e41e0b3205f6a1dbeb2069c
This commit is contained in:
Lynix
2015-01-16 16:26:15 +01:00
parent 5eec0d2abe
commit ff7cfa226e
6 changed files with 97 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,7 @@ class NAZARA_API NzGuillotineTextureAtlas : public NzGuillotineImageAtlas
~NzGuillotineTextureAtlas() = default;
private:
unsigned int GetMaxAtlasSize() const override;
bool ResizeImage(Layer& layer, const NzVector2ui& size) const override;
NzAbstractImage* ResizeImage(NzAbstractImage* oldImage, const NzVector2ui& size) const override;
};
#endif // NAZARA_GUILLOTINETEXTUREATLAS_HPP

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

@@ -40,11 +40,13 @@ class NAZARA_API NzAbstractAtlas
virtual ~Listener();
virtual bool OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata);
virtual bool OnAtlasLayerChange(const NzAbstractAtlas* atlas, NzAbstractImage* oldLayer, NzAbstractImage* newLayer, void* userdata);
virtual void OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata);
};
protected:
void NotifyCleared();
void NotifyLayerChange(NzAbstractImage* oldLayer, NzAbstractImage* newLayer);
private:
mutable std::unordered_map<Listener*, void*> m_listeners;

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

@@ -37,8 +37,8 @@ class NAZARA_API NzGuillotineImageAtlas : public NzAbstractAtlas
protected:
struct Layer;
virtual unsigned int GetMaxAtlasSize() const;
virtual bool ResizeImage(Layer& layer, const NzVector2ui& size) const;
virtual NzAbstractImage* ResizeImage(NzAbstractImage* oldImage, const NzVector2ui& size) const;
bool ResizeLayer(Layer& layer, const NzVector2ui& size);
struct QueuedGlyph
{