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

Utility/SimpleTextDrawer: Update SetColor method (will no longer force full regeneration)

Browse Source 
Former-commit-id: 3f3043ea5c5d3add1358d50eb3f92e452d931dbf
This commit is contained in:
Lynix
2016-01-08 14:00:54 +01:00
parent f9394e7af2
commit 4562243c5f
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@@ -11,7 +11,8 @@ namespace Nz
SimpleTextDrawer::SimpleTextDrawer() :
m_color(Color::White),
m_style(TextStyle_Regular),
m_glyphUpdated(false),
m_colorUpdated(true),
m_glyphUpdated(true),
m_characterSize(24)
{
SetFont(Font::GetDefault());
@@ -21,6 +22,7 @@ namespace Nz
m_color(drawer.m_color),
m_text(drawer.m_text),
m_style(drawer.m_style),
m_colorUpdated(false),
m_glyphUpdated(false),
m_characterSize(drawer.m_characterSize)
{
@@ -86,6 +88,8 @@ namespace Nz
{
if (!m_glyphUpdated)
UpdateGlyphs();
else if (!m_colorUpdated)
UpdateGlyphColor();
return m_glyphs[index];
}
@@ -119,7 +123,7 @@ namespace Nz
{
m_color = color;
m_glyphUpdated = false;
m_colorUpdated = false;
}
void SimpleTextDrawer::SetFont(Font* font)
@@ -158,6 +162,7 @@ namespace Nz
m_style = drawer.m_style;
m_text = drawer.m_text;
m_colorUpdated = false;
m_glyphUpdated = false;
SetFont(drawer.m_font);
@@ -169,6 +174,7 @@ namespace Nz
DisconnectFontSlots();
m_bounds = std::move(drawer.m_bounds);
m_colorUpdated = std::move(drawer.m_colorUpdated);
m_characterSize = std::move(drawer.m_characterSize);
m_color = std::move(drawer.m_color);
m_glyphs = std::move(drawer.m_glyphs);
@@ -209,6 +215,7 @@ namespace Nz
void SimpleTextDrawer::ClearGlyphs() const
{
m_bounds.MakeZero();
m_colorUpdated = true;
m_drawPos.Set(0, m_characterSize); //< Our draw "cursor"
m_glyphs.clear();
m_glyphUpdated = true;
@@ -387,6 +394,14 @@ namespace Nz
SetFont(nullptr);
}
void SimpleTextDrawer::UpdateGlyphColor() const
{
for (Glyph& glyph : m_glyphs)
glyph.color = m_color;
m_colorUpdated = true;
}
void SimpleTextDrawer::UpdateGlyphs() const
{
NazaraAssert(m_font && m_font->IsValid(), "Invalid font");