pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Font: moving text size from font to Text object.

Browse source
This commit is contained in:
Henrik Hautakoski 2016-05-05 11:04:54 +02:00
parent c74dda1200
commit b2dbee33fb
5 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/text/Game.cpp
View file

@ -25,9 +25,9 @@ void TextExample::init()
g->setClearColor(52.0f / 255.0f, 58.0f / 255.0f, 80.0f / 255.0f); g->setClearColor(52.0f / 255.0f, 58.0f / 255.0f, 80.0f / 255.0f);
smallFont.loadFromFile("assets/fonts/RobotoCondensed-Regular.ttf", 14); smallFont.loadFromFile("assets/fonts/RobotoCondensed-Regular.ttf");
myFont.loadFromFile("assets/fonts/RobotoCondensed-Regular.ttf", 20); myFont.loadFromFile("assets/fonts/RobotoCondensed-Regular.ttf");
fntLarge.loadFromFile("assets/fonts/OPTIBelwe-Medium.otf", 48); fntLarge.loadFromFile("assets/fonts/OPTIBelwe-Medium.otf");
myText.setFont(myFont); myText.setFont(myFont);
myText.setColor(Color::Green); myText.setColor(Color::Green);

6
include/Spectre/Graphics/Font.h
View file

@ -35,9 +35,9 @@ public :
Font(); Font();
~Font(); ~Font();
bool loadFromFile(const std::string& filename, unsigned int size = 22); bool loadFromFile(const std::string& filename);
bool loadFromMemory(const void *data, unsigned int size); bool loadFromMemory(const void *data);
Glyph getGlyph(unsigned int code) const; Glyph getGlyph(unsigned int code) const;
@ -67,8 +67,6 @@ protected :
mutable std::map<unsigned char, Glyph> m_charset; mutable std::map<unsigned char, Glyph> m_charset;
unsigned int m_size; // font size, in pixels. not points.
// Alpha Cache texture. // Alpha Cache texture.
mutable CacheTexture m_cacheTextureA; mutable CacheTexture m_cacheTextureA;

8
include/Spectre/Graphics/Text.h
View file

@ -30,11 +30,14 @@ public :
Text(); Text();
Text(const std::string text, const Font& font); Text(const std::string text, unsigned int size, const Font& font);
void setString(const std::string& string); void setString(const std::string& string);
const std::string& getString() const; const std::string& getString() const;
void setCharacterSize(unsigned int size);
unsigned int getCharacteSize() const;
void setFont(const Font& font); void setFont(const Font& font);
const Font* getFont() const; const Font* getFont() const;
@ -66,6 +69,9 @@ private :
// String containing the text. // String containing the text.
std::string m_string; std::string m_string;
// Character size (in pixels, not points).
unsigned int m_size;
const Font* m_font; const Font* m_font;
Color m_color; Color m_color;

8
source/Graphics/Font.cpp
View file

@ -8,7 +8,6 @@
#include "Font/FreeTypeDriver.h" #include "Font/FreeTypeDriver.h"
Font::Font() : Font::Font() :
m_size (22),
m_driver (new FreeTypeDriver()) m_driver (new FreeTypeDriver())
{ {
} }
@ -18,17 +17,16 @@ Font::~Font()
delete m_driver; delete m_driver;
} }
bool Font::loadFromFile(const std::string& filename, unsigned int size) bool Font::loadFromFile(const std::string& filename)
{ {
if (!m_driver->loadFromFile(filename)) { if (!m_driver->loadFromFile(filename)) {
return false; return false;
} }
if (!m_driver->setCharacterSize(size)) { if (!m_driver->setCharacterSize(22)) {
return false; return false;
} }
m_size = size;
m_cacheTextureA.shelf = 0; m_cacheTextureA.shelf = 0;
m_cacheTextureA.texpos = vec2u(0, 0); m_cacheTextureA.texpos = vec2u(0, 0);
@ -37,7 +35,7 @@ bool Font::loadFromFile(const std::string& filename, unsigned int size)
return true; return true;
} }
bool Font::loadFromMemory(const void *data, unsigned int size) bool Font::loadFromMemory(const void *data)
{ {
return false; return false;
} }

19
source/Graphics/Text.cpp
View file

@ -4,16 +4,18 @@
Text::Text() : Text::Text() :
m_font (NULL), m_font (NULL),
m_size (22),
m_color (255, 255, 255, 255), m_color (255, 255, 255, 255),
m_outlineColor (0, 0, 0, 255), m_outlineColor (0, 0, 0, 255),
m_outlineWidth (0) m_outlineWidth (0)
{ {
} }
Text::Text(const std::string text, const Font& font) : Text::Text(const std::string text, unsigned int size, const Font& font) :
m_font (&font), m_font (&font),
m_size (size),
m_string (text), m_string (text),
m_color (255, 255, 255, 255), m_color (255, 255, 255, 255),
m_outlineColor (0, 0, 0, 255), m_outlineColor (0, 0, 0, 255),
m_outlineWidth (0), m_outlineWidth (0),
m_geometryNeedsUpdate (true) m_geometryNeedsUpdate (true)
@ -31,6 +33,17 @@ const std::string& Text::getString() const
return m_string; return m_string;
} }
void Text::setCharacterSize(unsigned int size)
{
m_size = size;
m_geometryNeedsUpdate = true;
}
unsigned int Text::getCharacteSize() const
{
return m_size;
}
void Text::setFont(const Font& font) void Text::setFont(const Font& font)
{ {
m_font = &font; m_font = &font;