FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the background pixel colour to white, but kept the alpha value zero.

Browse Source 
This has been done to improve the quality of the mip mapping of text.
This commit is contained in:
Robert Osfield 2003-03-27 10:58:20 +00:00
parent fc4fe9c625
commit c784f8a669
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/freetype/FreeTypeFont.cpp
View File

@ -85,7 +85,7 @@ osgText::Font::Glyph* FreeTypeFont::getGlyph(unsigned int charcode)
// clear the image to zeros.
for(unsigned char* p=data;p!=data+dataSize;++p) *p = 0;
for(unsigned char* p=data;p<data+dataSize;) { *p++ = 255; *p++ = 0; }
glyph->setImage(width,height,1,
GL_LUMINANCE_ALPHA,

2
src/osgSim/LightPointDrawable.cpp
View File

@ -162,6 +162,8 @@ void LightPointDrawable::drawImplementation(osg::State& state) const
state.haveAppliedAttribute(osg::StateAttribute::POINT);
state.dirtyAllVertexArrays();
// restore the state afterwards.
state.apply();

34
src/osgText/DefaultFont.cpp
View File

@ -209,7 +209,7 @@ void DefaultFont::constructGlyphs()
unsigned char* data = new unsigned char[dataSize];
// clear the image to zeros.
for(unsigned char* p=data;p!=data+dataSize;++p) *p = 0;
for(unsigned char* p=data;p<data+dataSize;) { *p++ = 255; *p++ = 0; }
glyph->setImage(_width,_height,1,
GL_LUMINANCE_ALPHA,
@ -229,21 +229,37 @@ void DefaultFont::constructGlyphs()
for(unsigned int row=0;row<sourceHeight;++row,++ptr)
{
data+=2*_margin; // skip the left margin
// (*data++)=((*ptr)&128)?value_on:value_off;
// (*data++)=((*ptr)&128)?value_on:value_off;
// (*data++)=((*ptr)&64)?value_on:value_off;
// (*data++)=((*ptr)&64)?value_on:value_off;
// (*data++)=((*ptr)&32)?value_on:value_off;
// (*data++)=((*ptr)&32)?value_on:value_off;
// (*data++)=((*ptr)&16)?value_on:value_off;
// (*data++)=((*ptr)&16)?value_on:value_off;
// (*data++)=((*ptr)&8)?value_on:value_off;
// (*data++)=((*ptr)&8)?value_on:value_off;
// (*data++)=((*ptr)&4)?value_on:value_off;
// (*data++)=((*ptr)&4)?value_on:value_off;
// (*data++)=((*ptr)&2)?value_on:value_off;
// (*data++)=((*ptr)&2)?value_on:value_off;
// (*data++)=((*ptr)&1)?value_on:value_off;
// (*data++)=((*ptr)&1)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&128)?value_on:value_off;
(*data++)=((*ptr)&128)?value_on:value_off;
(*data++)=((*ptr)&64)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&64)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&32)?value_on:value_off;
(*data++)=((*ptr)&32)?value_on:value_off;
(*data++)=((*ptr)&16)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&16)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&8)?value_on:value_off;
(*data++)=((*ptr)&8)?value_on:value_off;
(*data++)=((*ptr)&4)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&4)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&2)?value_on:value_off;
(*data++)=((*ptr)&2)?value_on:value_off;
(*data++)=((*ptr)&1)?value_on:value_off;
(*data++)=255;
(*data++)=((*ptr)&1)?value_on:value_off;
data+=2*_margin; // skip the right margin.
}