Style update: add spaces around assignment operators

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

diff --git a/source/font.cpp b/source/font.cpp
index 766f011a97dc55708b3fb11da395342facfb6a92..44e3d241154b0e4acd8ccdd8e747091ea776f9ef 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/datafile/collection.h>
 #include "gl.h"
 #include "font.h"
 #include "immediate.h"
@@ -18,14 +19,25 @@ namespace GL {
 
 Font::Font():
        tex(0),
+       own_tex(false),
        default_size(1),
        ascent(1),
        descent(0)
 { }
 
+Font::~Font()
+{
+       if(own_tex)
+               delete tex;
+}
+
 void Font::set_texture(const Texture2D &t)
 {
-       tex=&t;
+       if(own_tex)
+               delete tex;
+
+       tex = &t;
+       own_tex = false;
 }
 
 const Texture2D &Font::get_texture() const
@@ -38,25 +50,25 @@ const Texture2D &Font::get_texture() const
 void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
 {
        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;
+       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));
 }
 
 float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 {
-       float x=0;
+       float x = 0;
 
        for(string::const_iterator i=str.begin(); i!=str.end();)
-               x+=get_glyph_advance(dec.decode_char(str, i));
+               x += get_glyph_advance(dec.decode_char(str, i));
 
        return x;
 }
@@ -74,19 +86,19 @@ void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder
 
        tex->bind();
 
-       float x=0;
-       unsigned count=0;
+       float x = 0;
+       unsigned count = 0;
 
        pbuilder.begin(QUADS);
        for(string::const_iterator i=str.begin(); i!=str.end();)
        {
-               GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i));
+               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;
+               x += j->second.advance;
+               count += 4;
        }
        pbuilder.end();
 }
@@ -105,7 +117,7 @@ void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, fl
 
 float Font::get_glyph_advance(unsigned code) const
 {
-       GlyphMap::const_iterator i=glyphs.find(code);
+       GlyphMap::const_iterator i = glyphs.find(code);
        if(i==glyphs.end())
                return 0;
 
@@ -114,46 +126,46 @@ float Font::get_glyph_advance(unsigned code) const
 
 
 Font::Loader::Loader(Font &f):
-       font(f),
-       coll(0)
+       DataFile::CollectionObjectLoader<Font>(f, 0)
 {
        init();
 }
 
 Font::Loader::Loader(Font &f, Collection &c):
-       font(f),
-       coll(&c)
+       DataFile::CollectionObjectLoader<Font>(f, &c)
 {
        init();
 }
 
-DataFile::Collection &Font::Loader::get_collection()
-{
-       if(!coll)
-               throw InvalidState("No collection");
-       return *coll;
-}
-
 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);
 }
 
 void Font::Loader::glyph(unsigned c)
 {
        Glyph gl;
-       gl.code=c;
+       gl.code = c;
        load_sub(gl);
-       font.glyphs.insert(GlyphMap::value_type(c, gl));
+       obj.glyphs.insert(GlyphMap::value_type(c, gl));
+}
+
+void Font::Loader::texture_inline()
+{
+       RefPtr<Texture2D> tex = new Texture2D;
+       load_sub(*tex);
+       obj.tex = tex.release();
+       obj.own_tex = true;
 }
 
 
 Font::Glyph::Loader::Loader(Glyph &g):
-       glyph(g)
+       DataFile::ObjectLoader<Glyph>(g)
 {
        add("texcoords", &Loader::texcoords);
        add("size",      &Glyph::w,     &Glyph::h);
@@ -163,10 +175,10 @@ Font::Glyph::Loader::Loader(Glyph &g):
 
 void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
 {
-       glyph.x1=x1;
-       glyph.y1=y1;
-       glyph.x2=x2;
-       glyph.y2=y2;
+       obj.x1 = x1;
+       obj.y1 = y1;
+       obj.x2 = x2;
+       obj.y2 = y2;
 }
 
 } // namespace GL