X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=2dff8328e9116f3ef06c8bd792279ef1c07d082c;hb=191f167c1b44679707028d96aae8a2d67fecce30;hp=4bdfa88e165a0913bcdf92da8b3f66a1c567f8ec;hpb=aa4643b483379e0f1e40b8abc6584363cf395216;p=freeglut

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index 4bdfa88..2dff832 100644
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -112,7 +112,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
     /*
      * Find the character we want to draw (???)
      */
-    face = font->Characters[ character - 1 ];
+    face = font->Characters[ character ];
 
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
@@ -135,9 +135,8 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
     int c;
     int numchar = strlen( (char *) string );
     SFG_Font* font = fghFontByID( fontID );
-    float raster_position[ 4 ];
+    float x = 0.0f ;
 
-    glGetFloatv ( GL_CURRENT_RASTER_POSITION, raster_position );
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
     glPixelStorei( GL_UNPACK_LSB_FIRST,   GL_FALSE );
@@ -154,12 +153,12 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
     for( c = 0; c < numchar; c++ )
         if( string[c] == '\n' )
         {
-            raster_position[ 1 ] -= ( float )font->Height;
-            glRasterPos4fv( raster_position );
+            glBitmap ( 0, 0, 0, 0, -x, (float) -font->Height, NULL );
+            x = 0.0f;
         }
         else  /* Not an EOL, draw the bitmap character */
         {
-            const GLubyte* face = font->Characters[ string[ c ] - 1 ];
+            const GLubyte* face = font->Characters[ string[ c ] ];
 
             glBitmap(
                 face[ 0 ], font->Height,     /* Bitmap's width and height    */
@@ -167,7 +166,10 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
                 ( float )( face[ 0 ] ), 0.0, /* The raster advance; inc. x,y */
                 ( face + 1 )                 /* The packed bitmap data...    */
             );
+
+            x += ( float )( face[ 0 ] );
         }
+
     glPopClientAttrib( );
 }
 
@@ -179,7 +181,7 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
     SFG_Font* font = fghFontByID( fontID );
 
     freeglut_return_val_if_fail( character > 0 && character < 256, 0 );
-    return *( font->Characters[ character - 1 ] );
+    return *( font->Characters[ character ] );
 }
 
 /*
@@ -194,7 +196,7 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
     for( c = 0; c < numchar; c++ )
     {
         if( string[ c ] != '\n' )/* Not an EOL, increment length of line */
-            this_line_length += *( font->Characters[ string[ c ] - 1 ]);
+            this_line_length += *( font->Characters[ string[ c ] ]);
         else  /* EOL; reset the length of this line */
         {
             if( length < this_line_length )
@@ -280,7 +282,7 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
 
                         glEnd( );
                     }
-                    
+
                     length += schar->Right;
                     glTranslatef( schar->Right, 0.0, 0.0 );
                 }
@@ -302,7 +304,7 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
     );
     schar = font->Characters[ character ];
     freeglut_return_val_if_fail( schar, 0 );
-    
+
     return ( int )( schar->Right + 0.5 );
 }