diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-11 17:17:04 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-11 17:17:04 +0200 |
commit | 7f80ca297154809523cd533edf1842ab1ae391aa (patch) | |
tree | 08eb658d2dad62ac683e55dc89cc97bc898fd95c /src/graphics/engine/text.h | |
parent | 63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34 (diff) | |
download | colobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.gz colobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.bz2 colobot-7f80ca297154809523cd533edf1842ab1ae391aa.zip |
Render mode setting, refactoring
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
Diffstat (limited to 'src/graphics/engine/text.h')
-rw-r--r-- | src/graphics/engine/text.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h index 6209c39..7e2f84b 100644 --- a/src/graphics/engine/text.h +++ b/src/graphics/engine/text.h @@ -20,7 +20,6 @@ #pragma once #include "math/point.h" -#include "math/size.h" #include <vector> #include <map> @@ -168,8 +167,8 @@ struct UTF8Char struct CharTexture { unsigned int id; - Math::Size texSize; - Math::Size charSize; + Math::Point texSize; + Math::Point charSize; CharTexture() : id(0) {} }; @@ -277,7 +276,7 @@ protected: float size, Math::Point pos, float width, int eol); void DrawString(const std::string &text, Gfx::FontType font, float size, Math::Point pos, float width, int eol); - void DrawHighlight(Gfx::FontHighlight hl, Math::Point pos, Math::Size size); + void DrawHighlight(Gfx::FontHighlight hl, Math::Point pos, Math::Point size); void DrawChar(Gfx::UTF8Char ch, Gfx::FontType font, float size, Math::Point &pos); protected: |