#include "config.h"
#endif
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
/*
* 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 );
void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
{
int c;
- int numchar = strlen( string );
+ 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 );
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 */
( float )( face[ 0 ] ), 0.0, /* The raster advance; inc. x,y */
( face + 1 ) /* The packed bitmap data... */
);
+
+ x += ( float )( face[ 0 ] );
}
+
glPopClientAttrib( );
}
SFG_Font* font = fghFontByID( fontID );
freeglut_return_val_if_fail( character > 0 && character < 256, 0 );
- return *( font->Characters[ character - 1 ] );
+ return *( font->Characters[ character ] );
}
/*
{
int c, length = 0, this_line_length = 0;
SFG_Font* font = fghFontByID( fontID );
- int numchar = strlen( string );
+ int numchar = strlen( (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 )
void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
{
int c, i, j;
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
float length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
glEnd( );
}
-
+
length += schar->Right;
glTranslatef( schar->Right, 0.0, 0.0 );
}
);
schar = font->Characters[ character ];
freeglut_return_val_if_fail( schar, 0 );
-
+
return ( int )( schar->Right + 0.5 );
}
float length = 0.0;
float this_line_length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
for( c = 0; c < numchar; c++ )
if( string[ c ] < font->Quantity )