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

Renamed AbstractFontAtlas to AbstractAtlas 

Former-commit-id: 2908a05a7d2d6d44e2e29e96c52cafe962382b71
This commit is contained in:
Lynix 2015-01-16 12:40:23 +01:00
parent e3de7e6f3c
commit 1781e93462
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/Nazara/Utility/AbstractFontAtlas.hpp → include/Nazara/Utility/AbstractAtlas.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#ifndef NAZARA_ABSTRACTFONTATLAS_HPP #ifndef NAZARA_ABSTRACTATLAS_HPP
#define NAZARA_ABSTRACTFONTATLAS_HPP #define NAZARA_ABSTRACTATLAS_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/SparsePtr.hpp> #include <Nazara/Core/SparsePtr.hpp>
@ -15,13 +15,13 @@
class NzAbstractImage; class NzAbstractImage;
class NzImage; class NzImage;
class NAZARA_API NzAbstractFontAtlas class NAZARA_API NzAbstractAtlas
{ {
public: public:
class Listener; class Listener;
NzAbstractFontAtlas(); NzAbstractAtlas();
virtual ~NzAbstractFontAtlas(); virtual ~NzAbstractAtlas();
void AddListener(Listener* font, void* userdata = nullptr) const; void AddListener(Listener* font, void* userdata = nullptr) const;
@ -39,8 +39,8 @@ class NAZARA_API NzAbstractFontAtlas
Listener() = default; Listener() = default;
virtual ~Listener(); virtual ~Listener();
virtual bool OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata); virtual bool OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata);
virtual void OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata); virtual void OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata);
}; };
protected: protected:
@ -51,4 +51,4 @@ class NAZARA_API NzAbstractFontAtlas
bool m_listenersLocked; bool m_listenersLocked;
}; };
#endif // NAZARA_ABSTRACTFONTATLAS_HPP #endif // NAZARA_ABSTRACTATLAS_HPP

15
include/Nazara/Utility/Font.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/NonCopyable.hpp> #include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/ResourceRef.hpp> #include <Nazara/Core/ResourceRef.hpp>
#include <Nazara/Core/ResourceLoader.hpp> #include <Nazara/Core/ResourceLoader.hpp>
#include <Nazara/Utility/AbstractFontAtlas.hpp> #include <Nazara/Utility/AbstractAtlas.hpp>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
@ -29,9 +29,8 @@ using NzFontConstRef = NzResourceRef<const NzFont>;
using NzFontLoader = NzResourceLoader<NzFont, NzFontParams>; using NzFontLoader = NzResourceLoader<NzFont, NzFontParams>;
using NzFontRef = NzResourceRef<NzFont>; using NzFontRef = NzResourceRef<NzFont>;
class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNonCopyable class NAZARA_API NzFont : public NzResource, NzAbstractAtlas::Listener, NzNonCopyable
{ {
friend NzAbstractFontAtlas;
friend NzFontLoader; friend NzFontLoader;
public: public:
@ -51,7 +50,7 @@ class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNo
bool ExtractGlyph(unsigned int characterSize, char32_t character, nzUInt32 style, NzFontGlyph* glyph) const; bool ExtractGlyph(unsigned int characterSize, char32_t character, nzUInt32 style, NzFontGlyph* glyph) const;
const NzAbstractFontAtlas* GetAtlas() const; const NzAbstractAtlas* GetAtlas() const;
unsigned int GetCachedGlyphCount(unsigned int characterSize, nzUInt32 style) const; unsigned int GetCachedGlyphCount(unsigned int characterSize, nzUInt32 style) const;
unsigned int GetCachedGlyphCount() const; unsigned int GetCachedGlyphCount() const;
NzString GetFamilyName() const; NzString GetFamilyName() const;
@ -72,7 +71,7 @@ class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNo
bool OpenFromMemory(const void* data, std::size_t size, const NzFontParams& params = NzFontParams()); bool OpenFromMemory(const void* data, std::size_t size, const NzFontParams& params = NzFontParams());
bool OpenFromStream(NzInputStream& stream, const NzFontParams& params = NzFontParams()); bool OpenFromStream(NzInputStream& stream, const NzFontParams& params = NzFontParams());
void SetAtlas(std::shared_ptr<NzAbstractFontAtlas> atlas); void SetAtlas(std::shared_ptr<NzAbstractAtlas> atlas);
void SetGlyphBorder(unsigned int borderSize); void SetGlyphBorder(unsigned int borderSize);
void SetMinimumStepSize(unsigned int minimumSizeStep); void SetMinimumStepSize(unsigned int minimumSizeStep);
@ -108,11 +107,11 @@ class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNo
using GlyphMap = std::unordered_map<char32_t, Glyph>; using GlyphMap = std::unordered_map<char32_t, Glyph>;
nzUInt64 ComputeKey(unsigned int characterSize, nzUInt32 style) const; nzUInt64 ComputeKey(unsigned int characterSize, nzUInt32 style) const;
bool OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) override; bool OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata) override;
void OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) override; void OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata) override;
const Glyph& PrecacheGlyph(GlyphMap& glyphMap, unsigned int characterSize, nzUInt32 style, char32_t character) const; const Glyph& PrecacheGlyph(GlyphMap& glyphMap, unsigned int characterSize, nzUInt32 style, char32_t character) const;
std::shared_ptr<NzAbstractFontAtlas> m_atlas; std::shared_ptr<NzAbstractAtlas> m_atlas;
std::unique_ptr<NzFontData> m_data; std::unique_ptr<NzFontData> m_data;
mutable std::unordered_map<nzUInt64, std::unordered_map<nzUInt64, int>> m_kerningCache; mutable std::unordered_map<nzUInt64, std::unordered_map<nzUInt64, int>> m_kerningCache;
mutable std::unordered_map<nzUInt64, GlyphMap> m_glyphes; mutable std::unordered_map<nzUInt64, GlyphMap> m_glyphes;

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

@ -9,13 +9,13 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/GuillotineBinPack.hpp> #include <Nazara/Core/GuillotineBinPack.hpp>
#include <Nazara/Utility/AbstractFontAtlas.hpp> #include <Nazara/Utility/AbstractAtlas.hpp>
#include <Nazara/Utility/AbstractImage.hpp> #include <Nazara/Utility/AbstractImage.hpp>
#include <Nazara/Utility/Image.hpp> #include <Nazara/Utility/Image.hpp>
#include <memory> #include <memory>
#include <vector> #include <vector>
class NAZARA_API NzGuillotineImageAtlas : public NzAbstractFontAtlas class NAZARA_API NzGuillotineImageAtlas : public NzAbstractAtlas
{ {
public: public:
NzGuillotineImageAtlas(); NzGuillotineImageAtlas();

19
src/Nazara/Utility/AbstractFontAtlas.cpp → src/Nazara/Utility/AbstractAtlas.cpp
View File

@ -2,35 +2,34 @@
// This file is part of the "Nazara Engine - Utility module" // This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/AbstractFontAtlas.hpp> #include <Nazara/Utility/AbstractAtlas.hpp>
#include <Nazara/Utility/Font.hpp>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>
NzAbstractFontAtlas::NzAbstractFontAtlas() : NzAbstractAtlas::NzAbstractAtlas() :
m_listenersLocked(false) m_listenersLocked(false)
{ {
} }
NzAbstractFontAtlas::~NzAbstractFontAtlas() NzAbstractAtlas::~NzAbstractAtlas()
{ {
m_listenersLocked = true; m_listenersLocked = true;
for (auto& pair : m_listeners) for (auto& pair : m_listeners)
pair.first->OnAtlasReleased(this, pair.second); pair.first->OnAtlasReleased(this, pair.second);
} }
void NzAbstractFontAtlas::AddListener(Listener* listener, void* userdata) const void NzAbstractAtlas::AddListener(Listener* listener, void* userdata) const
{ {
if (!m_listenersLocked) if (!m_listenersLocked)
m_listeners.insert(std::make_pair(listener, userdata)); m_listeners.insert(std::make_pair(listener, userdata));
} }
void NzAbstractFontAtlas::RemoveListener(Listener* listener) const void NzAbstractAtlas::RemoveListener(Listener* listener) const
{ {
if (!m_listenersLocked) if (!m_listenersLocked)
m_listeners.erase(listener); m_listeners.erase(listener);
} }
void NzAbstractFontAtlas::NotifyCleared() void NzAbstractAtlas::NotifyCleared()
{ {
m_listenersLocked = true; m_listenersLocked = true;
@ -46,9 +45,9 @@ void NzAbstractFontAtlas::NotifyCleared()
m_listenersLocked = false; m_listenersLocked = false;
} }
NzAbstractFontAtlas::Listener::~Listener() = default; NzAbstractAtlas::Listener::~Listener() = default;
bool NzAbstractFontAtlas::Listener::OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) bool NzAbstractAtlas::Listener::OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata)
{ {
NazaraUnused(atlas); NazaraUnused(atlas);
NazaraUnused(userdata); NazaraUnused(userdata);
@ -56,7 +55,7 @@ bool NzAbstractFontAtlas::Listener::OnAtlasCleared(const NzAbstractFontAtlas* at
return true; return true;
} }
void NzAbstractFontAtlas::Listener::OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) void NzAbstractAtlas::Listener::OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata)
{ {
NazaraUnused(atlas); NazaraUnused(atlas);
NazaraUnused(userdata); NazaraUnused(userdata);

8
src/Nazara/Utility/Font.cpp
View File

@ -101,7 +101,7 @@ bool NzFont::ExtractGlyph(unsigned int characterSize, char32_t character, nzUInt
return m_data->ExtractGlyph(characterSize, character, style, glyph); return m_data->ExtractGlyph(characterSize, character, style, glyph);
} }
const NzAbstractFontAtlas* NzFont::GetAtlas() const const NzAbstractAtlas* NzFont::GetAtlas() const
{ {
return m_atlas.get(); return m_atlas.get();
} }
@ -265,7 +265,7 @@ bool NzFont::OpenFromStream(NzInputStream& stream, const NzFontParams& params)
return NzFontLoader::LoadFromStream(this, stream, params); return NzFontLoader::LoadFromStream(this, stream, params);
} }
void NzFont::SetAtlas(std::shared_ptr<NzAbstractFontAtlas> atlas) void NzFont::SetAtlas(std::shared_ptr<NzAbstractAtlas> atlas)
{ {
ClearGlyphCache(); ClearGlyphCache();
@ -314,7 +314,7 @@ nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const
return (stylePart << 32) | sizePart; return (stylePart << 32) | sizePart;
} }
bool NzFont::OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) bool NzFont::OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata)
{ {
NazaraUnused(atlas); NazaraUnused(atlas);
NazaraUnused(userdata); NazaraUnused(userdata);
@ -335,7 +335,7 @@ bool NzFont::OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata)
return true; return true;
} }
void NzFont::OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) void NzFont::OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata)
{ {
NazaraUnused(atlas); NazaraUnused(atlas);
NazaraUnused(userdata); NazaraUnused(userdata);