X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=a55933519b6c792a72bf967a7bdce2d7514afdf1;hb=fd1b14ee491dfd62881876afe007ac63301b422a;hp=278a14aa82ab53fd3cd2c57172f3dbbb3d33fe7a;hpb=48420e9e3f950cfe1e3ced8f8ea92d89671ae8c4;p=libs%2Fgl.git diff --git a/source/font.h b/source/font.h index 278a14aa..a5593351 100644 --- a/source/font.h +++ b/source/font.h @@ -1,5 +1,12 @@ -#ifndef FONT_H_ -#define FONT_H_ +/* $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 #include @@ -42,20 +49,20 @@ public: void draw_string(const std::string &) const; void draw_string(const std::string &, Codecs::Decoder &) const; void draw_multiline(const std::string &) const; - + template float get_string_width(const std::string &str) const { typename C::Decoder dec; return get_string_width(str, dec); - } - + } + template void draw_string(const std::string &str) const { typename C::Decoder dec; draw_string(str, dec); - } + } private: struct Glyph { @@ -68,8 +75,6 @@ private: Glyph &glyph; void texcoords(float, float, float, float); - void size(float, float); - void offset(float, float); }; unsigned code;