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

Changed the text bounding box calcualtion so that it only takes in to account the basic glyph size, and doesn't add in the glyph margin used for accounting for texel sampling

Browse Source
This commit is contained in:
Robert Osfield 2018-02-06 17:54:33 +00:00
parent a1132442ff
commit 55a45e3c0e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgText/Text.cpp
View File

@ -674,17 +674,17 @@ void Text::computeGlyphRepresentation()
{ {
case LEFT_TO_RIGHT: case LEFT_TO_RIGHT:
cursor.x() += glyph->getHorizontalAdvance() * wr; cursor.x() += glyph->getHorizontalAdvance() * wr;
_textBB.expandBy(osg::Vec3(minc.x(), minc.y(), 0.0f)); //lower left corner _textBB.expandBy(osg::Vec3(local.x(), local.y(), 0.0f)); //lower left corner
_textBB.expandBy(osg::Vec3(maxc.x(), maxc.y(), 0.0f)); //upper right corner _textBB.expandBy(osg::Vec3(local.x()+width, local.y()+height, 0.0f)); //upper right corner
break; break;
case VERTICAL: case VERTICAL:
cursor.y() -= glyph->getVerticalAdvance() * hr; cursor.y() -= glyph->getVerticalAdvance() * hr;
_textBB.expandBy(osg::Vec3(minc.x(),maxc.y(),0.0f)); //upper left corner _textBB.expandBy(osg::Vec3(local.x(), local.y()+height, 0.0f)); //upper left corner
_textBB.expandBy(osg::Vec3(maxc.x(),minc.y(),0.0f)); //lower right corner _textBB.expandBy(osg::Vec3(local.x()+width, local.y(), 0.0f)); //lower right corner
break; break;
case RIGHT_TO_LEFT: case RIGHT_TO_LEFT:
_textBB.expandBy(osg::Vec3(maxc.x(),minc.y(),0.0f)); //lower right corner _textBB.expandBy(osg::Vec3(local.x()+width, local.y(), 0.0f)); //lower right corner
_textBB.expandBy(osg::Vec3(minc.x(),maxc.y(),0.0f)); //upper left corner _textBB.expandBy(osg::Vec3(local.x(), local.y()+height, 0.0f)); //upper left corner
break; break;
} }
} }