Drop Id tags and copyright notices from files

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

diff --git a/source/font.h b/source/font.h
index a4600fc2558652950dc8088fa146086f592765bf..6ae5c6d3862426c9bbb74bfb7198fb3444fe3125 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -1,67 +1,110 @@
-#ifndef FONT_H_
-#define FONT_H_
+#ifndef MSP_GL_FONT_H_
+#define MSP_GL_FONT_H_
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/strings/utf8.h>
+#include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class PrimitiveBuilder;
 class Texture2D;
 
 class Font
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Font>
        {
        public:
                Loader(Font &);
-       private:
-               Font &font;
+               Loader(Font &, Collection &);
 
-               void texture(const std::string &);
+       private:
+               void init();
                void glyph(unsigned);
+               void texture();
+               void texture_ref(const std::string &);
        };
 
-       Font();
-       void  set_texture(const Texture2D &);
-       void  add_glyph(wchar_t, float, float, float, float, float, float, float, float);
-       float get_string_width(const std::string &) const;
-       void  draw_glyph(wchar_t);
-       void  draw_string(const std::string &) const;
-       void  draw_multiline(const std::string &) const;
-       ~Font();
 private:
        struct Glyph
        {
-               class Loader: public Msp::Parser::Loader
+               class Loader: public Msp::DataFile::ObjectLoader<Glyph>
                {
                public:
                        Loader(Glyph &);
-                       Glyph &get_object() { return glyph; }
                private:
-                       Glyph &glyph;
-
                        void texcoords(float, float, float, float);
-                       void size(float, float);
                };
 
-               wchar_t code;
+               unsigned code;
                float x1,y1;
                float x2,y2;
                float w,h;
-               float descent;
+               float off_x, off_y;
                float advance;
        };
-       typedef std::map<wchar_t, Glyph> GlyphMap;
 
-       const Texture2D *tex;
-       bool     own_tex;
+       typedef std::map<unsigned, Glyph> GlyphMap;
+
+       RefPtr<const Texture2D> texture;
+       float native_size;
+       float ascent;
+       float descent;
        GlyphMap glyphs;
 
-       void prepare(float *) const;
-       void draw_glyph(wchar_t, float *, float &) const;
+public:
+       Font();
+
+       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_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;
+
+       template<class C>
+       float get_string_width(const std::string &str) const
+       {
+               typename C::Decoder dec;
+               return get_string_width(str, dec);
+       }
+
+       float get_string_width(const std::string &str) const
+       { return get_string_width<Codecs::Utf8>(str); }
+
+       void draw_string(const std::string &, Codecs::Decoder &) const;
+       void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+
+       template<class C>
+       void draw_string(const std::string &str) const
+       {
+               typename C::Decoder dec;
+               draw_string(str, dec);
+       }
+
+       void draw_string(const std::string &str) const
+       { draw_string<Codecs::Utf8>(str); }
+
+       template<class C>
+       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+       {
+               typename C::Decoder dec;
+               draw_string(str, dec, pb);
+       }
+
+       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+       { return draw_string<Codecs::Utf8>(str, pb); }
+
+private:
+       void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
+       float get_glyph_advance(unsigned) const;
 };
 
 } // namespace GL