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

Removed unneccessary mutable usage

Browse Source
This commit is contained in:
Robert Osfield 2017-03-02 17:05:24 +00:00
parent 1e36a12a17
commit 59931d1591
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgText/Text
View File

@ -331,7 +331,7 @@ public:
/** Direct Access to GlyphQuads */ /** Direct Access to GlyphQuads */
const GlyphQuads* getGlyphQuads(GlyphTexture* texture) const const GlyphQuads* getGlyphQuads(GlyphTexture* texture) const
{ {
TextureGlyphQuadMap::iterator itGlyphQuad = _textureGlyphQuadMap.find(texture); TextureGlyphQuadMap::const_iterator itGlyphQuad = _textureGlyphQuadMap.find(texture);
if (itGlyphQuad == _textureGlyphQuadMap.end()) return NULL; if (itGlyphQuad == _textureGlyphQuadMap.end()) return NULL;
return &itGlyphQuad->second; return &itGlyphQuad->second;
@ -356,7 +356,7 @@ protected:
// members which have public access. // members which have public access.
// iternal map used for rendering. Set up by the computeGlyphRepresentation() method. // iternal map used for rendering. Set up by the computeGlyphRepresentation() method.
mutable TextureGlyphQuadMap _textureGlyphQuadMap; TextureGlyphQuadMap _textureGlyphQuadMap;
void computeGlyphRepresentation(); void computeGlyphRepresentation();

18
src/osgText/Text.cpp
View File

@ -1259,7 +1259,7 @@ void Text::releaseGLObjects(osg::State* state) const
getActiveFont()->releaseGLObjects(state); getActiveFont()->releaseGLObjects(state);
for(TextureGlyphQuadMap::iterator itr = _textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator itr = _textureGlyphQuadMap.begin();
itr != _textureGlyphQuadMap.end(); itr != _textureGlyphQuadMap.end();
++itr) ++itr)
{ {
@ -1359,7 +1359,7 @@ void Text::drawForegroundText(osg::State& state, const GlyphQuads& glyphquad, co
void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMultiplier) const void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMultiplier) const
{ {
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1405,7 +1405,7 @@ void Text::drawTextWithBackdrop(osg::State& state, const osg::Vec4& colorMultipl
state.setVertexPointer(_coords.get()); state.setVertexPointer(_coords.get());
state.setTexCoordPointer( 0, _texcoords.get()); state.setTexCoordPointer( 0, _texcoords.get());
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1461,7 +1461,7 @@ void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMult
glPushAttrib(GL_POLYGON_OFFSET_FILL); glPushAttrib(GL_POLYGON_OFFSET_FILL);
glEnable(GL_POLYGON_OFFSET_FILL); glEnable(GL_POLYGON_OFFSET_FILL);
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1517,7 +1517,7 @@ void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMult
state.setVertexPointer(_coords.get()); state.setVertexPointer(_coords.get());
state.setTexCoordPointer( 0, _texcoords.get()); state.setTexCoordPointer( 0, _texcoords.get());
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1572,7 +1572,7 @@ void Text::renderWithDepthRange(osg::State& state, const osg::Vec4& colorMultipl
state.setVertexPointer(_coords.get()); state.setVertexPointer(_coords.get());
state.setTexCoordPointer( 0, _texcoords.get()); state.setTexCoordPointer( 0, _texcoords.get());
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1633,8 +1633,6 @@ void Text::renderWithStencilBuffer(osg::State& state, const osg::Vec4& colorMult
* 7c) If priority levels are different, then make sure the foreground * 7c) If priority levels are different, then make sure the foreground
* text has the higher priority. * text has the higher priority.
*/ */
TextureGlyphQuadMap::iterator titr; // Moved up here for VC6
glPushAttrib(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_STENCIL_TEST); glPushAttrib(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_STENCIL_TEST);
// It seems I can get away without calling this here // It seems I can get away without calling this here
@ -1667,7 +1665,7 @@ void Text::renderWithStencilBuffer(osg::State& state, const osg::Vec4& colorMult
// Draw all the text to the stencil buffer to mark out the region // Draw all the text to the stencil buffer to mark out the region
// that we can write too. // that we can write too.
for(titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {
@ -1726,7 +1724,7 @@ void Text::renderWithStencilBuffer(osg::State& state, const osg::Vec4& colorMult
// Draw all the text again // Draw all the text again
for(titr=_textureGlyphQuadMap.begin(); for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end(); titr!=_textureGlyphQuadMap.end();
++titr) ++titr)
{ {