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

Scaled back the primitives sets set up so they match the requirements of the osgText::Text accordinging to the BackdropType

Browse Source
This commit is contained in:
Robert Osfield
2017-02-24 18:25:16 +00:00
parent a84a6bd309
commit 8adbf322a0
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgText/Text
View File

@@ -23,6 +23,8 @@
namespace osgText {
// #define NEW_APPROACH
class OSGTEXT_EXPORT Text : public osgText::TextBase
{
public:
@@ -313,7 +315,6 @@ public:
Primitives _primitives;
void updatePrimitives();
GlyphQuads();
GlyphQuads(const GlyphQuads& gq);
@@ -321,6 +322,8 @@ public:
void initGlyphQuads();
void initGPUBufferObjects();
void setupPrimitives(Text::BackdropType backdropType);
Glyphs& getGlyphs() { return _glyphs; }
const Glyphs& getGlyphs() const { return _glyphs; }

57
src/osgText/Text.cpp
View File

@@ -241,26 +241,6 @@ void Text::addGlyphQuad(Glyph* glyph, const osg::Vec2& minc, const osg::Vec2& ma
glyphquad.addTexCoord(osg::Vec2(mintc.x(), mintc.y()));
glyphquad.addTexCoord(osg::Vec2(maxtc.x(), mintc.y()));
glyphquad.addTexCoord(osg::Vec2(maxtc.x(), maxtc.y()));
// move the cursor onto the next character.
// also expand bounding box
switch(_layout)
{
case LEFT_TO_RIGHT:
cursor.x() += glyph->getHorizontalAdvance() * wr;
_textBB.expandBy(osg::Vec3(lowLeft.x(), lowLeft.y(), 0.0f)); //lower left corner
_textBB.expandBy(osg::Vec3(upRight.x(), upRight.y(), 0.0f)); //upper right corner
break;
case VERTICAL:
cursor.y() -= glyph->getVerticalAdvance() * hr;
_textBB.expandBy(osg::Vec3(upLeft.x(),upLeft.y(),0.0f)); //upper left corner
_textBB.expandBy(osg::Vec3(lowRight.x(),lowRight.y(),0.0f)); //lower right corner
break;
case RIGHT_TO_LEFT:
_textBB.expandBy(osg::Vec3(lowRight.x(),lowRight.y(),0.0f)); //lower right corner
_textBB.expandBy(osg::Vec3(upLeft.x(),upLeft.y(),0.0f)); //upper left corner
break;
}
}
void Text::computeGlyphRepresentation()
@@ -476,6 +456,26 @@ void Text::computeGlyphRepresentation()
addGlyphQuad(glyph, minc, maxc, mintc, maxtc);
// move the cursor onto the next character.
// also expand bounding box
switch(_layout)
{
case LEFT_TO_RIGHT:
cursor.x() += glyph->getHorizontalAdvance() * wr;
_textBB.expandBy(osg::Vec3(minc.x(), minc.y(), 0.0f)); //lower left corner
_textBB.expandBy(osg::Vec3(maxc.x(), maxc.y(), 0.0f)); //upper right corner
break;
case VERTICAL:
cursor.y() -= glyph->getVerticalAdvance() * hr;
_textBB.expandBy(osg::Vec3(minc.x(),maxc.y(),0.0f)); //upper left corner
_textBB.expandBy(osg::Vec3(maxc.x(),minc.y(),0.0f)); //lower right corner
break;
case RIGHT_TO_LEFT:
_textBB.expandBy(osg::Vec3(maxc.x(),minc.y(),0.0f)); //lower right corner
_textBB.expandBy(osg::Vec3(minc.x(),maxc.y(),0.0f)); //upper left corner
break;
}
previous_charcode = charcode;
}
}
@@ -525,7 +525,7 @@ void Text::computeGlyphRepresentation()
titr!=_textureGlyphQuadMap.end();
++titr)
{
titr->second.updatePrimitives();
titr->second.setupPrimitives(_backdropType);
if (_useVertexBufferObjects)
{
titr->second.initGPUBufferObjects();
@@ -1824,8 +1824,6 @@ void Text::GlyphQuads::initGlyphQuads()
_texcoords = new osg::Vec2Array();
_colorCoords = new osg::Vec4Array();
_primitives.push_back(new DrawElementsUShort(PrimitiveSet::TRIANGLES));
for (int j = 0; j < 8; j++)
{
_transformedBackdropCoords[j] = new osg::Vec3Array();
@@ -1834,8 +1832,19 @@ void Text::GlyphQuads::initGlyphQuads()
}
void Text::GlyphQuads::updatePrimitives()
void Text::GlyphQuads::setupPrimitives(BackdropType backdropType)
{
_primitives.clear();
unsigned int numPrimtives = 1;
if (backdropType==Text::OUTLINE) numPrimtives += 8;
if (backdropType!=Text::NONE) numPrimtives += 1;
for(unsigned int i=0; i<numPrimtives; ++i)
{
_primitives.push_back(new DrawElementsUShort(PrimitiveSet::TRIANGLES));
}
for(Primitives::iterator itr = _primitives.begin();
itr != _primitives.end();
++itr)