Use libmspmath to provide vector and matrix operations

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

diff --git a/source/font.cpp b/source/font.cpp
index 323152dc74b220c6730e024cef11f9ce59637f50..abfe631ef82dae0336bfb49f631023197c7d1b26 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
 #include "bindable.h"
 #include "gl.h"
@@ -17,6 +18,10 @@ Font::Font():
        descent(0)
 { }
 
+// Avoid synthesizing ~RefPtr in files including font.h
+Font::~Font()
+{ }
+
 void Font::set_texture(const Texture2D &t)
 {
        texture = &t;
@@ -26,27 +31,16 @@ void Font::set_texture(const Texture2D &t)
 const Texture2D &Font::get_texture() const
 {
        if(!texture)
-               throw InvalidState("No texture");
+               throw logic_error("No texture");
        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::add_glyph(const Glyph &g)
 {
-       Glyph glyph;
-       glyph.code = code;
-       glyph.x1 = x1;
-       glyph.y1 = y1;
-       glyph.x2 = x2;
-       glyph.y2 = y2;
-       glyph.w = w;
-       glyph.h = h;
-       glyph.off_x = ox;
-       glyph.off_y = oy;
-       glyph.advance = adv;
-       glyphs.insert(GlyphMap::value_type(code, glyph));
+       insert_unique(glyphs, g.code, g);
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
        float x = 0;
 
@@ -56,16 +50,17 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
        return x;
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
+       Bind bind_tex(get_texture(), true);
        Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
-       draw_string(str, dec, imm);
+       imm.color(color);
+       build_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
+void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
        MatrixStack::Push push_mtx(bld.matrix());
-       Bind bind_tex(get_texture(), true);
 
        bld.begin(QUADS);
        for(string::const_iterator i=str.begin(); i!=str.end();)
@@ -122,10 +117,6 @@ void Font::Loader::init()
        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)
@@ -145,7 +136,7 @@ void Font::Loader::texture()
 
 void Font::Loader::texture_ref(const string &name)
 {
-       obj.texture = get_collection().get<Texture2D>(name);
+       obj.texture = &get_collection().get<Texture2D>(name);
        obj.texture.keep();
 }