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

Improved support for Text with large numbers of glyphs

Browse Source
This commit is contained in:
Robert Osfield 2017-05-25 12:38:54 +01:00
parent 502acc19c9
commit 79e764bd17
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgText/TextBase
View File

@ -299,7 +299,7 @@ protected:
typedef osg::ref_ptr<osg::Vec2Array> TexCoords; typedef osg::ref_ptr<osg::Vec2Array> TexCoords;
typedef osg::ref_ptr<osg::Vec4Array> ColorCoords; typedef osg::ref_ptr<osg::Vec4Array> ColorCoords;
typedef std::vector< osg::ref_ptr<osg::DrawElementsUShort> > Primitives; typedef std::vector< osg::ref_ptr<osg::DrawElements> > Primitives;
// members which have public access. // members which have public access.

46
src/osgText/Text.cpp
View File

@ -229,10 +229,12 @@ void Text::addGlyphQuad(Glyph* glyph, const osg::Vec2& minc, const osg::Vec2& ma
glyphquad._glyphs.push_back(glyph); glyphquad._glyphs.push_back(glyph);
osg::DrawElementsUShort* primitives = 0; osg::DrawElements* primitives = 0;
if (glyphquad._primitives.empty()) if (glyphquad._primitives.empty())
{ {
primitives = new osg::DrawElementsUShort(GL_TRIANGLES); unsigned int maxIndices = _text.size()*4;
if (maxIndices>=16384) primitives = new osg::DrawElementsUInt(GL_TRIANGLES);
else primitives = new osg::DrawElementsUShort(GL_TRIANGLES);
primitives->setBufferObject(_ebo.get()); primitives->setBufferObject(_ebo.get());
glyphquad._primitives.push_back(primitives); glyphquad._primitives.push_back(primitives);
} }
@ -253,13 +255,13 @@ void Text::addGlyphQuad(Glyph* glyph, const osg::Vec2& minc, const osg::Vec2& ma
addTexCoord(osg::Vec2(maxtc.x(), mintc.y())); addTexCoord(osg::Vec2(maxtc.x(), mintc.y()));
addTexCoord(osg::Vec2(maxtc.x(), maxtc.y())); addTexCoord(osg::Vec2(maxtc.x(), maxtc.y()));
primitives->push_back(lt); primitives->addElement(lt);
primitives->push_back(lb); primitives->addElement(lb);
primitives->push_back(rb); primitives->addElement(rb);
primitives->push_back(lt); primitives->addElement(lt);
primitives->push_back(rb); primitives->addElement(rb);
primitives->push_back(rt); primitives->addElement(rt);
primitives->dirty(); primitives->dirty();
} }
@ -291,7 +293,7 @@ void Text::computeGlyphRepresentation()
pitr != glyphquads._primitives.end(); pitr != glyphquads._primitives.end();
++pitr) ++pitr)
{ {
(*pitr)->clear(); (*pitr)->resizeElements(0);
(*pitr)->dirty(); (*pitr)->dirty();
} }
} }
@ -734,7 +736,7 @@ void Text::computeBackdropPositions()
{ {
GlyphQuads& glyphquad = titr->second; GlyphQuads& glyphquad = titr->second;
osg::DrawElementsUShort* src_primitives = glyphquad._primitives[0].get(); osg::DrawElements* src_primitives = glyphquad._primitives[0].get();
for(unsigned int i=glyphquad._primitives.size(); i<=backdrop_index; ++i) for(unsigned int i=glyphquad._primitives.size(); i<=backdrop_index; ++i)
{ {
@ -743,10 +745,10 @@ void Text::computeBackdropPositions()
glyphquad._primitives.push_back(dst_primitives); glyphquad._primitives.push_back(dst_primitives);
} }
osg::DrawElementsUShort* dst_primitives = glyphquad._primitives[backdrop_index].get(); osg::DrawElements* dst_primitives = glyphquad._primitives[backdrop_index].get();
dst_primitives->clear(); dst_primitives->resizeElements(0);
unsigned int numCoords = src_primitives->size(); unsigned int numCoords = src_primitives->getNumIndices();
Coords& src_coords = _coords; Coords& src_coords = _coords;
TexCoords& src_texcoords = _texcoords; TexCoords& src_texcoords = _texcoords;
@ -756,10 +758,10 @@ void Text::computeBackdropPositions()
for(unsigned int i=0;i<numCoords;++i) for(unsigned int i=0;i<numCoords;++i)
{ {
unsigned int si = (*src_primitives)[i]; unsigned int si = (*src_primitives).getElement(i);
osg::Vec3 v(horizontal_shift_direction * _backdropHorizontalOffset * avg_width + (*src_coords)[si].x(), vertical_shift_direction * _backdropVerticalOffset * avg_height + (*src_coords)[si].y(), 0.0f); osg::Vec3 v(horizontal_shift_direction * _backdropHorizontalOffset * avg_width + (*src_coords)[si].x(), vertical_shift_direction * _backdropVerticalOffset * avg_height + (*src_coords)[si].y(), 0.0f);
unsigned int di = dst_coords->size(); unsigned int di = dst_coords->size();
(*dst_primitives).push_back(di); (*dst_primitives).addElement(di);
(*dst_coords).push_back(v); (*dst_coords).push_back(v);
(*dst_texcoords).push_back((*src_texcoords)[si]); (*dst_texcoords).push_back((*src_texcoords)[si]);
} }
@ -1273,7 +1275,19 @@ void Text::accept(osg::PrimitiveFunctor& pf) const
const GlyphQuads& glyphquad = titr->second; const GlyphQuads& glyphquad = titr->second;
if (!glyphquad._primitives.empty()) if (!glyphquad._primitives.empty())
{ {
pf.drawElements(GL_TRIANGLES, glyphquad._primitives[0]->size(), &(glyphquad._primitives[0]->front())); const osg::DrawElementsUShort* drawElementsUShort = dynamic_cast<const osg::DrawElementsUShort*>(glyphquad._primitives[0].get());
if (drawElementsUShort)
{
pf.drawElements(GL_TRIANGLES, drawElementsUShort->size(), &(drawElementsUShort->front()));
}
else
{
const osg::DrawElementsUInt* drawElementsUInt = dynamic_cast<const osg::DrawElementsUInt*>(glyphquad._primitives[0].get());
if (drawElementsUInt)
{
pf.drawElements(GL_TRIANGLES, drawElementsUInt->size(), &(drawElementsUInt->front()));
}
}
} }
} }
} }