From c741bad9a1b5f4d6307bba120fff19c8b14971a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 4 Mar 2022 20:41:14 +0100 Subject: [PATCH] Utility/Font: Remove useless atlas release slot --- include/Nazara/Utility/Font.hpp | 2 -- src/Nazara/Utility/Font.cpp | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index 144a803a2..81c712392 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -130,7 +130,6 @@ namespace Nz UInt64 ComputeKey(unsigned int characterSize, TextStyleFlags style, float outlineThickness) const; void OnAtlasCleared(const AbstractAtlas* atlas); void OnAtlasLayerChange(const AbstractAtlas* atlas, AbstractImage* oldLayer, AbstractImage* newLayer); - void OnAtlasRelease(const AbstractAtlas* atlas); const Glyph& PrecacheGlyph(GlyphMap& glyphMap, unsigned int characterSize, TextStyleFlags style, float outlineThickness, char32_t character) const; static bool Initialize(); @@ -138,7 +137,6 @@ namespace Nz NazaraSlot(AbstractAtlas, OnAtlasCleared, m_atlasClearedSlot); NazaraSlot(AbstractAtlas, OnAtlasLayerChange, m_atlasLayerChangeSlot); - NazaraSlot(AbstractAtlas, OnAtlasRelease, m_atlasReleaseSlot); std::shared_ptr m_atlas; std::unique_ptr m_data; diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp index 2a7433159..73c69e8ac 100644 --- a/src/Nazara/Utility/Font.cpp +++ b/src/Nazara/Utility/Font.cpp @@ -285,13 +285,11 @@ namespace Nz { m_atlasClearedSlot.Connect(m_atlas->OnAtlasCleared, this, &Font::OnAtlasCleared); m_atlasLayerChangeSlot.Connect(m_atlas->OnAtlasLayerChange, this, &Font::OnAtlasLayerChange); - m_atlasReleaseSlot.Connect(m_atlas->OnAtlasRelease, this, &Font::OnAtlasRelease); } else { m_atlasClearedSlot.Disconnect(); m_atlasLayerChangeSlot.Disconnect(); - m_atlasReleaseSlot.Disconnect(); } OnFontAtlasChanged(this); @@ -445,23 +443,6 @@ namespace Nz OnFontAtlasLayerChanged(this, oldLayer, newLayer); } - void Font::OnAtlasRelease(const AbstractAtlas* atlas) - { - NazaraUnused(atlas); - - #ifdef NAZARA_DEBUG - // Est-ce qu'il s'agit bien de notre atlas ? - if (m_atlas.get() != atlas) - { - NazaraInternalError("Notified by a non-listening-to resource"); - return; - } - #endif - - // Nous ne pouvons pas faire grand chose d'autre que de balancer une erreur à la tête de l'utilisateur avant un potentiel crash... - NazaraError("Atlas has been released while in use"); - } - const Font::Glyph& Font::PrecacheGlyph(GlyphMap& glyphMap, unsigned int characterSize, TextStyleFlags style, float outlineThickness, char32_t character) const { auto it = glyphMap.find(character);