pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Font: move Glyph to it's own header.

Browse source
This commit is contained in:
Henrik Hautakoski 2020-01-05 23:40:25 +01:00
parent 5c4eea4ae1
commit 2dd1187ff2
No known key found for this signature in database
GPG key ID: 96765B12FEAC4745
7 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/Graphics/Font/Engine/FontEngine.h
View file

@ -4,6 +4,7 @@
#include <string>
#include <Spectre/Graphics/Image.h>
#include <Spectre/Graphics/Font/Glyph.h>
#include <Spectre/Graphics/Font.h>
namespace sp {
@ -20,7 +21,7 @@ public :
virtual bool loadFromFile(const std::string& filename) = 0;
virtual Font::Glyph loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize = 0) = 0;
virtual Glyph loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize = 0) = 0;
virtual std::string getName() = 0;

4
source/Graphics/Font/Engine/FreeTypeEngine.cpp
View file

@ -103,9 +103,9 @@ bool FreeTypeEngine::loadFromFile(const std::string& filename)
return true;
}
Font::Glyph FreeTypeEngine::loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize)
Glyph FreeTypeEngine::loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize)
{
Font::Glyph glyph;
Glyph glyph;
FT_Glyph glyph_info;
FT_Int32 flags = FT_LOAD_TARGET_NORMAL;

2
source/Graphics/Font/Engine/FreeTypeEngine.h
View file

@ -20,7 +20,7 @@ public:
virtual bool loadFromFile(const std::string& filename);
virtual Font::Glyph loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize = 0);
virtual Glyph loadGlyph(unsigned int codepoint, Image& img, unsigned int outlineSize = 0);
virtual std::string getName();