From dc2689f7797d2477f4c8b4a2d5404ef83d4a1ba4 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 20 Jan 2017 21:08:02 +0100 Subject: [PATCH] TextureVisitor: remove redundant code for Geode handling --- include/osgUtil/Optimizer | 1 - src/osgUtil/Optimizer.cpp | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 4113f4589..032952259 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -626,7 +626,6 @@ class OSGUTIL_EXPORT Optimizer _changeClientImageStorage(changeClientImageStorage), _valueClientImageStorage(valueClientImageStorage), _changeAnisotropy(changeAnisotropy), _valueAnisotropy(valueAnisotropy) {} - virtual void apply(osg::Geode& node); virtual void apply(osg::Node& node); void apply(osg::StateSet& stateset); diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 4f442d4cd..42ad887d7 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -2968,33 +2968,6 @@ void Optimizer::TextureVisitor::apply(osg::Node& node) traverse(node); } -void Optimizer::TextureVisitor::apply(osg::Geode& geode) -{ - if (!isOperationPermissibleForObject(&geode)) return; - - osg::StateSet* ss = geode.getStateSet(); - - if (ss && isOperationPermissibleForObject(ss)) - { - apply(*ss); - } - - for(unsigned int i=0;igetStateSet(); - if (ss && - isOperationPermissibleForObject(drawable) && - isOperationPermissibleForObject(ss)) - { - apply(*ss); - } - } - } -} - void Optimizer::TextureVisitor::apply(osg::StateSet& stateset) { for(unsigned int i=0;i