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

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

Browse Source
This commit is contained in:
Robert Osfield
2007-12-10 17:30:18 +00:00
parent 1dcb6cc4fd
commit f4afa427a7
216 changed files with 613 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgText/DefaultFont.cpp
View File

@@ -222,7 +222,7 @@ void DefaultFont::constructGlyphs()
glyph->setInternalTextureFormat(GL_ALPHA);
// now populate data arry by converting bitmap into a luminance_alpha map.
// now populate data array by converting bitmap into a luminance_alpha map.
unsigned char* ptr = rasters[i-32];
unsigned char value_on = 255;
unsigned char value_off = 0;

3
src/osgText/Font.cpp
View File

@@ -630,7 +630,8 @@ void Font::GlyphTexture::apply(osg::State& state) const
if (s_renderer &&
(strstr((const char*)s_renderer,"Radeon")!=0) ||
(strstr((const char*)s_renderer,"RADEON")!=0))
(strstr((const char*)s_renderer,"RADEON")!=0) ||
(strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0))
{
// we're running on an ATI, so need to work around its
// subloading bugs by loading all at once.

2
src/osgText/String.cpp
View File

@@ -7,7 +7,7 @@ using namespace osgText;
////////////////////////////////////////////////////////////////////////
//
// helper class to make it safer to querry std::string's for encoding.
// helper class to make it safer to query std::string's for encoding.
//
struct look_ahead_iterator
{

6
src/osgText/Text.cpp
View File

@@ -224,7 +224,7 @@ String::iterator Text::computeLastCharacterOnLine(osg::Vec2& cursor, String::ite
{
--lastValidChar;
//Substract off glyphs from the cursor position (to correctly center text)
// Subtract off glyphs from the cursor position (to correctly center text)
Font::Glyph* glyph = activefont->getGlyph(*lastValidChar);
if (glyph)
{
@@ -365,7 +365,7 @@ void Text::computeGlyphRepresentation()
switch(_alignment)
{
// TODO: current behaviour top baselines lined up in both cases - need to implement
// top of characters aligment - Question is this neccesary?
// top of characters alignment - Question is this necessary?
// ... otherwise, nothing to be done for these 6 cases
//case LEFT_TOP:
//case CENTER_TOP:
@@ -1758,6 +1758,7 @@ void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMul
}
void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMultiplier) const
{
unsigned int contextID = state.getContextID();
@@ -1818,6 +1819,7 @@ void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMult
glPopAttrib();
}
void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMultiplier) const
{