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 123373ea9df84f8b46ea296ce3542e60bbb48597..6ae5c6d3862426c9bbb74bfb7198fb3444fe3125 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -1,10 +1,3 @@
-/* $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_
 
@@ -28,10 +21,12 @@ 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:
@@ -55,21 +50,20 @@ private:
 
        typedef std::map<unsigned, Glyph> GlyphMap;
 
-       const Texture2D *tex;
-       bool own_tex;
-       float default_size;
+       RefPtr<const Texture2D> texture;
+       float native_size;
        float ascent;
        float descent;
        GlyphMap glyphs;
 
 public:
        Font();
-       ~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_default_size() const { return default_size; }
+       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; }
 
@@ -109,7 +103,7 @@ public:
        { return draw_string<Codecs::Utf8>(str, pb); }
 
 private:
-       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+       void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
        float get_glyph_advance(unsigned) const;
 };