}
} // namespace
-Font::Font(GlyphWidth glyph_width_,
- const std::string& filename,
+Font::Font(GlyphWidth glyph_width_,
+ const std::string& filename,
const std::string& shadowfile,
int char_width, int char_height_,
int shadowsize_)
: glyph_width(glyph_width_),
- glyph_surface(0), shadow_glyph_surface(0),
- char_height(char_height_),
+ glyph_surface(0), shadow_glyph_surface(0),
+ char_height(char_height_),
shadowsize(shadowsize_)
{
glyph_surface = new Surface(filename);
{
float x = (i % 16) * char_width;
float y = (i / 16) * char_height;
-
+
Glyph glyph;
glyph.advance = char_width;
glyph.offset = Vector(0, 0);
left += 1;
int right = x + char_width - 1;
- while (right > left &&
+ while (right > left &&
vline_empty(surface, right, y, y + char_height, 64))
right -= 1;
else // glyph is completly transparent
glyph.rect = Rect(x, y, x + char_width, y + char_height);
- glyph.advance = glyph.rect.get_width();
+ glyph.advance = glyph.rect.get_width() + 1; // FIXME: might be usefull to make spacing configurable
glyphs.push_back(glyph);
shadow_glyphs.push_back(glyph);
}
-
+
SDL_UnlockSurface(surface);
SDL_FreeSurface(surface);
Font::get_text_height(const std::string& text) const
{
std::string::size_type text_height = char_height;
-
+
for(std::string::const_iterator it = text.begin(); it != text.end(); ++it)
{ // since UTF8 multibyte characters are decoded with values
// outside the ASCII range there is no risk of overlapping and
float
Font::get_height() const
{
- return char_height;
+ return char_height;
}
std::string
// calculate X positions based on the alignment type
Vector pos = Vector(x, y);
-
+
if(alignment == ALIGN_CENTER)
pos.x -= get_text_width(temp) / 2;
else if(alignment == ALIGN_RIGHT)
pos.x -= get_text_width(temp);
-
+
// Cast font position to integer to get a clean drawing result and
// no bluring as we would get with subpixel positions
pos.x = static_cast<int>(pos.x);
if (i == text.size())
break;
- y += char_height + 2;
+ y += char_height + 2;
last = i + 1;
}
}
Font::chr2glyph(uint32_t chr) const
{
int glyph_index = chr - first_char;
-
+
// we don't have the control chars 0x80-0xa0 in the font
if (chr >= 0x80) { // non-ascii character
glyph_index -= 32;
log_debug << "Unsupported utf-8 character found" << std::endl;
glyph_index = 0;
}
-
+
return glyph_index;
}
{
int font_index = chr2glyph(*it);
- if(*it == '\n')
- {
+ if(*it == '\n')
+ {
p.x = pos.x;
p.y += char_height + 2;
}
- else if(*it == ' ')
+ else if(*it == ' ')
{
p.x += glyphs[font_index].advance;
- }
- else
+ }
+ else
{
const Glyph& glyph = glyphs[font_index];
pchars->draw_part(glyph.rect.get_left(),