Allow retrieving data from Mesh

[libs/gl.git] / source / font.cpp

diff --git a/source/font.cpp b/source/font.cpp
index 7cea86957dc16568c4119de3943a66e9c1c8e5d4..a19a94e5d13b22670e13c361689669b3d5b71db4 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -16,19 +16,12 @@ namespace GL {
 
 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;
@@ -148,13 +141,24 @@ float Font::get_glyph_advance(unsigned code) const
 
 
 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()
@@ -162,13 +166,13 @@ 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)