Added maxwidth, lines = font:getWrap(string, wrap) by feature request

This commit is contained in:
bart@bartbes.ath.cx
2010-06-12 15:35:54 +02:00
parent bb2f58c25c
commit 0188572124
4 changed files with 81 additions and 22 deletions
+46 -11
View File
@@ -1,14 +1,14 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
@@ -29,7 +29,7 @@ namespace graphics
{
namespace opengl
{
Font::Font(love::font::FontData * data)
: height(data->getHeight()), lineHeight(1.25), mSpacing(1)
{
@@ -54,16 +54,16 @@ namespace opengl
{
return height / lineHeight;
}
void Font::print(std::string text, float x, float y) const
{
print(text, x, y, 0.0f, 1.0f, 1.0f);
}
void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const
{
glPushMatrix();
glTranslatef(ceil(x), ceil(y), 0.0f);
glRotatef(LOVE_TODEG(angle), 0, 0, 1.0f);
glScalef(sx, sy, 1.0f);
@@ -77,13 +77,13 @@ namespace opengl
}
glPopMatrix();
}
void Font::print(char character, float x, float y) const
{
if (!glyphs[character]) character = ' ';
glyphs[character]->draw(x, y+height, 0, 1, 1, 0, 0);
}
int Font::getWidth(const std::string & line) const
{
if(line.size() == 0) return 0;
@@ -93,7 +93,7 @@ namespace opengl
{
temp += (spacing[(int)line[i]] * mSpacing);
}
return temp;
}
@@ -101,12 +101,47 @@ namespace opengl
{
return this->getWidth(std::string(line));
}
int Font::getWidth(const char character) const
{
return spacing[(int)character];
}
int Font::getWrap(const std::string & line, float wrap, int * lines) const
{
if(line.size() == 0) return 0;
int maxw = 0;
int linen = 1;
int temp = 0;
std::string text;
for(unsigned int i = 0; i < line.size(); i++)
{
if(temp > wrap && text.find(" ") != std::string::npos)
{
unsigned int space = text.find_last_of(' ');
std::string tmp = text.substr(0, space);
int w = getWidth(tmp);
if(w > maxw) maxw = w;
text = text.substr(space+1);
temp = getWidth(text);
linen++;
}
temp += (spacing[(int)line[i]] * mSpacing);
text += line[i];
}
if(temp > maxw) maxw = temp;
if(lines) *lines = linen;
return maxw;
}
int Font::getWrap(const char * line, float wrap, int * lines) const
{
return getWrap(std::string(line), wrap, lines);
}
void Font::setLineHeight(float height)
{
this->lineHeight = height;