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

Replaced osg::DrawElementeUInt usage for a more flexible DrawElements base class approach with the default set to DrawElementUShort to ensure compatibility with GLES2 implementes that don't support uint for glDrawElements.

Browse Source
This commit is contained in:
Robert Osfield
2017-05-25 10:41:12 +01:00
parent 10c1fedfca
commit 8b433f8364
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgText/Text
View File

@@ -313,7 +313,7 @@ public:
osg::buffered_object<Coords3> _transformedBackdropCoords[8]; osg::buffered_object<Coords3> _transformedBackdropCoords[8];
ColorCoords _colorCoords; ColorCoords _colorCoords;
osg::ref_ptr<osg::DrawElementsUInt> _quadIndices; osg::ref_ptr<osg::DrawElements> _quadIndices;
void updateQuadIndices(); void updateQuadIndices();
GlyphQuads(); GlyphQuads();

29
src/osgText/Text.cpp
View File

@@ -2091,26 +2091,33 @@ void Text::GlyphQuads::initGlyphQuads()
} }
} }
_quadIndices = new DrawElementsUInt(PrimitiveSet::TRIANGLES); _quadIndices = new DrawElementsUShort(PrimitiveSet::TRIANGLES);
} }
void Text::GlyphQuads::updateQuadIndices() void Text::GlyphQuads::updateQuadIndices()
{ {
_quadIndices->clear(); unsigned int numCoords = _coords->size();
if (_coords->size() % 4 != 0) unsigned int numQuads = numCoords/4;
unsigned int numVertices = numQuads*6;
if (numCoords % 4 != 0)
{ {
OSG_WARN << "size of _coords is not divisible by 4."; OSG_WARN << "size of _coords is not divisible by 4.";
} }
for (unsigned int i = 0; i < (unsigned int)_coords->size(); i += 4)
{
_quadIndices->push_back(i);
_quadIndices->push_back(i + 1);
_quadIndices->push_back(i + 3);
_quadIndices->push_back(i + 1); _quadIndices->resizeElements(numVertices);
_quadIndices->push_back(i + 2);
_quadIndices->push_back(i + 3); unsigned int vi=0;
for (unsigned int i = 0; i < numCoords; i += 4)
{
_quadIndices->setElement(vi++, i);
_quadIndices->setElement(vi++, i + 1);
_quadIndices->setElement(vi++, i + 3);
_quadIndices->setElement(vi++, i + 1);
_quadIndices->setElement(vi++, i + 2);
_quadIndices->setElement(vi++, i + 3);
} }
} }