#include "config.h"
#endif
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
*/
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 ***/
}
*/
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 ***/
}
/*
* 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 ];
+ 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 );
glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE );
}
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 */
( face + 1 ) /* The packed bitmap data... */
);
}
+
glPopClientAttrib( );
+ glPopMatrix( );
+ glMatrixMode( GL_MODELVIEW );
+ glPopMatrix( );
+ glPopAttrib( );
}
/*
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 )
}
if( length < this_line_length )
length = this_line_length;
- return ( int )( length + 0.5 );
+ return( int )( length + 0.5 );
}
/*
GLfloat FGAPIENTRY glutStrokeHeight( void* fontID )
{
SFG_StrokeFont* font = fghStrokeByID( fontID );
- return( font->Height );
+ return font->Height;
}
/*** END OF FILE ***/