FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

John Fay: Implement the upper end of the bitmapped fonts (beyond ASCII code 127). The fonts are very close to the GLUT fonts.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@500 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
puggles 2004-05-12 00:26:42 +00:00
parent f0e7e663b5
commit c28e19b830
2 changed files with 1978 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
freeglut/freeglut/src/freeglut_font.c
View File

@ -112,7 +112,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
/* /*
* Find the character we want to draw (???) * Find the character we want to draw (???)
*/ */
face = font->Characters[ character - 1 ]; face = font->Characters[ character ];
glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE );
@ -137,6 +137,19 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
SFG_Font* font = fghFontByID( fontID ); 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 ); glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE );
@ -159,7 +172,7 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
} }
else /* Not an EOL, draw the bitmap character */ else /* Not an EOL, draw the bitmap character */
{ {
const GLubyte* face = font->Characters[ string[ c ] - 1 ]; const GLubyte* face = font->Characters[ string[ c ] ];
glBitmap( glBitmap(
face[ 0 ], font->Height, /* Bitmap's width and height */ face[ 0 ], font->Height, /* Bitmap's width and height */
@ -168,7 +181,12 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
( face + 1 ) /* The packed bitmap data... */ ( face + 1 ) /* The packed bitmap data... */
); );
} }
glPopClientAttrib( ); glPopClientAttrib( );
glPopMatrix( );
glMatrixMode( GL_MODELVIEW );
glPopMatrix( );
glPopAttrib( );
} }
/* /*
@ -179,7 +197,7 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
SFG_Font* font = fghFontByID( fontID ); SFG_Font* font = fghFontByID( fontID );
freeglut_return_val_if_fail( character > 0 && character < 256, 0 ); freeglut_return_val_if_fail( character > 0 && character < 256, 0 );
return *( font->Characters[ character - 1 ] ); return *( font->Characters[ character ] );
} }
/* /*
@ -194,7 +212,7 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
for( c = 0; c < numchar; c++ ) for( c = 0; c < numchar; c++ )
{ {
if( string[ c ] != '\n' )/* Not an EOL, increment length of line */ 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 */ else /* EOL; reset the length of this line */
{ {
if( length < this_line_length ) if( length < this_line_length )

2708
freeglut/freeglut/src/freeglut_font_data.c
View File

File diff suppressed because it is too large Load Diff