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

Refactored osgText::Tex3D to use a single vertex and normal arrays and a combined set of primitive sets. Deprecated Text3D::RenderMode as it's no longer used.

Browse Source
This commit is contained in:
Robert Osfield 2017-03-02 16:11:10 +00:00
parent 4721651dbe
commit a69216a79d
2 changed files with 38 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/osgText/Text3D
View File

@ -25,13 +25,7 @@ class OSGTEXT_EXPORT Text3D : public osgText::TextBase
{
public:
/** Reder mode used to render the Text.
* PER_FACE : render all front face with the default StateSet
* all wall face with the wall StateSet
* all back face with the back StateSet (back face of the character, no the OpenGL back face)
*
* PER_GLYPH : render all Charactere with the default StateSet
*/
/** Deprecated.*/
enum RenderMode
{
PER_FACE,
@ -49,10 +43,10 @@ class OSGTEXT_EXPORT Text3D : public osgText::TextBase
/** Set the Charactere Depth of text. */
void setCharacterDepth(float characterDepth);
/** Get the render mode used to render the text. */
/** Deprecated, value is now ignored. */
RenderMode getRenderMode() const { return _renderMode; }
/** Set the render mode used to render the text. */
void setRenderMode(RenderMode renderMode) { _renderMode = renderMode; computeGlyphRepresentation(); }
/** Deprecated, value is now ignored. */
void setRenderMode(RenderMode renderMode) { _renderMode = renderMode; }
/** Get the wall StateSet */
@ -120,13 +114,12 @@ class OSGTEXT_EXPORT Text3D : public osgText::TextBase
virtual ~Text3D() {}
void renderPerGlyph(osg::State & state) const;
void renderPerFace(osg::State & state) const;
String::iterator computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last);
void computeGlyphRepresentation();
void copyAndOffsetPrimitiveSets(osg::Geometry::PrimitiveSetList& dest_PrimitiveSetList, osg::Geometry::PrimitiveSetList& src_PrimitiveSetList, unsigned int offset);
osg::Geometry::PrimitiveSetList _frontPrimitiveSetList;
osg::Geometry::PrimitiveSetList _wallPrimitiveSetList;
osg::Geometry::PrimitiveSetList _backPrimitiveSetList;
@ -147,7 +140,7 @@ class OSGTEXT_EXPORT Text3D : public osgText::TextBase
TextRenderInfo _textRenderInfo;
// deprecated value no longer used.
RenderMode _renderMode;
osg::ref_ptr<osg::StateSet> _wallStateSet;

258
src/osgText/Text3D.cpp
View File

@ -245,7 +245,7 @@ String::iterator Text3D::computeLastCharacterOnLine(osg::Vec2& cursor, String::i
return lastChar;
}
inline void copyAndOffsetPrimitiveSets(osg::Geometry::PrimitiveSetList& dest_PrimitiveSetList, osg::Geometry::PrimitiveSetList& src_PrimitiveSetList, unsigned int offset)
void Text3D::copyAndOffsetPrimitiveSets(osg::Geometry::PrimitiveSetList& dest_PrimitiveSetList, osg::Geometry::PrimitiveSetList& src_PrimitiveSetList, unsigned int offset)
{
for(osg::Geometry::PrimitiveSetList::const_iterator pitr = src_PrimitiveSetList.begin();
@ -422,8 +422,6 @@ void Text3D::computeGlyphRepresentation()
computePositions();
#ifdef NEW_APPROACH
if (!_coords) _coords = new osg::Vec3Array;
if (!_normals) _normals = new osg::Vec3Array;
@ -462,12 +460,6 @@ void Text3D::computeGlyphRepresentation()
}
}
OSG_NOTICE<<"_coords.size()=="<<_coords->size()<<std::endl;
OSG_NOTICE<<"_frontPrimitiveSetList.size()=="<<_frontPrimitiveSetList.size()<<std::endl;
OSG_NOTICE<<"_wallPrimitiveSetList.size()=="<<_wallPrimitiveSetList.size()<<std::endl;
OSG_NOTICE<<"_backPrimitiveSetList.size()=="<<_backPrimitiveSetList.size()<<std::endl;
#endif
// set up the vertices for any boundinbox or alignment decoration
setupDecoration();
@ -548,11 +540,37 @@ void Text3D::drawImplementation(osg::RenderInfo& renderInfo) const
renderInfo.getState()->applyMode(GL_NORMALIZE, true);
#endif
switch(_renderMode)
const osg::StateSet* frontStateSet = getStateSet();
const osg::StateSet* wallStateSet = getWallStateSet();
const osg::StateSet* backStateSet = getBackStateSet();
if (wallStateSet==0) wallStateSet = frontStateSet;
if (backStateSet==0) backStateSet = frontStateSet;
state.lazyDisablingOfVertexAttributes();
state.setVertexPointer(_coords.get());
state.setNormalPointer(_normals.get());
state.applyDisablingOfVertexAttributes();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_frontPrimitiveSetList.begin(), end = _frontPrimitiveSetList.end(); itr!=end; ++itr)
{
case PER_FACE: renderPerFace(*renderInfo.getState()); break;
case PER_GLYPH:
default: renderPerGlyph(*renderInfo.getState()); break;
(*itr)->draw(state, false);
}
if (wallStateSet!=frontStateSet) state.apply(wallStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_wallPrimitiveSetList.begin(), end = _wallPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (backStateSet!=wallStateSet) state.apply(backStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_backPrimitiveSetList.begin(), end = _backPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
}
@ -563,220 +581,6 @@ void Text3D::drawImplementation(osg::RenderInfo& renderInfo) const
}
}
void Text3D::renderPerGlyph(osg::State & state) const
{
osg::Matrix original_modelview = state.getModelViewMatrix();
const osg::StateSet* frontStateSet = getStateSet();
const osg::StateSet* wallStateSet = getWallStateSet();
const osg::StateSet* backStateSet = getBackStateSet();
if (wallStateSet==0) wallStateSet = frontStateSet;
if (backStateSet==0) backStateSet = frontStateSet;
state.Color(_color.r(),_color.g(),_color.b(),_color.a());
#ifdef NEW_APPROACH
// OSG_NOTICE<<"Text3D::renderPerGlyph"<<std::endl;
state.lazyDisablingOfVertexAttributes();
state.setVertexPointer(_coords.get());
state.setNormalPointer(_normals.get());
state.applyDisablingOfVertexAttributes();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_frontPrimitiveSetList.begin(), end = _frontPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (wallStateSet!=frontStateSet) state.apply(wallStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_wallPrimitiveSetList.begin(), end = _wallPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (backStateSet!=wallStateSet) state.apply(backStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_backPrimitiveSetList.begin(), end = _backPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
#else
// ** for each line, do ...
TextRenderInfo::const_iterator itLine, endText = _textRenderInfo.end();
for (itLine = _textRenderInfo.begin(); itLine!=endText; ++itLine)
{
// ** for each glyph in the line, do ...
LineRenderInfo::const_iterator it, endLine = itLine->end();
for (it = itLine->begin(); it!=endLine; ++it)
{
osg::Matrix matrix(original_modelview);
matrix.preMultTranslate(osg::Vec3d(it->_position.x(), it->_position.y(), it->_position.z()));
state.applyModelViewMatrix(matrix);
state.lazyDisablingOfVertexAttributes();
// ** apply the vertex array
state.setVertexPointer(it->_glyphGeometry->getVertexArray());
state.setNormalPointer(it->_glyphGeometry->getNormalArray());
state.applyDisablingOfVertexAttributes();
if (frontStateSet!=backStateSet) state.apply(frontStateSet);
osg::Geometry::PrimitiveSetList & pslFront = it->_glyphGeometry->getFrontPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslFront.begin(), end = pslFront.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (wallStateSet!=frontStateSet) state.apply(wallStateSet);
// ** render the wall face of the glyph
osg::Geometry::PrimitiveSetList & pslWall = it->_glyphGeometry->getWallPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslWall.begin(), end=pslWall.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (backStateSet!=wallStateSet) state.apply(backStateSet);
osg::Geometry::PrimitiveSetList & pslBack = it->_glyphGeometry->getBackPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslBack.begin(), end=pslBack.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
}
}
#endif
}
void Text3D::renderPerFace(osg::State & state) const
{
osg::Matrix original_modelview = state.getModelViewMatrix();
const osg::StateSet* frontStateSet = getStateSet();
const osg::StateSet* wallStateSet = getWallStateSet();
const osg::StateSet* backStateSet = getBackStateSet();
if (wallStateSet==0) wallStateSet = frontStateSet;
if (backStateSet==0) backStateSet = frontStateSet;
#ifdef NEW_APPROACH
// OSG_NOTICE<<"Text3D::renderPerFace"<<std::endl;
state.lazyDisablingOfVertexAttributes();
state.setVertexPointer(_coords.get());
state.setNormalPointer(_normals.get());
state.applyDisablingOfVertexAttributes();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_frontPrimitiveSetList.begin(), end = _frontPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (wallStateSet!=frontStateSet) state.apply(wallStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_wallPrimitiveSetList.begin(), end = _wallPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
if (backStateSet!=wallStateSet) state.apply(backStateSet);
for(osg::Geometry::PrimitiveSetList::const_iterator itr=_backPrimitiveSetList.begin(), end = _backPrimitiveSetList.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
#else
TextRenderInfo::const_iterator itLine, endText = _textRenderInfo.end();
for (itLine = _textRenderInfo.begin(); itLine!=endText; ++itLine)
{
// ** for each glyph in the line, do ...
LineRenderInfo::const_iterator it, endLine = itLine->end();
for (it = itLine->begin(); it!=endLine; ++it)
{
state.setVertexPointer(it->_glyphGeometry->getVertexArray());
state.setNormalPointer(it->_glyphGeometry->getNormalArray());
osg::Matrix matrix(original_modelview);
matrix.preMultTranslate(osg::Vec3d(it->_position.x(), it->_position.y(), it->_position.z()));
state.applyModelViewMatrix(matrix);
// ** render the front face of the glyph
osg::Geometry::PrimitiveSetList & psl = it->_glyphGeometry->getFrontPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=psl.begin(), end=psl.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
}
}
if (wallStateSet!=frontStateSet) state.apply(wallStateSet);
// ** render all wall face of the text
for (itLine = _textRenderInfo.begin(); itLine!=endText; ++itLine)
{
// ** for each glyph in the line, do ...
LineRenderInfo::const_iterator it, endLine = itLine->end();
for (it = itLine->begin(); it!=endLine; ++it)
{
state.setVertexPointer(it->_glyphGeometry->getVertexArray());
state.setNormalPointer(it->_glyphGeometry->getNormalArray());
osg::Matrix matrix(original_modelview);
matrix.preMultTranslate(osg::Vec3d(it->_position.x(), it->_position.y(), it->_position.z()));
state.applyModelViewMatrix(matrix);
const osg::Geometry::PrimitiveSetList & psl = it->_glyphGeometry->getWallPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=psl.begin(), end=psl.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
}
}
if (backStateSet!=wallStateSet) state.apply(backStateSet);
for (itLine = _textRenderInfo.begin(); itLine!=endText; ++itLine)
{
// ** for each glyph in the line, do ...
LineRenderInfo::const_iterator it, endLine = itLine->end();
for (it = itLine->begin(); it!=endLine; ++it)
{
state.setVertexPointer(it->_glyphGeometry->getVertexArray());
state.setNormalPointer(it->_glyphGeometry->getNormalArray());
osg::Matrix matrix(original_modelview);
matrix.preMultTranslate(osg::Vec3d(it->_position.x(), it->_position.y(), it->_position.z()));
state.applyModelViewMatrix(matrix);
// ** render the back face of the glyph
const osg::Geometry::PrimitiveSetList & psl = it->_glyphGeometry->getBackPrimitiveSetList();
for(osg::Geometry::PrimitiveSetList::const_iterator itr=psl.begin(), end=psl.end(); itr!=end; ++itr)
{
(*itr)->draw(state, false);
}
}
}
#endif
}
void Text3D::setThreadSafeRefUnref(bool threadSafe)
{
TextBase::setThreadSafeRefUnref(threadSafe);