diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 7b1bfa82a..6a6f09305 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -73,7 +73,7 @@ class OSGUTIL_EXPORT Optimizer COMBINE_ADJACENT_LODS = (1 << 3), SHARE_DUPLICATE_STATE = (1 << 4), MERGE_GEOMETRY = (1 << 5), - CHECK_GEOMETRY = (1 << 6), + CHECK_GEOMETRY = (1 << 6), // deprecated, currently no-op MAKE_FAST_GEOMETRY = (1 << 7), SPATIALIZE_GROUPS = (1 << 8), COPY_SHARED_NODES = (1 << 9), @@ -501,20 +501,6 @@ class OSGUTIL_EXPORT Optimizer }; - class OSGUTIL_EXPORT CheckGeometryVisitor : public BaseOptimizerVisitor - { - public: - - /// default to traversing all children. - CheckGeometryVisitor(Optimizer* optimizer=0): - BaseOptimizerVisitor(optimizer, CHECK_GEOMETRY) {} - - virtual void apply(osg::Geometry& geom); - - void checkGeode(osg::Geode& geode); - - }; - class OSGUTIL_EXPORT MakeFastGeometryVisitor : public BaseOptimizerVisitor { public: diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 6bfbcc607..b3ae72f07 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -50,8 +50,6 @@ using namespace osgUtil; -// #define GEOMETRYDEPRECATED - void Optimizer::reset() { } @@ -290,14 +288,6 @@ void Optimizer::optimize(osg::Node* node, unsigned int options) OSG_INFO<<"MERGE_GEODES took "<delta_s(startTick,endTick)<accept(mgv); - } - if (options & MAKE_FAST_GEOMETRY) { OSG_INFO<<"Optimizer::optimize() doing MAKE_FAST_GEOMETRY"<