Lots of comment updates

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

diff --git a/source/font.h b/source/font.h
index dd40ec0b277f2deb9e835e26b5fda9c1f9ddab96..14320b8fed58ff1b9d3fefe01c82c474c631f505 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_FONT_H_
 #define MSP_GL_FONT_H_
 
 #include <map>
 #include <string>
 #include <msp/datafile/objectloader.h>
-#include <msp/strings/utf8.h>
+#include <msp/stringcodec/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -28,25 +21,53 @@ public:
        public:
                Loader(Font &);
                Loader(Font &, Collection &);
+
        private:
                void init();
                void glyph(unsigned);
-               void texture_inline();
+               void texture();
+               void texture_ref(const std::string &);
        };
 
+private:
+       struct Glyph
+       {
+               class Loader: public Msp::DataFile::ObjectLoader<Glyph>
+               {
+               public:
+                       Loader(Glyph &);
+               private:
+                       void texcoords(float, float, float, float);
+               };
+
+               unsigned code;
+               float x1,y1;
+               float x2,y2;
+               float w,h;
+               float off_x, off_y;
+               float advance;
+       };
+
+       typedef std::map<unsigned, Glyph> GlyphMap;
+
+       RefPtr<const Texture2D> texture;
+       float native_size;
+       float ascent;
+       float descent;
+       GlyphMap glyphs;
+
+public:
        Font();
-       ~Font();
 
-       void  set_texture(const Texture2D &);
+       void set_texture(const Texture2D &);
        const Texture2D &get_texture() const;
-       void  add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
-       float get_default_size() const { return default_size; }
+       void add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
+       float get_native_size() const { return native_size; }
+       float get_default_size() const { return native_size; }  // Deprecated
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
-       float get_string_width(const std::string &, Codecs::Decoder &) const;
-       void  draw_glyph(unsigned);
-       void  draw_string(const std::string &, Codecs::Decoder &) const;
-       void  draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+
+       float get_string_width(const std::string &, StringCodec::Decoder &) const;
 
        template<class C>
        float get_string_width(const std::string &str) const
@@ -56,7 +77,10 @@ public:
        }
 
        float get_string_width(const std::string &str) const
-       { return get_string_width<Codecs::Utf8>(str); }
+       { return get_string_width<StringCodec::Utf8>(str); }
+
+       void draw_string(const std::string &, StringCodec::Decoder &) const;
+       void draw_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
 
        template<class C>
        void draw_string(const std::string &str) const
@@ -66,7 +90,7 @@ public:
        }
 
        void draw_string(const std::string &str) const
-       { draw_string<Codecs::Utf8>(str); }
+       { draw_string<StringCodec::Utf8>(str); }
 
        template<class C>
        void draw_string(const std::string &str, PrimitiveBuilder &pb) const
@@ -76,36 +100,10 @@ public:
        }
 
        void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-       { return draw_string<Codecs::Utf8>(str, pb); }
+       { return draw_string<StringCodec::Utf8>(str, pb); }
 
 private:
-       struct Glyph
-       {
-               class Loader: public Msp::DataFile::ObjectLoader<Glyph>
-               {
-               public:
-                       Loader(Glyph &);
-               private:
-                       void texcoords(float, float, float, float);
-               };
-
-               unsigned code;
-               float x1,y1;
-               float x2,y2;
-               float w,h;
-               float off_x, off_y;
-               float advance;
-       };
-       typedef std::map<unsigned, Glyph> GlyphMap;
-
-       const Texture2D *tex;
-       bool     own_tex;
-       float    default_size;
-       float    ascent;
-       float    descent;
-       GlyphMap glyphs;
-
-       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+       void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
        float get_glyph_advance(unsigned) const;
 };