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

Implemented TextBase::compileGLObjects() with handling of VAO/VBOs to address bugs associated with VAO usage of Text.

Browse Source
This commit is contained in:
Robert Osfield 2020-01-07 11:12:18 +00:00
parent d1ff16614c
commit 605821e655
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/osgText/TextBase.cpp
View File

@ -139,7 +139,34 @@ osg::VertexArrayState* TextBase::createVertexArrayStateImplementation(osg::Rende
void TextBase::compileGLObjects(osg::RenderInfo& renderInfo) const
{
Drawable::compileGLObjects(renderInfo);
State& state = *renderInfo.getState();
if (renderInfo.getState()->useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects))
{
unsigned int contextID = state.getContextID();
GLExtensions* extensions = state.get<GLExtensions>();
if (state.useVertexArrayObject(_useVertexArrayObject))
{
VertexArrayState* vas = 0;
_vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo);
State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);
state.bindVertexArrayObject(vas);
drawImplementation(renderInfo);
state.unbindVertexArrayObject();
}
else
{
drawImplementation(renderInfo);
}
// unbind the BufferObjects
extensions->glBindBuffer(GL_ARRAY_BUFFER_ARB,0);
extensions->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,0);
}
}
void TextBase::resizeGLObjectBuffers(unsigned int maxSize)