From f72e0937141965e6100c8754bb512f8e7018cf5e Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Tue, 10 Nov 2020 16:20:25 +0000
Subject: [PATCH] WS3.0: Replace OSG 3.6 methods with OSG 3.4

---
 simgear/scene/tgdb/VPBTechnique.cxx | 25 ++++++++-----------------
 simgear/scene/tgdb/VPBTechnique.hxx |  4 ++--
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/simgear/scene/tgdb/VPBTechnique.cxx b/simgear/scene/tgdb/VPBTechnique.cxx
index 3d76f07a..080c7bc2 100644
--- a/simgear/scene/tgdb/VPBTechnique.cxx
+++ b/simgear/scene/tgdb/VPBTechnique.cxx
@@ -1482,9 +1482,9 @@ void VPBTechnique::applyTransparency(BufferData& buffer)
 
 }
 
-void VPBTechnique::update(osgUtil::UpdateVisitor* uv)
+void VPBTechnique::update(osg::NodeVisitor& nv)
 {
-    if (_terrainTile) _terrainTile->osg::Group::traverse(*uv);
+    if (_terrainTile) _terrainTile->osg::Group::traverse(nv);
 
     if (_newBufferData.valid())
     {
@@ -1494,13 +1494,13 @@ void VPBTechnique::update(osgUtil::UpdateVisitor* uv)
 }
 
 
-void VPBTechnique::cull(osgUtil::CullVisitor* cv)
+void VPBTechnique::cull(osg::NodeVisitor& nv)
 {
     if (_currentBufferData.valid())
     {
         if (_currentBufferData->_transform.valid())
         {
-            _currentBufferData->_transform->accept(*cv);
+            _currentBufferData->_transform->accept(nv);
         }
     }
 }
@@ -1514,22 +1514,13 @@ void VPBTechnique::traverse(osg::NodeVisitor& nv)
     if (nv.getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR)
     {
         if (_terrainTile->getDirty()) _terrainTile->init(_terrainTile->getDirtyMask(), false);
-
-        osgUtil::UpdateVisitor* uv = nv.asUpdateVisitor();
-        if (uv)
-        {
-            update(uv);
-            return;
-        }
+        update(nv);
+        return;
     }
     else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR)
     {
-        osgUtil::CullVisitor* cv = nv.asCullVisitor();
-        if (cv)
-        {
-            cull(cv);
-            return;
-        }
+        cull(nv);
+        return;
     }
 
 
diff --git a/simgear/scene/tgdb/VPBTechnique.hxx b/simgear/scene/tgdb/VPBTechnique.hxx
index 75cbab30..958011f4 100644
--- a/simgear/scene/tgdb/VPBTechnique.hxx
+++ b/simgear/scene/tgdb/VPBTechnique.hxx
@@ -49,9 +49,9 @@ class VPBTechnique : public TerrainTechnique
         virtual Locator* computeMasterLocator();
 
 
-        virtual void update(osgUtil::UpdateVisitor* nv);
+        virtual void update(osg::NodeVisitor& nv);
 
-        virtual void cull(osgUtil::CullVisitor* nv);
+        virtual void cull(osg::NodeVisitor& nv);
 
         /** Traverse the terain subgraph.*/
         virtual void traverse(osg::NodeVisitor& nv);