From e3682e2cdcb59c36792f6f9c39569e0af01088f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 May 2015 01:58:52 +0300 Subject: Dont set global color variables before drawing text. This allow not set actual OpenGL color on each call because it useless for drawing text. --- src/gui/fonts/font.cpp | 6 ++++-- src/gui/fonts/font.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gui/fonts') 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(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); -- cgit v1.2.3-70-g09d2