namespace GL {
Font::Font():
- tex(0),
- own_tex(false),
- default_size(1),
+ native_size(1),
ascent(1),
descent(0)
{ }
-Font::~Font()
-{
- if(own_tex)
- delete tex;
-}
-
void Font::set_texture(const Texture2D &t)
{
- if(own_tex)
- delete tex;
-
- tex = &t;
- own_tex = false;
+ texture = &t;
+ texture.keep();
}
const Texture2D &Font::get_texture() const
{
- if(!tex)
+ if(!texture)
throw InvalidState("No texture");
- return *tex;
+ return *texture;
}
void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
void Font::draw_string(const string &str, Codecs::Decoder &dec) const
{
- Immediate imm((TEXCOORD2, VERTEX2));
+ Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
draw_string(str, dec, imm);
}
void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
{
- if(!tex)
- throw InvalidState("No texture");
-
- Bind bind_tex(tex, true);
+ Bind bind_tex(get_texture(), true);
float x = 0;
unsigned count = 0;
void Font::Loader::init()
{
- add("default_size", &Font::default_size);
- add("ascent", &Font::ascent);
- add("descent", &Font::descent);
- add("texture", &Font::tex);
- add("texture_inline", &Loader::texture_inline);
- add("glyph", &Loader::glyph);
+ add("native_size", &Font::native_size);
+ add("ascent", &Font::ascent);
+ add("descent", &Font::descent);
+ add("texture", &Loader::texture);
+ add("texture", &Loader::texture_ref);
+ add("glyph", &Loader::glyph);
+
+ // Deprecated aliases
+ add("default_size", &Font::native_size);
+ add("texture_inline", &Loader::texture);
}
void Font::Loader::glyph(unsigned c)
obj.glyphs.insert(GlyphMap::value_type(c, gl));
}
-void Font::Loader::texture_inline()
+void Font::Loader::texture()
{
RefPtr<Texture2D> tex = new Texture2D;
load_sub(*tex);
- obj.tex = tex.release();
- obj.own_tex = true;
+ obj.texture = tex;
+}
+
+void Font::Loader::texture_ref(const string &name)
+{
+ obj.texture = get_collection().get<Texture2D>(name);
+ obj.texture.keep();
}