LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move most graphics Font code out of the opengl subfolder.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-12-30 14:19:07 -04:00
parent 1383248876
commit c7419e0e37
17 changed files with 1284 additions and 1192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Text.h
+5 -5
View File
@@ -24,7 +24,7 @@
// LOVE
#include "common/config.h"
#include "graphics/Drawable.h"
#include "Font.h"
#include "graphics/Font.h"
#include "GLBuffer.h"
namespace love
@@ -40,7 +40,7 @@ public:
static love::Type type;
Text(Font *font, const std::vector<Font::ColoredString> &text = {});
Text(love::graphics::Font *font, const std::vector<Font::ColoredString> &text = {});
virtual ~Text();
void set(const std::vector<Font::ColoredString> &text);
@@ -54,8 +54,8 @@ public:
// Implements Drawable.
void draw(Graphics *gfx, const Matrix4 &m) override;
void setFont(Font *f);
Font *getFont() const;
void setFont(love::graphics::Font *f);
love::graphics::Font *getFont() const;
/**
* Gets the width of the currently set text.
@@ -84,7 +84,7 @@ private:
void regenerateVertices();
void addTextData(const TextData &s);
StrongRef<Font> font;
StrongRef<love::graphics::Font> font;
GLBuffer *vbo;
QuadIndices quadIndices;