diff --git a/components/terrain/quadtreenode.cpp b/components/terrain/quadtreenode.cpp index 69f9b3fa49..7583cd09ff 100644 --- a/components/terrain/quadtreenode.cpp +++ b/components/terrain/quadtreenode.cpp @@ -108,7 +108,7 @@ void QuadTreeNode::initNeighbours() getChild(i)->initNeighbours(); } -void QuadTreeNode::traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist) +void QuadTreeNode::traverseNodes(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist) { if (!hasValidBounds()) return; @@ -124,7 +124,7 @@ void QuadTreeNode::traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallba else { for (unsigned int i=0; itraverse(vd, viewPoint, lodCallback, maxDist); + getChild(i)->traverseNodes(vd, viewPoint, lodCallback, maxDist); } } diff --git a/components/terrain/quadtreenode.hpp b/components/terrain/quadtreenode.hpp index 26eecd1097..9aaf1beab7 100644 --- a/components/terrain/quadtreenode.hpp +++ b/components/terrain/quadtreenode.hpp @@ -92,7 +92,7 @@ namespace Terrain const osg::Vec2f& getCenter() const; /// Traverse nodes according to LOD selection. - void traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist); + void traverseNodes(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist); /// Traverse to a specific node and add only that node. void traverseTo(ViewData* vd, float size, const osg::Vec2f& center); diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp index b2cb7a3b80..e8089e1c4d 100644 --- a/components/terrain/quadtreeworld.cpp +++ b/components/terrain/quadtreeworld.cpp @@ -353,7 +353,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv) mRootNode->traverseTo(vd, 1, osg::Vec2f(x+0.5,y+0.5)); } else - mRootNode->traverse(vd, cv->getViewPoint(), mLodCallback, mViewDistance); + mRootNode->traverseNodes(vd, cv->getViewPoint(), mLodCallback, mViewDistance); } else { @@ -446,7 +446,7 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, std::atomic ViewData* vd = static_cast(view); vd->setViewPoint(viewPoint); - mRootNode->traverse(vd, viewPoint, mLodCallback, mViewDistance); + mRootNode->traverseNodes(vd, viewPoint, mLodCallback, mViewDistance); for (unsigned int i=0; igetNumEntries() && !abort; ++i) {