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

Cleaned out old code paths

Browse Source
This commit is contained in:
Robert Osfield
2017-03-09 17:33:38 +00:00
parent 96760970ed
commit 2cad221d80
4 changed files with 2 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgText/TextBase.cpp
View File

@@ -103,11 +103,8 @@ void TextBase::initArraysAndBuffers()
_texcoords->setBufferObject(_vbo.get());
}
#ifdef NEW_APPROACH
osg::VertexArrayState* TextBase::createVertexArrayState(osg::RenderInfo& renderInfo) const
{
OSG_NOTICE<<"TextBase::createVertexArrayState()"<<std::endl;
State& state = *renderInfo.getState();
VertexArrayState* vas = new osg::VertexArrayState(&state);
@@ -122,18 +119,17 @@ osg::VertexArrayState* TextBase::createVertexArrayState(osg::RenderInfo& renderI
if (state.useVertexArrayObject(_useVertexArrayObject))
{
OSG_NOTICE<<" Setup VertexArrayState to use VAO "<<vas<<std::endl;
OSG_INFO<<"TextBase::createVertexArrayState() Setup VertexArrayState to use VAO "<<vas<<std::endl;
vas->generateVertexArrayObject();
}
else
{
OSG_NOTICE<<" Setup VertexArrayState to without using VAO "<<vas<<std::endl;
OSG_INFO<<"TextBase::createVertexArrayState() Setup VertexArrayState to without using VAO "<<vas<<std::endl;
}
return vas;
}
#endif
void TextBase::compileGLObjects(osg::RenderInfo& renderInfo) const
{