FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WS3.0: Replace OSG 3.6 methods with OSG 3.4

Browse Source
This commit is contained in:
Stuart Buchanan
2020-11-10 16:20:25 +00:00
parent 8d5428bf77
commit f72e093714
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/tgdb/VPBTechnique.cxx
+8 -17
View File
@@ -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()) 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.valid())
{ {
if (_currentBufferData->_transform.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 (nv.getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR)
{ {
if (_terrainTile->getDirty()) _terrainTile->init(_terrainTile->getDirtyMask(), false); if (_terrainTile->getDirty()) _terrainTile->init(_terrainTile->getDirtyMask(), false);
update(nv);
osgUtil::UpdateVisitor* uv = nv.asUpdateVisitor(); return;
if (uv)
{
update(uv);
return;
}
} }
else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR) else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR)
{ {
osgUtil::CullVisitor* cv = nv.asCullVisitor(); cull(nv);
if (cv) return;
{
cull(cv);
return;
}
} }
simgear/scene/tgdb/VPBTechnique.hxx
+2 -2
View File
@@ -49,9 +49,9 @@ class VPBTechnique : public TerrainTechnique
virtual Locator* computeMasterLocator(); 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.*/ /** Traverse the terain subgraph.*/
virtual void traverse(osg::NodeVisitor& nv); virtual void traverse(osg::NodeVisitor& nv);