Improve compatibility check (I still can't believe robin was right)

This commit is contained in:
Bart van Strien
2011-11-05 22:07:15 +01:00
parent 9d63f08472
commit d8666202cd
8 changed files with 22 additions and 8 deletions
+6 -3
View File
@@ -40,9 +40,9 @@ namespace opengl
{
Font::Font(love::font::Rasterizer * r, const Image::Filter& filter)
: rasterizer(r), height(r->getHeight()), lineHeight(1), mSpacing(1), filter(filter)
: height(r->getHeight()), lineHeight(1), mSpacing(1), filter(filter)
{
r->retain();
rasterizer = WeakReference::obtain(r);
love::font::GlyphData * gd = r->getGlyphData(32);
type = (gd->getFormat() == love::font::GlyphData::FORMAT_LUMINANCE_ALPHA ? FONT_TRUETYPE : FONT_IMAGE);
delete gd;
@@ -51,6 +51,7 @@ namespace opengl
Font::~Font()
{
rasterizer->destroy();
rasterizer->release();
unloadVolatile();
}
@@ -83,13 +84,15 @@ 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 = rasterizer->getGlyphData(glyph);
love::font::GlyphData *gd = r->getGlyphData(glyph);
g->spacing = gd->getAdvance();
int w = gd->getWidth();
int h = gd->getHeight();
+2 -1
View File
@@ -28,6 +28,7 @@
// LOVE
#include <common/Object.h>
#include <common/WeakReference.h>
#include <font/Rasterizer.h>
#include <graphics/Image.h>
@@ -56,7 +57,7 @@ namespace opengl
int spacing;
};
love::font::Rasterizer * rasterizer;
WeakReference *rasterizer;
int height;
float lineHeight;