Windows compatibility:

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

diff --git a/source/font.cpp b/source/font.cpp
index a19a94e5d13b22670e13c361689669b3d5b71db4..637569f205358a8a08edf846fbac8c55a480e7e1 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -5,7 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <GL/gl.h>
+#include "gl.h"
 #include "font.h"
 #include "texture2d.h"
 
@@ -47,16 +47,6 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
        create_glyph_vertices(glyph, *va_builder);
 }
 
-float Font::get_string_width(const string &str) const
-{
-       float x=0;
-
-       for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
-               x+=get_glyph_advance(static_cast<unsigned char>(*i));
-
-       return x;
-}
-
 float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 {
        float x=0;
@@ -67,16 +57,6 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
        return x;
 }
 
-void Font::draw_string(const string &str) const
-{
-       prepare_render();
-
-       for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
-               draw_glyph(static_cast<unsigned char>(*i));
-
-       glPopMatrix();
-}
-
 void Font::draw_string(const string &str, Codecs::Decoder &dec) const
 {
        prepare_render();
@@ -125,6 +105,9 @@ void Font::draw_glyph(unsigned code) const
        if(i==glyphs.end())
                return;
 
+       const Glyph &glyph=i->second;
+       (void)glyph;
+
        glDrawArrays(GL_QUADS, i->second.index*4, 4);
 
        glTranslatef(i->second.advance, 0, 0);