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

Temporary workaround for the regression of intersection tests with osgText::Text. Added a local vertex array that is transformed by the last applied text matrix.

Browse Source
This commit is contained in:
Robert Osfield
2017-11-06 19:53:38 +00:00
parent 24f8a01f17
commit 01c68ba5e5
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgText/Text.cpp
View File

@@ -1259,7 +1259,24 @@ void Text::accept(osg::Drawable::ConstAttributeFunctor& af) const
void Text::accept(osg::PrimitiveFunctor& pf) const
{
pf.setVertexArray(_coords->size(), &(_coords->front()));
if (!_coords || _coords->empty()) return;
// short term fix/workaround for _coords being transformed by a local matrix before rendering, so we need to replicate this was doing tasks like intersection testing.
osg::ref_ptr<osg::Vec3Array> vertices = _coords;
if (!_matrix.isIdentity())
{
vertices = new osg::Vec3Array;
vertices->resize(_coords->size());
for(Vec3Array::iterator sitr = _coords->begin(), ditr = vertices->begin();
sitr != _coords->end();
++sitr, ++ditr)
{
*ditr = *sitr * _matrix;
}
}
pf.setVertexArray(vertices->size(), &(vertices->front()));
for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)