diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-25 01:58:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-25 01:58:52 +0300 |
commit | e3682e2cdcb59c36792f6f9c39569e0af01088f0 (patch) | |
tree | b4d7a665652e4a8c00f28d557f96b120abc62002 /src/gui/fonts | |
parent | 1b3a9751ae558e45c614f04525d5ff65e3c0fc1e (diff) | |
download | manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.gz manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.bz2 manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.xz manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.zip |
Dont set global color variables before drawing text.
This allow not set actual OpenGL color on each call
because it useless for drawing text.
Diffstat (limited to 'src/gui/fonts')
-rw-r--r-- | src/gui/fonts/font.cpp | 6 | ||||
-rw-r--r-- | src/gui/fonts/font.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index 31ca8552a..2e894a380 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -202,6 +202,8 @@ void Font::clear() } void Font::drawString(Graphics *const graphics, + Color col, + const Color &col2, const std::string &text, const int x, const int y) { @@ -212,8 +214,8 @@ void Font::drawString(Graphics *const graphics, return; } - Color col = graphics->getColor(); - const Color &col2 = graphics->getColor2(); +// Color col = graphics->getColor(); +// const Color &col2 = graphics->getColor2(); const float alpha = static_cast<float>(col.a) / 255.0F; /* The alpha value is ignored at string generation so avoid caching the diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h index a112673a1..3da6d9c7d 100644 --- a/src/gui/fonts/font.h +++ b/src/gui/fonts/font.h @@ -107,6 +107,8 @@ class Font final * @see Font::drawString */ void drawString(Graphics *const graphics, + Color col, + const Color &col2, const std::string &text, const int x, const int y); |