X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=a718fdf9cd6ae5809bf45f1925605b8baed798a7;hb=69f96533fcedaf91c2b6c53da6e1c20fb145b425;hp=7581365d780ccfd8a13bf7ed3ad7eb5b1367b0fc;hpb=13bc069810e3f513a9aa6cd44e8a37d02c7baabf;p=freeglut diff --git a/src/freeglut_font.c b/src/freeglut_font.c index 7581365..a718fdf 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 #include "freeglut_internal.h" /* @@ -62,18 +62,21 @@ extern SFG_StrokeFont fgStrokeMonoRoman; */ static SFG_Font* fghFontByID( void* font ) { - /* - * XXX Use a macro, a table of some kind, or else split these - * XXX statements properly. Jamming "return" on the end of an - * XXX "if" is just bad style, IMHO. - */ - if( font == GLUT_BITMAP_8_BY_13 ) return( &fgFontFixed8x13 ); - if( font == GLUT_BITMAP_9_BY_15 ) return( &fgFontFixed9x15 ); - if( font == GLUT_BITMAP_HELVETICA_10 ) return( &fgFontHelvetica10 ); - if( font == GLUT_BITMAP_HELVETICA_12 ) return( &fgFontHelvetica12 ); - if( font == GLUT_BITMAP_HELVETICA_18 ) return( &fgFontHelvetica18 ); - if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) return( &fgFontTimesRoman10 ); - if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) return( &fgFontTimesRoman24 ); + if( font == GLUT_BITMAP_8_BY_13 ) + return &fgFontFixed8x13; + if( font == GLUT_BITMAP_9_BY_15 ) + return &fgFontFixed9x15; + if( font == GLUT_BITMAP_HELVETICA_10 ) + return &fgFontHelvetica10; + if( font == GLUT_BITMAP_HELVETICA_12 ) + return &fgFontHelvetica12; + if( font == GLUT_BITMAP_HELVETICA_18 ) + return &fgFontHelvetica18; + if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) + return &fgFontTimesRoman10; + if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) + return &fgFontTimesRoman24; + fgError( "font 0x%08x not found", font ); return 0; /*** NOT REACHED ***/ } @@ -84,12 +87,11 @@ static SFG_Font* fghFontByID( void* font ) */ static SFG_StrokeFont* fghStrokeByID( void* font ) { - /* - * XXX Same comment as above about jamming "return" in after an - * XXX "if". - */ - if( font == GLUT_STROKE_ROMAN ) return( &fgStrokeRoman ); - if( font == GLUT_STROKE_MONO_ROMAN ) return( &fgStrokeMonoRoman ); + if( font == GLUT_STROKE_ROMAN ) + return &fgStrokeRoman; + if( font == GLUT_STROKE_MONO_ROMAN ) + return &fgStrokeMonoRoman; + fgError( "stroke font 0x%08x not found", font ); return 0; /*** NOT REACHED ***/ } @@ -110,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 ); @@ -131,11 +133,24 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character ) 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 raster_position[ 4 ]; + + glPushAttrib( GL_TRANSFORM_BIT ); + glMatrixMode( GL_MODELVIEW ); + glPushMatrix( ); + glLoadIdentity( ); + glMatrixMode( GL_PROJECTION ); + glPushMatrix( ); + glLoadIdentity( ); + glOrtho( + 0, glutGet( GLUT_WINDOW_WIDTH ), + 0, glutGet( GLUT_WINDOW_HEIGHT ), + -10, 10 + ); - glGetFloatv ( GL_CURRENT_RASTER_POSITION, raster_position ) ; + 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 ); @@ -150,14 +165,14 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string ) * point back to the start of the line and down one line. */ for( c = 0; c < numchar; c++ ) - if ( string[c] == '\n' ) + if( string[c] == '\n' ) { - raster_position[1] -= (float)font->Height ; - glRasterPos4fv ( raster_position ) ; + raster_position[ 1 ] -= ( float )font->Height; + glRasterPos4fv( raster_position ); } 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 */ @@ -166,7 +181,12 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string ) ( face + 1 ) /* The packed bitmap data... */ ); } + glPopClientAttrib( ); + glPopMatrix( ); + glMatrixMode( GL_MODELVIEW ); + glPopMatrix( ); + glPopAttrib( ); } /* @@ -177,7 +197,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 ] ); } /* @@ -187,12 +207,12 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string ) { 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 ]); + if( string[ c ] != '\n' )/* Not an EOL, increment length of line */ + this_line_length += *( font->Characters[ string[ c ] ]); else /* EOL; reset the length of this line */ { if( length < this_line_length ) @@ -225,9 +245,10 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character ) int i, j; SFG_StrokeFont* font = fghStrokeByID( fontID ); - freeglut_return_if_fail( character >= 0 && character < font->Quantity ); + freeglut_return_if_fail( character >= 0 ); + freeglut_return_if_fail( character < font->Quantity ); - schar = font->Characters[character]; + schar = font->Characters[ character ]; freeglut_return_if_fail( schar ); strip = schar->Strips; @@ -244,7 +265,7 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character ) 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 ); @@ -254,11 +275,11 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) * point back to the start of the line and down one line. */ for( c = 0; c < numchar; c++ ) - if ( string[ c ] < font->Quantity ) + if( string[ c ] < font->Quantity ) { if( string[ c ] == '\n' ) { - glTranslatef ( -length, -(float)(font->Height), 0.0 ); + glTranslatef ( -length, -( float )( font->Height ), 0.0 ); length = 0.0; } else /* Not an EOL, draw the bitmap character */ @@ -268,7 +289,7 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) { const SFG_StrokeStrip *strip = schar->Strips; - for(i = 0; i < schar->Number; i++, strip++) + for( i = 0; i < schar->Number; i++, strip++ ) { glBegin( GL_LINE_STRIP ); for( j = 0; j < strip->Number; j++ ) @@ -277,7 +298,7 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) glEnd( ); } - + length += schar->Right; glTranslatef( schar->Right, 0.0, 0.0 ); } @@ -295,10 +316,11 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character ) freeglut_return_val_if_fail( ( character >= 0 ) && ( character < font->Quantity ), - 0 ); + 0 + ); schar = font->Characters[ character ]; freeglut_return_val_if_fail( schar, 0 ); - + return ( int )( schar->Right + 0.5 ); } @@ -311,10 +333,10 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) 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 ) + if( string[ c ] < font->Quantity ) { if( string[ c ] == '\n' ) /* EOL; reset the length of this line */ { @@ -325,13 +347,13 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) else /* Not an EOL, increment the length of this line */ { const SFG_StrokeChar *schar = font->Characters[ string[ c ] ]; - if ( schar ) + if( schar ) this_line_length += schar->Right; } } if( length < this_line_length ) length = this_line_length; - return ( int )( length + 0.5 ); + return( int )( length + 0.5 ); } /* @@ -340,7 +362,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) GLfloat FGAPIENTRY glutStrokeHeight( void* fontID ) { SFG_StrokeFont* font = fghStrokeByID( fontID ); - return( font->Height ); + return font->Height; } /*** END OF FILE ***/