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

Removed old Text::GlyphQuads array code paths

Browse Source
This commit is contained in:
Robert Osfield
2017-02-28 17:02:02 +00:00
parent 138af70bd8
commit 1290f1584a
4 changed files with 120 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgWidget/Input.cpp
View File

@@ -123,26 +123,17 @@ void Input::_calculateCursorOffsets() {
const osgText::Text::GlyphQuads& gq = tgqmi->second;
//coords.insert(coords.end(),gq.getTransformedCoords(0).begin(),gq.getTransformedCoords(0).end());
#ifndef NEW_APPROACH
unsigned int numCoords = gq.getCoords()->size();
for(unsigned int i=0; i<numCoords; ++i)
{
osg::Vec2 c; gq.getCoord(i, c); coords.push_back(c);
}
#endif
for (unsigned int i=0; i<gq.getGlyphs().size(); ++i)
{
glyphs.push_back(gq.getGlyphs().at(i));
}
}
#ifdef NEW_APPROACH
unsigned int numCoords = _text->getCoords()->size();
for(unsigned int i=0; i<numCoords; ++i)
{
osg::Vec2 c; _text->getCoord(i, c); coords.push_back(c);
}
#endif
std::list<unsigned int> keys;
for (unsigned int i=0; i<_text->getText().size(); ++i)