Normalized the style of freeglut_font.c No substantial alterations.

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

View File

@ -62,15 +62,20 @@ extern SFG_StrokeFont fgStrokeMonoRoman;
*/ */
static SFG_Font* fghFontByID( void* font ) static SFG_Font* fghFontByID( void* font )
{ {
if( font == GLUT_BITMAP_8_BY_13 ) return( &fgFontFixed8x13 ); /*
if( font == GLUT_BITMAP_9_BY_15 ) return( &fgFontFixed9x15 ); * XXX Use a macro, a table of some kind, or else split these
if( font == GLUT_BITMAP_HELVETICA_10 ) return( &fgFontHelvetica10 ); * XXX statements properly. Jamming "return" on the end of an
if( font == GLUT_BITMAP_HELVETICA_12 ) return( &fgFontHelvetica12 ); * XXX "if" is just bad style, IMHO.
if( font == GLUT_BITMAP_HELVETICA_18 ) return( &fgFontHelvetica18 ); */
if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) return( &fgFontTimesRoman10 ); if( font == GLUT_BITMAP_8_BY_13 ) return( &fgFontFixed8x13 );
if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) return( &fgFontTimesRoman24 ); if( font == GLUT_BITMAP_9_BY_15 ) return( &fgFontFixed9x15 );
fgError( "font 0x%08x not found", font ); if( font == GLUT_BITMAP_HELVETICA_10 ) return( &fgFontHelvetica10 );
return 0; /*** XXX NOT REACHED ***/ 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 ***/
} }
/* /*
@ -79,10 +84,14 @@ static SFG_Font* fghFontByID( void* font )
*/ */
static SFG_StrokeFont* fghStrokeByID( void* font ) static SFG_StrokeFont* fghStrokeByID( void* font )
{ {
if( font == GLUT_STROKE_ROMAN ) return( &fgStrokeRoman ); /*
if( font == GLUT_STROKE_MONO_ROMAN ) return( &fgStrokeMonoRoman ); * XXX Same comment as above about jamming "return" in after an
fgError( "stroke font 0x%08x not found", font ); * XXX "if".
return 0; /*** XXX NOT REACHED ***/ */
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 ***/
} }
@ -93,73 +102,71 @@ static SFG_StrokeFont* fghStrokeByID( void* font )
*/ */
void FGAPIENTRY glutBitmapCharacter( void* fontID, int character ) void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
{ {
const GLubyte* face; const GLubyte* face;
SFG_Font* font = fghFontByID( fontID ); 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 (???) * Find the character we want to draw (???)
*/ */
face = font->Characters[ character - 1 ]; face = font->Characters[ character - 1 ];
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 );
glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE );
glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 );
glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 );
glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
glBitmap( glBitmap(
face[ 0 ], font->Height, /* The bitmap's width and height */ face[ 0 ], font->Height, /* The bitmap's width and height */
font->xorig, font->yorig, /* The origin in the font glyph */ 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... */ ( face + 1 ) /* The packed bitmap data... */
); );
glPopClientAttrib(); glPopClientAttrib( );
} }
void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string ) void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
{ {
int c; int c;
int numchar = strlen ( string ) ; int numchar = strlen ( string ) ;
SFG_Font* font = fghFontByID( fontID ); SFG_Font* font = fghFontByID( fontID );
float raster_position[4] ; float raster_position[4];
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 );
glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE );
glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 );
glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 );
glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
/* /*
* Step through the string, drawing each character. * Step through the string, drawing each character.
* A newline will simply translate the next character's insertion * A newline will simply translate the next character's insertion
* point back to the start of the line and down one line. * point back to the start of the line and down one line.
*/ */
for( c = 0; c < numchar; c++ ) for( c = 0; c < numchar; c++ )
{ if ( string[c] == '\n' )
if ( string[c] == '\n' ) {
{ raster_position[1] -= (float)font->Height ;
raster_position[1] -= (float)font->Height ; glRasterPos4fv ( raster_position ) ;
glRasterPos4fv ( raster_position ) ; }
} 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 ] - 1 ] ;
glBitmap( 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 */ 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... */ ( face + 1 ) /* The packed bitmap data... */
) ; );
} }
} glPopClientAttrib( );
glPopClientAttrib();
} }
/* /*
@ -167,10 +174,10 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
*/ */
int FGAPIENTRY glutBitmapWidth( void* fontID, int character ) 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 - 1 ] );
} }
/* /*
@ -178,24 +185,25 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
*/ */
int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string ) int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
{ {
int c, length = 0, this_line_length = 0; int c, length = 0, this_line_length = 0;
SFG_Font* font = fghFontByID( fontID ); SFG_Font* font = fghFontByID( fontID );
int numchar = strlen ( string ) ; int numchar = strlen ( string ) ;
for( c = 0; c < numchar; c++ ) for( c = 0; c < numchar; c++ )
{
if ( string[ c ] == '\n' ) /* EOL; reset the length of this line */
{ {
if ( length < this_line_length ) length = this_line_length ; if ( string[ c ] != '\n' )/* Not an EOL, increment length of line */
this_line_length = 0 ; 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;
this_line_length = 0;
}
} }
else /* Not an EOL, increment the length of this line */ if ( length < this_line_length )
this_line_length += *(font->Characters[ string[ c ] - 1 ]) ; length = this_line_length;
}
if ( length < this_line_length )
length = this_line_length ;
return( length ); return length;
} }
/* /*
@ -203,8 +211,8 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
*/ */
int FGAPIENTRY glutBitmapHeight( void* fontID ) int FGAPIENTRY glutBitmapHeight( void* fontID )
{ {
SFG_Font* font = fghFontByID( fontID ); SFG_Font* font = fghFontByID( fontID );
return( font->Height ); return font->Height;
} }
/* /*
@ -212,72 +220,69 @@ int FGAPIENTRY glutBitmapHeight( void* fontID )
*/ */
void FGAPIENTRY glutStrokeCharacter( void* fontID, int character ) void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
{ {
const SFG_StrokeChar *schar; const SFG_StrokeChar *schar;
const SFG_StrokeStrip *strip; const SFG_StrokeStrip *strip;
int i, j; int i, j;
SFG_StrokeFont* font = fghStrokeByID( fontID ); SFG_StrokeFont* font = fghStrokeByID( fontID );
freeglut_return_if_fail( character >= 0 && character < font->Quantity ); freeglut_return_if_fail( character >= 0 && character < font->Quantity );
schar = font->Characters[character]; schar = font->Characters[character];
freeglut_return_if_fail( schar ); freeglut_return_if_fail( schar );
strip = schar->Strips; 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++)
{ {
glVertex2f(strip->Vertices[j].X, strip->Vertices[j].Y); glBegin( GL_LINE_STRIP );
for( j = 0; j < strip->Number; j++ )
glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y );
glEnd( );
} }
glEnd(); glTranslatef( schar->Right, 0.0, 0.0 );
}
glTranslatef(schar->Right, 0.0, 0.0);
} }
void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
{ {
int c, i, j; int c, i, j;
int numchar = strlen ( string ) ; int numchar = strlen ( string );
float length = 0.0 ; float length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID ); SFG_StrokeFont* font = fghStrokeByID( fontID );
/* /*
* Step through the string, drawing each character. * Step through the string, drawing each character.
* A newline will simply translate the next character's insertion * A newline will simply translate the next character's insertion
* point back to the start of the line and down one line. * point back to the start of the line and down one line.
*/ */
for( c = 0; c < numchar; c++ ) 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 ) ;
length = 0.0 ;
}
else /* Not an EOL, draw the bitmap character */
{
const SFG_StrokeChar *schar = font->Characters[string[c]];
if ( schar != NULL )
{ {
const SFG_StrokeStrip *strip = schar->Strips; if( string[ c ] == '\n' )
{
glTranslatef ( -length, -(float)(font->Height), 0.0 );
length = 0.0;
}
else /* Not an EOL, draw the bitmap character */
{
const SFG_StrokeChar *schar = font->Characters[ string[ c ] ];
if( schar )
{
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); glBegin( GL_LINE_STRIP );
for(j = 0; j < strip->Number; j++) 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(); glEnd( );
} }
length += schar->Right ; length += schar->Right;
glTranslatef(schar->Right, 0.0, 0.0); glTranslatef( schar->Right, 0.0, 0.0 );
}
}
} }
}
}
}
} }
/* /*
@ -285,14 +290,16 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
*/ */
int FGAPIENTRY glutStrokeWidth( void* fontID, int character ) int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
{ {
const SFG_StrokeChar *schar; const SFG_StrokeChar *schar;
SFG_StrokeFont* font = fghStrokeByID( fontID ); SFG_StrokeFont* font = fghStrokeByID( fontID );
freeglut_return_val_if_fail( character >= 0 && character < font->Quantity, 0 ); freeglut_return_val_if_fail( ( character >= 0 ) &&
schar = font->Characters[character]; ( character < font->Quantity ),
freeglut_return_val_if_fail( schar, 0 ); 0 );
schar = font->Characters[ character ];
return ((int)(schar->Right + 0.5)); freeglut_return_val_if_fail( schar, 0 );
return ( int )( schar->Right + 0.5 );
} }
/* /*
@ -300,32 +307,31 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
*/ */
int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
{ {
int c; int c;
float length = 0.0; float length = 0.0;
float this_line_length = 0.0 ; float this_line_length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID ); SFG_StrokeFont* font = fghStrokeByID( fontID );
int numchar = strlen ( string ) ; int numchar = strlen( string );
for( c = 0; c < numchar; c++ ) 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 */
if ( string[ c ] == '\n' ) /* EOL; reset the length of this line */ {
{ if( length < this_line_length )
if ( length < this_line_length ) length = this_line_length ; length = this_line_length;
this_line_length = 0.0 ; this_line_length = 0.0;
} }
else /* Not an EOL, increment the length of this line */ else /* Not an EOL, increment the length of this line */
{ {
const SFG_StrokeChar *schar = font->Characters[string[c]]; const SFG_StrokeChar *schar = font->Characters[ string[ c ] ];
if ( schar != NULL ) if ( schar )
this_line_length += schar->Right ; this_line_length += schar->Right;
} }
} }
} if( length < this_line_length )
if ( length < this_line_length ) length = this_line_length;
length = this_line_length ; return ( int )( length + 0.5 );
return( (int)(length+0.5) );
} }
/* /*