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

Renamed the counter used to enable traversal order sorting

Browse Source
This commit is contained in:
Robert Osfield
2018-05-14 08:43:08 +01:00
parent 3bbbbd07ea
commit 510a231e14
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgUtil/CullVisitor.cpp
View File

@@ -50,6 +50,7 @@ CullVisitor::CullVisitor():
_currentRenderBin(NULL),
_computed_znear(FLT_MAX),
_computed_zfar(-FLT_MAX),
_traversalOrderNumber(0),
_currentReuseRenderLeafIndex(0),
_numberOfEncloseOverrideRenderBinDetails(0)
{
@@ -64,6 +65,7 @@ CullVisitor::CullVisitor(const CullVisitor& rhs):
_currentRenderBin(NULL),
_computed_znear(FLT_MAX),
_computed_zfar(-FLT_MAX),
_traversalOrderNumber(0),
_currentReuseRenderLeafIndex(0),
_numberOfEncloseOverrideRenderBinDetails(0),
_identifier(rhs._identifier)
@@ -101,8 +103,8 @@ void CullVisitor::reset()
_numberOfEncloseOverrideRenderBinDetails = 0;
// reset the traversal number
_traversalNumber = 0;
// reset the traversal order number
_traversalOrderNumber = 0;
// reset the calculated near far planes.
_computed_znear = FLT_MAX;

2
src/osgUtil/RenderBin.cpp
View File

@@ -334,7 +334,7 @@ struct TraversalOrderFunctor
{
bool operator() (const RenderLeaf* lhs,const RenderLeaf* rhs) const
{
return (lhs->_traversalNumber<rhs->_traversalNumber);
return (lhs->_traversalOrderNumber<rhs->_traversalOrderNumber);
}
};