diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index 8e76f8133..39597a842 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -13,13 +13,10 @@ #include -//#include -#include +#include namespace osgUtil { -typedef NewCullVisitor CullVisitor; - /** * SceneView is literally a view of a scene, encapsulating the * camera, global state, lights and the scene itself. Provides diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp index 3be1d02f1..6cfc8ee7e 100644 --- a/src/osgUtil/CullVisitor.cpp +++ b/src/osgUtil/CullVisitor.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include #include @@ -74,7 +74,7 @@ class PrintVisitor : public NodeVisitor int _step; }; -NewCullVisitor::NewCullVisitor() +CullVisitor::CullVisitor() { // overide the default node visitor mode. setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); @@ -105,13 +105,13 @@ NewCullVisitor::NewCullVisitor() } -NewCullVisitor::~NewCullVisitor() +CullVisitor::~CullVisitor() { reset(); } -void NewCullVisitor::reset() +void CullVisitor::reset() { // @@ -157,7 +157,7 @@ void NewCullVisitor::reset() } -void NewCullVisitor::pushClippingVolume() +void CullVisitor::pushClippingVolume() { _modelviewClippingVolumeStack.push_back(_projectionClippingVolumeStack.back()); if (!_modelviewStack.empty()) _modelviewClippingVolumeStack.back().transformProvidingInverse(*_modelviewStack.back()); @@ -165,25 +165,25 @@ void NewCullVisitor::pushClippingVolume() _MVPW_Stack.push_back(0L); } -void NewCullVisitor::popClippingVolume() +void CullVisitor::popClippingVolume() { _modelviewClippingVolumeStack.pop_back(); _MVPW_Stack.pop_back(); } -void NewCullVisitor::pushViewport(osg::Viewport* viewport) +void CullVisitor::pushViewport(osg::Viewport* viewport) { _viewportStack.push_back(viewport); _MVPW_Stack.push_back(0L); } -void NewCullVisitor::popViewport() +void CullVisitor::popViewport() { _viewportStack.pop_back(); _MVPW_Stack.pop_back(); } -void NewCullVisitor::pushProjectionMatrix(Matrix* matrix) +void CullVisitor::pushProjectionMatrix(Matrix* matrix) { _projectionStack.push_back(matrix); @@ -194,7 +194,7 @@ void NewCullVisitor::pushProjectionMatrix(Matrix* matrix) pushClippingVolume(); } -void NewCullVisitor::popProjectionMatrix() +void CullVisitor::popProjectionMatrix() { _projectionStack.pop_back(); _projectionClippingVolumeStack.pop_back(); @@ -202,7 +202,7 @@ void NewCullVisitor::popProjectionMatrix() popClippingVolume(); } -void NewCullVisitor::pushModelViewMatrix(Matrix* matrix) +void CullVisitor::pushModelViewMatrix(Matrix* matrix) { _modelviewStack.push_back(matrix); @@ -239,7 +239,7 @@ void NewCullVisitor::pushModelViewMatrix(Matrix* matrix) } -void NewCullVisitor::popModelViewMatrix() +void CullVisitor::popModelViewMatrix() { _modelviewStack.pop_back(); _eyePointStack.pop_back(); @@ -264,12 +264,12 @@ inline float distance(const osg::Vec3& coord,const osg::Matrix& matrix) } -void NewCullVisitor::updateCalculatedNearFar(const osg::BoundingBox& bb) +void CullVisitor::updateCalculatedNearFar(const osg::BoundingBox& bb) { if (!bb.isValid()) { - osg::notify(osg::WARN)<<"Warning: NewCullVisitor::updateCalculatedNearFar(..) passed a null bounding box."<< std::endl; + osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(..) passed a null bounding box."<< std::endl; return; } @@ -297,7 +297,7 @@ void NewCullVisitor::updateCalculatedNearFar(const osg::BoundingBox& bb) { if ( !EQUAL_F(d_near, d_far) ) { - osg::notify(osg::WARN)<<"Warning: NewCullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl; + osg::notify(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl; osg::notify(osg::WARN)<<" correcting by swapping values d_near="<