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

Normalized the style of freeglut_font.c No substantial alterations.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@314 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-07 08:25:30 +00:00
parent 85b7b49ead
commit 5621aa7fcb
1 changed files with 179 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,11 @@ 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 );
@ -70,7 +75,7 @@ static SFG_Font* fghFontByID( void* font )
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; /*** XXX NOT REACHED ***/
return 0; /*** NOT REACHED ***/
}
/*
@ -79,10 +84,14 @@ 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 );
fgError( "stroke font 0x%08x not found", font );
return 0; /*** XXX NOT REACHED ***/
return 0; /*** NOT REACHED ***/
}
@ -96,7 +105,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
const GLubyte* face;
SFG_Font* font = fghFontByID( fontID );
freeglut_return_if_fail( character >= 1 && character < 256 );
freeglut_return_if_fail( ( character >= 1 )&&( character < 256 ) );
/*
* Find the character we want to draw (???)
@ -141,7 +150,6 @@ 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' )
{
raster_position[1] -= (float)font->Height ;
@ -152,13 +160,12 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
const GLubyte* face = font->Characters[ string[ c ] - 1 ];
glBitmap(
face[ 0 ], font->Height, /* The bitmap's width and height */
face[ 0 ], font->Height, /* Bitmap's width and height */
font->xorig, font->yorig, /* The origin in the font glyph */
(float)(face[ 0 ]), 0.0, /* The raster advance -- inc. x,y */
( float )( face[ 0 ] ), 0.0, /* The raster advance; inc. x,y */
( face + 1 ) /* The packed bitmap data... */
);
}
}
glPopClientAttrib( );
}
@ -170,7 +177,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 - 1 ] );
}
/*
@ -184,18 +191,19 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
for( c = 0; c < numchar; c++ )
{
if ( string[ c ] == '\n' ) /* EOL; reset the length of this line */
if ( string[ c ] != '\n' )/* Not an EOL, increment length of line */
this_line_length += *( font->Characters[ string[ c ] - 1 ]);
else /* EOL; reset the length of this line */
{
if ( length < this_line_length ) length = this_line_length ;
if( length < this_line_length )
length = this_line_length;
this_line_length = 0;
}
else /* Not an EOL, increment the length of this line */
this_line_length += *(font->Characters[ string[ c ] - 1 ]) ;
}
if ( length < this_line_length )
length = this_line_length;
return( length );
return length;
}
/*
@ -204,7 +212,7 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
int FGAPIENTRY glutBitmapHeight( void* fontID )
{
SFG_Font* font = fghFontByID( fontID );
return( font->Height );
return font->Height;
}
/*
@ -227,9 +235,7 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
{
glBegin( GL_LINE_STRIP );
for( j = 0; j < strip->Number; j++ )
{
glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y );
}
glEnd( );
}
glTranslatef( schar->Right, 0.0, 0.0 );
@ -248,7 +254,6 @@ 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 ] == '\n' )
@ -259,7 +264,7 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
else /* Not an EOL, draw the bitmap character */
{
const SFG_StrokeChar *schar = font->Characters[ string[ c ] ];
if ( schar != NULL )
if( schar )
{
const SFG_StrokeStrip *strip = schar->Strips;
@ -267,7 +272,8 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
{
glBegin( GL_LINE_STRIP );
for( j = 0; j < strip->Number; j++ )
glVertex2f(strip->Vertices[j].X, strip->Vertices[j].Y);
glVertex2f( strip->Vertices[ j ].X,
strip->Vertices[ j ].Y);
glEnd( );
}
@ -278,7 +284,6 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
}
}
}
}
/*
* Return the width in pixels of a stroke character
@ -288,11 +293,13 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
const SFG_StrokeChar *schar;
SFG_StrokeFont* font = fghStrokeByID( fontID );
freeglut_return_val_if_fail( character >= 0 && character < font->Quantity, 0 );
freeglut_return_val_if_fail( ( character >= 0 ) &&
( character < font->Quantity ),
0 );
schar = font->Characters[ character ];
freeglut_return_val_if_fail( schar, 0 );
return ((int)(schar->Right + 0.5));
return ( int )( schar->Right + 0.5 );
}
/*
@ -307,25 +314,24 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
int numchar = strlen( string );
for( c = 0; c < numchar; c++ )
{
if ( string[ c ] < font->Quantity )
{
if( string[ c ] == '\n' ) /* EOL; reset the length of this line */
{
if ( length < this_line_length ) length = this_line_length ;
if( length < this_line_length )
length = this_line_length;
this_line_length = 0.0;
}
else /* Not an EOL, increment the length of this line */
{
const SFG_StrokeChar *schar = font->Characters[ string[ c ] ];
if ( schar != NULL )
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 );
}
/*