+/* $Id$
+
+This file is part of libmspgl
+Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
#include <GL/gl.h>
#include "font.h"
#include "texture2d.h"
Font::Font():
tex(0),
- own_tex(false),
default_size(1),
ascent(1),
descent(0),
varray((TEXCOORD2, VERTEX2))
{ }
-Font::~Font()
-{
- if(own_tex)
- delete tex;
-}
-
void Font::set_texture(const Texture2D &t)
{
tex=&t;
Font::Loader::Loader(Font &f):
- font(f)
+ font(f),
+ coll(0)
{
- add("default_size", &Font::default_size);
- add("ascent", &Font::ascent);
- add("descent", &Font::descent);
- add("texture", &Loader::texture);
- add("glyph", &Loader::glyph);
+ init();
+}
+
+Font::Loader::Loader(Font &f, Collection &c):
+ font(f),
+ coll(&c)
+{
+ init();
+}
+
+DataFile::Collection &Font::Loader::get_collection()
+{
+ if(!coll)
+ throw InvalidState("No collection");
+ return *coll;
}
Font::Loader::~Loader()
font.create_glyph_vertices();
}
-void Font::Loader::texture(const string &t)
+void Font::Loader::init()
{
- Texture2D *tex=new Texture2D;
- tex->parameter(GL_GENERATE_MIPMAP, 1);
- font.tex=tex;
- tex->image(t);
- font.own_tex=true;
+ add("default_size", &Font::default_size);
+ add("ascent", &Font::ascent);
+ add("descent", &Font::descent);
+ add("texture", &Font::tex);
+ add("glyph", &Loader::glyph);
}
void Font::Loader::glyph(unsigned c)