mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 11:53:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2588 from elsid/fix_warning

Browse source 
Fix warning -Woverloaded-virtual
This commit is contained in:
Andrei Kortunov 2019-11-05 13:13:22 +04:00 committed by GitHub
commit 5ede09a6cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/terrain/quadtreenode.cpp
View file

@ -108,7 +108,7 @@ void QuadTreeNode::initNeighbours()
getChild(i)->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()) if (!hasValidBounds())
return; return;
@ -124,7 +124,7 @@ void QuadTreeNode::traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallba
else else
{ {
for (unsigned int i=0; i<getNumChildren(); ++i) for (unsigned int i=0; i<getNumChildren(); ++i)
getChild(i)->traverse(vd, viewPoint, lodCallback, maxDist); getChild(i)->traverseNodes(vd, viewPoint, lodCallback, maxDist);
} }
} }

2
components/terrain/quadtreenode.hpp
View file

@ -92,7 +92,7 @@ namespace Terrain
const osg::Vec2f& getCenter() const; const osg::Vec2f& getCenter() const;
/// Traverse nodes according to LOD selection. /// 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. /// Traverse to a specific node and add only that node.
void traverseTo(ViewData* vd, float size, const osg::Vec2f& center); void traverseTo(ViewData* vd, float size, const osg::Vec2f& center);

4
components/terrain/quadtreeworld.cpp
View file

@ -353,7 +353,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
mRootNode->traverseTo(vd, 1, osg::Vec2f(x+0.5,y+0.5)); mRootNode->traverseTo(vd, 1, osg::Vec2f(x+0.5,y+0.5));
} }
else else
mRootNode->traverse(vd, cv->getViewPoint(), mLodCallback, mViewDistance); mRootNode->traverseNodes(vd, cv->getViewPoint(), mLodCallback, mViewDistance);
} }
else else
{ {
@ -446,7 +446,7 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, std::atomic
ViewData* vd = static_cast<ViewData*>(view); ViewData* vd = static_cast<ViewData*>(view);
vd->setViewPoint(viewPoint); vd->setViewPoint(viewPoint);
mRootNode->traverse(vd, viewPoint, mLodCallback, mViewDistance); mRootNode->traverseNodes(vd, viewPoint, mLodCallback, mViewDistance);
for (unsigned int i=0; i<vd->getNumEntries() && !abort; ++i) for (unsigned int i=0; i<vd->getNumEntries() && !abort; ++i)
{ {