From 1781e934624fa94e8cb2f1c457db2a92fdc63e39 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 16 Jan 2015 12:40:23 +0100 Subject: [PATCH] Renamed AbstractFontAtlas to AbstractAtlas Former-commit-id: 2908a05a7d2d6d44e2e29e96c52cafe962382b71 --- ...bstractFontAtlas.hpp => AbstractAtlas.hpp} | 16 ++++++++-------- include/Nazara/Utility/Font.hpp | 15 +++++++-------- .../Nazara/Utility/GuillotineImageAtlas.hpp | 4 ++-- ...bstractFontAtlas.cpp => AbstractAtlas.cpp} | 19 +++++++++---------- src/Nazara/Utility/Font.cpp | 8 ++++---- 5 files changed, 30 insertions(+), 32 deletions(-) rename include/Nazara/Utility/{AbstractFontAtlas.hpp => AbstractAtlas.hpp} (74%) rename src/Nazara/Utility/{AbstractFontAtlas.cpp => AbstractAtlas.cpp} (58%) diff --git a/include/Nazara/Utility/AbstractFontAtlas.hpp b/include/Nazara/Utility/AbstractAtlas.hpp similarity index 74% rename from include/Nazara/Utility/AbstractFontAtlas.hpp rename to include/Nazara/Utility/AbstractAtlas.hpp index f029731f2..6cb56f41f 100644 --- a/include/Nazara/Utility/AbstractFontAtlas.hpp +++ b/include/Nazara/Utility/AbstractAtlas.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTFONTATLAS_HPP -#define NAZARA_ABSTRACTFONTATLAS_HPP +#ifndef NAZARA_ABSTRACTATLAS_HPP +#define NAZARA_ABSTRACTATLAS_HPP #include #include @@ -15,13 +15,13 @@ class NzAbstractImage; class NzImage; -class NAZARA_API NzAbstractFontAtlas +class NAZARA_API NzAbstractAtlas { public: class Listener; - NzAbstractFontAtlas(); - virtual ~NzAbstractFontAtlas(); + NzAbstractAtlas(); + virtual ~NzAbstractAtlas(); void AddListener(Listener* font, void* userdata = nullptr) const; @@ -39,8 +39,8 @@ class NAZARA_API NzAbstractFontAtlas Listener() = default; virtual ~Listener(); - virtual bool OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata); - virtual void OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata); + virtual bool OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata); + virtual void OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata); }; protected: @@ -51,4 +51,4 @@ class NAZARA_API NzAbstractFontAtlas bool m_listenersLocked; }; -#endif // NAZARA_ABSTRACTFONTATLAS_HPP +#endif // NAZARA_ABSTRACTATLAS_HPP diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index 82164b09f..0c6080429 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include @@ -29,9 +29,8 @@ using NzFontConstRef = NzResourceRef; using NzFontLoader = NzResourceLoader; using NzFontRef = NzResourceRef; -class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNonCopyable +class NAZARA_API NzFont : public NzResource, NzAbstractAtlas::Listener, NzNonCopyable { - friend NzAbstractFontAtlas; friend NzFontLoader; 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; - const NzAbstractFontAtlas* GetAtlas() const; + const NzAbstractAtlas* GetAtlas() const; unsigned int GetCachedGlyphCount(unsigned int characterSize, nzUInt32 style) const; unsigned int GetCachedGlyphCount() 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 OpenFromStream(NzInputStream& stream, const NzFontParams& params = NzFontParams()); - void SetAtlas(std::shared_ptr atlas); + void SetAtlas(std::shared_ptr atlas); void SetGlyphBorder(unsigned int borderSize); void SetMinimumStepSize(unsigned int minimumSizeStep); @@ -108,11 +107,11 @@ class NAZARA_API NzFont : public NzResource, NzAbstractFontAtlas::Listener, NzNo using GlyphMap = std::unordered_map; nzUInt64 ComputeKey(unsigned int characterSize, nzUInt32 style) const; - bool OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) override; - void OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) override; + bool OnAtlasCleared(const NzAbstractAtlas* 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; - std::shared_ptr m_atlas; + std::shared_ptr m_atlas; std::unique_ptr m_data; mutable std::unordered_map> m_kerningCache; mutable std::unordered_map m_glyphes; diff --git a/include/Nazara/Utility/GuillotineImageAtlas.hpp b/include/Nazara/Utility/GuillotineImageAtlas.hpp index 1bc478427..b17e2c647 100644 --- a/include/Nazara/Utility/GuillotineImageAtlas.hpp +++ b/include/Nazara/Utility/GuillotineImageAtlas.hpp @@ -9,13 +9,13 @@ #include #include -#include +#include #include #include #include #include -class NAZARA_API NzGuillotineImageAtlas : public NzAbstractFontAtlas +class NAZARA_API NzGuillotineImageAtlas : public NzAbstractAtlas { public: NzGuillotineImageAtlas(); diff --git a/src/Nazara/Utility/AbstractFontAtlas.cpp b/src/Nazara/Utility/AbstractAtlas.cpp similarity index 58% rename from src/Nazara/Utility/AbstractFontAtlas.cpp rename to src/Nazara/Utility/AbstractAtlas.cpp index 710c52d8f..5fa7a2ca1 100644 --- a/src/Nazara/Utility/AbstractFontAtlas.cpp +++ b/src/Nazara/Utility/AbstractAtlas.cpp @@ -2,35 +2,34 @@ // This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include #include -NzAbstractFontAtlas::NzAbstractFontAtlas() : +NzAbstractAtlas::NzAbstractAtlas() : m_listenersLocked(false) { } -NzAbstractFontAtlas::~NzAbstractFontAtlas() +NzAbstractAtlas::~NzAbstractAtlas() { m_listenersLocked = true; for (auto& pair : m_listeners) 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) m_listeners.insert(std::make_pair(listener, userdata)); } -void NzAbstractFontAtlas::RemoveListener(Listener* listener) const +void NzAbstractAtlas::RemoveListener(Listener* listener) const { if (!m_listenersLocked) m_listeners.erase(listener); } -void NzAbstractFontAtlas::NotifyCleared() +void NzAbstractAtlas::NotifyCleared() { m_listenersLocked = true; @@ -46,9 +45,9 @@ void NzAbstractFontAtlas::NotifyCleared() 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(userdata); @@ -56,7 +55,7 @@ bool NzAbstractFontAtlas::Listener::OnAtlasCleared(const NzAbstractFontAtlas* at return true; } -void NzAbstractFontAtlas::Listener::OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) +void NzAbstractAtlas::Listener::OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata) { NazaraUnused(atlas); NazaraUnused(userdata); diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp index d1e061b0b..70122458a 100644 --- a/src/Nazara/Utility/Font.cpp +++ b/src/Nazara/Utility/Font.cpp @@ -101,7 +101,7 @@ bool NzFont::ExtractGlyph(unsigned int characterSize, char32_t character, nzUInt return m_data->ExtractGlyph(characterSize, character, style, glyph); } -const NzAbstractFontAtlas* NzFont::GetAtlas() const +const NzAbstractAtlas* NzFont::GetAtlas() const { return m_atlas.get(); } @@ -265,7 +265,7 @@ bool NzFont::OpenFromStream(NzInputStream& stream, const NzFontParams& params) return NzFontLoader::LoadFromStream(this, stream, params); } -void NzFont::SetAtlas(std::shared_ptr atlas) +void NzFont::SetAtlas(std::shared_ptr atlas) { ClearGlyphCache(); @@ -314,7 +314,7 @@ nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const return (stylePart << 32) | sizePart; } -bool NzFont::OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) +bool NzFont::OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata) { NazaraUnused(atlas); NazaraUnused(userdata); @@ -335,7 +335,7 @@ bool NzFont::OnAtlasCleared(const NzAbstractFontAtlas* atlas, void* userdata) return true; } -void NzFont::OnAtlasReleased(const NzAbstractFontAtlas* atlas, void* userdata) +void NzFont::OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata) { NazaraUnused(atlas); NazaraUnused(userdata);