Drop Id tags and copyright notices from files

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

diff --git a/source/font.cpp b/source/font.cpp
index 44e3d241154b0e4acd8ccdd8e747091ea776f9ef..323152dc74b220c6730e024cef11f9ce59637f50 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
+#include "bindable.h"
 #include "gl.h"
 #include "font.h"
 #include "immediate.h"
@@ -18,33 +12,22 @@ namespace Msp {
 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)
@@ -75,44 +58,38 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 
 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
+void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
 {
-       if(!tex)
-               throw InvalidState("No texture");
+       MatrixStack::Push push_mtx(bld.matrix());
+       Bind bind_tex(get_texture(), true);
 
-       tex->bind();
-
-       float x = 0;
-       unsigned count = 0;
-
-       pbuilder.begin(QUADS);
+       bld.begin(QUADS);
        for(string::const_iterator i=str.begin(); i!=str.end();)
        {
                GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
                if(j==glyphs.end())
                        continue;
 
-               create_glyph_vertices(j->second, pbuilder, x);
-               x += j->second.advance;
-               count += 4;
+               create_glyph_vertices(j->second, bld);
+               bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
        }
-       pbuilder.end();
+       bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
 {
-       vbuilder.texcoord(glyph.x1, glyph.y1);
-       vbuilder.vertex(x+glyph.off_x, glyph.off_y);
-       vbuilder.texcoord(glyph.x2, glyph.y1);
-       vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y);
-       vbuilder.texcoord(glyph.x2, glyph.y2);
-       vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-       vbuilder.texcoord(glyph.x1, glyph.y2);
-       vbuilder.vertex(x+glyph.off_x, glyph.off_y+glyph.h);
+       bld.texcoord(glyph.x1, glyph.y1);
+       bld.vertex(glyph.off_x, glyph.off_y);
+       bld.texcoord(glyph.x2, glyph.y1);
+       bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
+       bld.texcoord(glyph.x2, glyph.y2);
+       bld.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
+       bld.texcoord(glyph.x1, glyph.y2);
+       bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
 }
 
 float Font::get_glyph_advance(unsigned code) const
@@ -139,12 +116,16 @@ Font::Loader::Loader(Font &f, Collection &c):
 
 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)
@@ -155,12 +136,17 @@ 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();
 }