Fix for broken text when the font is reloaded.

SFML · Jan 15, 2018 · 964d759 · 964d759
1 parent b6c1aca
commit 964d759
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp
@@ -393,6 +393,7 @@ class SFML_GRAPHICS_API Text : public Drawable, public Transformable
     mutable VertexArray m_outlineVertices;    ///< Vertex array containing the outline geometry
     mutable FloatRect   m_bounds;             ///< Bounding rectangle of the text (in local coordinates)
     mutable bool        m_geometryNeedUpdate; ///< Does the geometry need to be recomputed?
+    mutable Uint64      m_fontTextureId;      ///< The fonts texture id
 };
 
 } // namespace sf

diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp
@@ -35,10 +35,11 @@
 
 namespace sf
 {
-class Window;
+class InputStream;
 class RenderTarget;
 class RenderTexture;
-class InputStream;
+class Text;
+class Window;
 
 ////////////////////////////////////////////////////////////
 /// \brief Image living on the graphics card that can be used for drawing
@@ -584,6 +585,7 @@ class SFML_GRAPHICS_API Texture : GlResource
 
 private:
 
+    friend class Text;
     friend class RenderTexture;
     friend class RenderTarget;
 

diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp
@@ -346,10 +346,13 @@ void Text::draw(RenderTarget& target, RenderStates states) const
 ////////////////////////////////////////////////////////////
 void Text::ensureGeometryUpdate() const
 {
-    // Do nothing, if geometry has not changed
-    if (!m_geometryNeedUpdate)
+    // Do nothing, if geometry has not changed and the font texture has not changed
+    if (!m_geometryNeedUpdate && m_font->getTexture(m_characterSize).m_cacheId == m_fontTextureId)
         return;
 
+    // Save the current fonts texture id
+    m_fontTextureId = m_font->getTexture(m_characterSize).m_cacheId;
+
     // Mark geometry as updated
     m_geometryNeedUpdate = false;