Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 11:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Basic changes to support multiple charsets in the future

Browse Source
This commit is contained in:
Eduardo Bart
2012-08-17 19:44:57 -03:00
parent affe641a1f
commit fdea7f3d66
23 changed files with 29 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/framework/core/application.cpp
View File

@@ -53,6 +53,7 @@ Application::Application()
m_appName = "application";
m_appCompactName = "app";
m_appVersion = "none";
m_charset = "cp1252";
m_stopping = false;
}

2
src/framework/core/application.h
View File

@@ -52,6 +52,7 @@ public:
const std::string& getCompactName() { return m_appCompactName; }
const std::string& getVersion() { return m_appVersion; }
std::string getCharset() { return m_charset; }
std::string getBuildCompiler() { return BUILD_COMPILER; }
std::string getBuildDate();
std::string getBuildRevision() { return BUILD_REVISION; }
@@ -64,6 +65,7 @@ public:
protected:
void registerLuaFunctions();
std::string m_charset;
std::string m_appName;
std::string m_appCompactName;
std::string m_appVersion;

14
src/framework/graphics/bitmapfont.cpp
View File

@@ -36,6 +36,7 @@ void BitmapFont::load(const OTMLNodePtr& fontNode)
m_yOffset = fontNode->valueAt("y-offset", 0);
m_firstGlyph = fontNode->valueAt("first-glyph", 32);
m_glyphSpacing = fontNode->valueAt("spacing", Size(0,0));
int spaceWidth = fontNode->valueAt("space-width", glyphSize.width());
// load font texture
m_texture = g_textures.getTexture(textureFile);
@@ -47,14 +48,21 @@ void BitmapFont::load(const OTMLNodePtr& fontNode)
calculateGlyphsWidthsAutomatically(Image::load(textureFile), glyphSize);
}
// 32 and 160 are spaces ( )
m_glyphsSize[32].setWidth(spaceWidth);
m_glyphsSize[160].setWidth(spaceWidth);
// new line actually has a size that will be useful in multiline algorithm
m_glyphsSize[(uchar)'\n'] = Size(1, m_glyphHeight);
// read custom widths
/*
if(OTMLNodePtr node = fontNode->get("glyph-widths")) {
for(const OTMLNodePtr& child : node->children())
m_glyphsSize[stdext::safe_cast<int>(child->tag())].setWidth(child->value<int>());
}
*/
// calculate glyphs texture coords
int numHorizontalGlyphs = m_texture->getSize().width() / glyphSize.width();
@@ -268,12 +276,8 @@ void BitmapFont::calculateGlyphsWidthsAutomatically(const ImagePtr& image, const
if(texturePixels[(y * image->getSize().width() * 4) + (x*4) + 3] != 0)
filledPixels++;
}
if(filledPixels > 0) {
if(filledPixels > 0)
width = x - glyphCoords.left() + 1;
width += m_glyphSpacing.width();
if(m_glyphHeight >= 16 && filledPixels >= m_glyphHeight/3)
width += 1;
}
}
// store glyph size
m_glyphsSize[glyph].resize(width, m_glyphHeight);