diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-26 22:59:37 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-26 22:59:37 +0200 |
commit | 400869ff86e88fdb12c892c7885c07ce2ae99e5e (patch) | |
tree | 4974075a6d57d0054284ca126f8a423ae48060e0 /src/graphics/engine | |
parent | f6638a173e21fbee3cc961d3dea82cc89382b873 (diff) | |
parent | 45fd8aad33029746424031e12777f2824bda245e (diff) | |
download | colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.tar.gz colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.tar.bz2 colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.zip |
Merge branch 'master' of git://github.com/colobot/colobot
Diffstat (limited to 'src/graphics/engine')
-rw-r--r-- | src/graphics/engine/engine.cpp | 16 | ||||
-rw-r--r-- | src/graphics/engine/text.cpp | 75 | ||||
-rw-r--r-- | src/graphics/engine/text.h | 7 |
3 files changed, 51 insertions, 47 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 37f9b00..c170922 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -3417,10 +3417,10 @@ void CEngine::DrawBackgroundGradient(const Color& up, const Color& down) VertexCol vertex[4] = { - VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0], color[2]), - VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0], color[2]) + VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0]), + VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0]) }; m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4); @@ -3567,10 +3567,10 @@ void CEngine::DrawOverColor() VertexCol vertex[4] = { - VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0], color[2]), - VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0], color[2]) + VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0]), + VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0]) }; m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4); diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp index 36ad660..00b6617 100644 --- a/src/graphics/engine/text.cpp +++ b/src/graphics/engine/text.cpp @@ -150,8 +150,8 @@ void CText::FlushCache() } void CText::DrawText(const std::string &text, const std::vector<FontMetaChar> &format, - float size, Math::Point pos, float width, TextAlign align, - int eol) + float size, Math::Point pos, float width, TextAlign align, + int eol) { float sw = 0.0f; @@ -172,8 +172,8 @@ void CText::DrawText(const std::string &text, const std::vector<FontMetaChar> &f } void CText::DrawText(const std::string &text, FontType font, - float size, Math::Point pos, float width, TextAlign align, - int eol) + float size, Math::Point pos, float width, TextAlign align, + int eol) { float sw = 0.0f; @@ -194,8 +194,8 @@ void CText::DrawText(const std::string &text, FontType font, } void CText::SizeText(const std::string &text, const std::vector<FontMetaChar> &format, - float size, Math::Point pos, TextAlign align, - Math::Point &start, Math::Point &end) + float size, Math::Point pos, TextAlign align, + Math::Point &start, Math::Point &end) { start = end = pos; @@ -217,8 +217,8 @@ void CText::SizeText(const std::string &text, const std::vector<FontMetaChar> &f } void CText::SizeText(const std::string &text, FontType font, - float size, Math::Point pos, TextAlign align, - Math::Point &start, Math::Point &end) + float size, Math::Point pos, TextAlign align, + Math::Point &start, Math::Point &end) { start = end = pos; @@ -277,7 +277,7 @@ float CText::GetHeight(FontType font, float size) float CText::GetStringWidth(const std::string &text, - const std::vector<FontMetaChar> &format, float size) + const std::vector<FontMetaChar> &format, float size) { assert(StrUtils::Utf8StringLength(text) == format.size()); @@ -344,7 +344,7 @@ float CText::GetCharWidth(UTF8Char ch, FontType font, float size, float offset) int CText::Justify(const std::string &text, const std::vector<FontMetaChar> &format, - float size, float width) + float size, float width) { assert(StrUtils::Utf8StringLength(text) == format.size()); @@ -427,7 +427,7 @@ int CText::Justify(const std::string &text, FontType font, float size, float wid } int CText::Detect(const std::string &text, const std::vector<FontMetaChar> &format, - float size, float offset) + float size, float offset) { assert(StrUtils::Utf8StringLength(text) == format.size()); @@ -500,7 +500,7 @@ int CText::Detect(const std::string &text, FontType font, float size, float offs } void CText::DrawString(const std::string &text, const std::vector<FontMetaChar> &format, - float size, Math::Point pos, float width, int eol) + float size, Math::Point pos, float width, int eol) { assert(StrUtils::Utf8StringLength(text) == format.size()); @@ -509,24 +509,18 @@ void CText::DrawString(const std::string &text, const std::vector<FontMetaChar> FontType font = FONT_COLOBOT; float start = pos.x; - unsigned int index = 0; unsigned int fmtIndex = 0; - while (index < text.length()) + + std::vector<UTF8Char> chars; + StringToUTFCharList(text, chars); + for (auto it = chars.begin(); it != chars.end(); ++it) { font = static_cast<FontType>(format[fmtIndex] & FONT_MASK_FONT); // TODO: if (font == FONT_BUTTON) if (font == FONT_BUTTON) continue; - UTF8Char ch; - - int len = StrUtils::Utf8CharSizeAt(text, index); - if (len >= 1) - ch.c1 = text[index]; - if (len >= 2) - ch.c2 = text[index+1]; - if (len >= 3) - ch.c3 = text[index+2]; + UTF8Char ch = *it; float offset = pos.x - start; float cw = GetCharWidth(ch, font, size, offset); @@ -545,22 +539,16 @@ void CText::DrawString(const std::string &text, const std::vector<FontMetaChar> DrawHighlight(hl, pos, charSize); } - DrawChar(ch, font, size, pos); + DrawCharAndAdjustPos(ch, font, size, pos); - index += len; fmtIndex++; } // TODO: eol } -void CText::DrawString(const std::string &text, FontType font, - float size, Math::Point pos, float width, int eol) +void CText::StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &chars) { - assert(font != FONT_BUTTON); - - m_engine->SetState(ENG_RSTATE_TEXT); - unsigned int index = 0; while (index < text.length()) { @@ -568,15 +556,30 @@ void CText::DrawString(const std::string &text, FontType font, int len = StrUtils::Utf8CharSizeAt(text, index); if (len >= 1) - ch.c1 = text[index]; + ch.c1 = text[index]; if (len >= 2) - ch.c2 = text[index+1]; + ch.c2 = text[index+1]; if (len >= 3) - ch.c3 = text[index+2]; + ch.c3 = text[index+2]; index += len; - DrawChar(ch, font, size, pos); + chars.push_back(ch); + } +} + +void CText::DrawString(const std::string &text, FontType font, + float size, Math::Point pos, float width, int eol) +{ + assert(font != FONT_BUTTON); + + m_engine->SetState(ENG_RSTATE_TEXT); + + std::vector<UTF8Char> chars; + StringToUTFCharList(text, chars); + for (auto it = chars.begin(); it != chars.end(); ++it) + { + DrawCharAndAdjustPos(*it, font, size, pos); } } @@ -660,7 +663,7 @@ void CText::DrawHighlight(FontHighlight hl, Math::Point pos, Math::Point size) m_device->SetRenderState(RENDER_STATE_TEXTURING, true); } -void CText::DrawChar(UTF8Char ch, FontType font, float size, Math::Point &pos) +void CText::DrawCharAndAdjustPos(UTF8Char ch, FontType font, float size, Math::Point &pos) { // TODO: if (font == FONT_BUTTON) if (font == FONT_BUTTON) return; diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h index e587609..bb9a32d 100644 --- a/src/graphics/engine/text.h +++ b/src/graphics/engine/text.h @@ -292,10 +292,11 @@ protected: void DrawString(const std::string &text, FontType font, float size, Math::Point pos, float width, int eol); void DrawHighlight(FontHighlight hl, Math::Point pos, Math::Point size); - void DrawChar(UTF8Char ch, FontType font, float size, Math::Point &pos); + void DrawCharAndAdjustPos(UTF8Char ch, FontType font, float size, Math::Point &pos); + void StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &chars); protected: - CInstanceManager* m_iMan; + CInstanceManager* m_iMan; CEngine* m_engine; CDevice* m_device; @@ -305,7 +306,7 @@ protected: std::map<FontType, MultisizeFont*> m_fonts; FontType m_lastFontType; - int m_lastFontSize; + int m_lastFontSize; CachedFont* m_lastCachedFont; }; |