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

Oops, didn't have a clean tree

Browse Source
This commit is contained in:
Bart van Strien
2011-11-05 23:17:32 +01:00
parent d8666202cd
commit 49ec65dbf3
8 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+3 -6
View File
@@ -40,9 +40,9 @@ namespace opengl
{
Font::Font(love::font::Rasterizer * r, const Image::Filter& filter)
: height(r->getHeight()), lineHeight(1), mSpacing(1), filter(filter)
: rasterizer(r), height(r->getHeight()), lineHeight(1), mSpacing(1), filter(filter)
{
rasterizer = WeakReference::obtain(r);
r->retain();
love::font::GlyphData * gd = r->getGlyphData(32);
type = (gd->getFormat() == love::font::GlyphData::FORMAT_LUMINANCE_ALPHA ? FONT_TRUETYPE : FONT_IMAGE);
delete gd;
@@ -51,7 +51,6 @@ namespace opengl
Font::~Font()
{
rasterizer->destroy();
rasterizer->release();
unloadVolatile();
}
@@ -84,15 +83,13 @@ namespace opengl
Font::Glyph * Font::addGlyph(int glyph)
{
if (!rasterizer->isValid) return 0;
love::font::Rasterizer *r = (love::font::Rasterizer*) rasterizer->getData();
Glyph * g = new Glyph;
g->list = glGenLists(1);
if (g->list == 0) { // opengl failed to generate the list
delete g;
return NULL;
}
love::font::GlyphData *gd = r->getGlyphData(glyph);
love::font::GlyphData *gd = rasterizer->getGlyphData(glyph);
g->spacing = gd->getAdvance();
int w = gd->getWidth();
int h = gd->getHeight();
src/modules/graphics/opengl/Font.h
+1 -2
View File
@@ -28,7 +28,6 @@
// LOVE
#include <common/Object.h>
#include <common/WeakReference.h>
#include <font/Rasterizer.h>
#include <graphics/Image.h>
@@ -57,7 +56,7 @@ namespace opengl
int spacing;
};
WeakReference *rasterizer;
love::font::Rasterizer * rasterizer;
int height;
float lineHeight;