Commit 3902538ad90f74904afa14933ec848b4248395f8
2004-12-06T10:34:50
Changed the way the colour is specified. It can now be done per string rather than at start up as previous.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index e4d041b..cdb9908 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -41,6 +41,14 @@ void FTGLPixmapFont::Render( const char* string)
glDisable( GL_TEXTURE_2D);
+ GLfloat ftglColour[4];
+ glGetFloatv( GL_CURRENT_RASTER_COLOR, ftglColour);
+
+ glPixelTransferf(GL_RED_SCALE, ftglColour[0]);
+ glPixelTransferf(GL_GREEN_SCALE, ftglColour[1]);
+ glPixelTransferf(GL_BLUE_SCALE, ftglColour[2]);
+ glPixelTransferf(GL_ALPHA_SCALE, ftglColour[3]);
+
FTFont::Render( string);
glPopClientAttrib();
@@ -58,6 +66,14 @@ void FTGLPixmapFont::Render( const wchar_t* string)
glDisable( GL_TEXTURE_2D);
+ GLfloat ftglColour[4];
+ glGetFloatv( GL_CURRENT_RASTER_COLOR, ftglColour);
+
+ glPixelTransferf(GL_RED_SCALE, ftglColour[0]);
+ glPixelTransferf(GL_GREEN_SCALE, ftglColour[1]);
+ glPixelTransferf(GL_BLUE_SCALE, ftglColour[2]);
+ glPixelTransferf(GL_ALPHA_SCALE, ftglColour[3]);
+
FTFont::Render( string);
glPopClientAttrib();
diff --git a/src/FTPixmapGlyph.cpp b/src/FTPixmapGlyph.cpp
index bd04bf7..a109587 100755
--- a/src/FTPixmapGlyph.cpp
+++ b/src/FTPixmapGlyph.cpp
@@ -20,60 +20,32 @@ FTPixmapGlyph::FTPixmapGlyph( FT_GlyphSlot glyph)
int srcWidth = bitmap.width;
int srcHeight = bitmap.rows;
- // FIXME What about dest alignment?
destWidth = srcWidth;
destHeight = srcHeight;
if( destWidth && destHeight)
{
- data = new unsigned char[destWidth * destHeight * 4];
-
- // Get the current glColor.
- float ftglColour[4];
- glGetFloatv( GL_CURRENT_COLOR, ftglColour);
-
- unsigned char redComponent = static_cast<unsigned char>( ftglColour[0] * 255.0f);
- unsigned char greenComponent = static_cast<unsigned char>( ftglColour[1] * 255.0f);
- unsigned char blueComponent = static_cast<unsigned char>( ftglColour[2] * 255.0f);
-
+ data = new unsigned char[destWidth * destHeight * 2];
unsigned char* src = bitmap.buffer;
- unsigned char* dest = data + ((destHeight - 1) * destWidth) * 4;
- size_t destStep = destWidth * 4 * 2;
+ unsigned char* dest = data + ((destHeight - 1) * destWidth * 2);
+ size_t destStep = destWidth * 2 * 2;
- if( ftglColour[3] == 1.0f)
+ for( int y = 0; y < srcHeight; ++y)
{
- for( int y = 0; y < srcHeight; ++y)
+ for( int x = 0; x < srcWidth; ++x)
{
- for( int x = 0; x < srcWidth; ++x)
- {
- *dest++ = redComponent;
- *dest++ = greenComponent;
- *dest++ = blueComponent;
- *dest++ = *src++;
- }
- dest -= destStep;
- }
- }
- else
- {
- for( int y = 0; y < srcHeight; ++y)
- {
- for( int x = 0; x < srcWidth; ++x)
- {
- *dest++ = redComponent;
- *dest++ = greenComponent;
- *dest++ = blueComponent;
- *dest++ = static_cast<unsigned char>(ftglColour[3] * *src++);
- }
- dest -= destStep;
+ *dest++ = static_cast<unsigned char>(255);
+ *dest++ = *src++;
}
+ dest -= destStep;
}
+
destHeight = srcHeight;
}
- pos.X( glyph->bitmap_left);
- pos.Y( srcHeight - glyph->bitmap_top);
+ pos.X(glyph->bitmap_left);
+ pos.Y(srcHeight - glyph->bitmap_top);
}
@@ -90,7 +62,9 @@ const FTPoint& FTPixmapGlyph::Render( const FTPoint& pen)
if( data)
{
glPixelStorei( GL_UNPACK_ROW_LENGTH, 0);
- glDrawPixels( destWidth, destHeight, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid*)data);
+ glPixelStorei( GL_UNPACK_ALIGNMENT, 2);
+
+ glDrawPixels( destWidth, destHeight, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, (const GLvoid*)data);
}
glBitmap( 0, 0, 0.0f, 0.0f, -pos.X(), pos.Y(), (const GLubyte*)0);