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

Remove seemingly redundant handling of Geode in GLObjectsVisitor

Browse Source
This commit is contained in:
scrawl 2017-02-03 18:10:37 +01:00
parent fdf6d55b9d
commit 6deefe0646
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgUtil/GLObjectsVisitor
View File

@ -94,11 +94,6 @@ class OSGUTIL_EXPORT GLObjectsVisitor : public osg::NodeVisitor
/** Simply traverse using standard NodeVisitor traverse method.*/ /** Simply traverse using standard NodeVisitor traverse method.*/
virtual void apply(osg::Node& node); virtual void apply(osg::Node& node);
/** For each Geode visited set the display list usage according to the
* _displayListMode.
*/
virtual void apply(osg::Geode& node);
void apply(osg::Drawable& drawable); void apply(osg::Drawable& drawable);
void apply(osg::StateSet& stateset); void apply(osg::StateSet& stateset);

22
src/osgUtil/GLObjectsVisitor.cpp
View File

@ -53,28 +53,6 @@ void GLObjectsVisitor::apply(osg::Node& node)
} }
} }
void GLObjectsVisitor::apply(osg::Geode& node)
{
bool programSetBefore = _lastCompiledProgram.valid();
if (node.getStateSet())
{
apply(*(node.getStateSet()));
}
traverse(node);
bool programSetAfter = _lastCompiledProgram.valid();
if (!programSetBefore && programSetAfter)
{
osg::State* state = _renderInfo.getState();
osg::GLExtensions* extensions = state->get<osg::GLExtensions>();
extensions->glUseProgram(0);
state->setLastAppliedProgramObject(0);
_lastCompiledProgram = 0;
}
}
void GLObjectsVisitor::apply(osg::Drawable& drawable) void GLObjectsVisitor::apply(osg::Drawable& drawable)
{ {
if (_drawablesAppliedSet.count(&drawable)!=0) return; if (_drawablesAppliedSet.count(&drawable)!=0) return;