mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 07:21:12 +00:00
Code Issues Projects Releases Wiki Activity

consolidate node mask checks (#3125)

Browse Source 
* consolidate node mask checks

This PR simplifies a few checks against node masks in object paging by using the osg provided `setTraversalMask`.

* objectpaging.cpp
This commit is contained in:
Bo Svensson 2021-09-21 20:39:31 +00:00 committed by GitHub
parent 786b6b7c9a
commit b22fb7a7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwrender/objectpaging.cpp
View File

@ -272,7 +272,7 @@ namespace MWRender
: osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
, mCurrentStateSet(nullptr) , mCurrentStateSet(nullptr)
, mCurrentDistance(0.f) , mCurrentDistance(0.f)
, mAnalyzeMask(analyzeMask) {} { setTraversalMask(analyzeMask); }
typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter; typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
struct Result struct Result
@ -283,9 +283,6 @@ namespace MWRender
void apply(osg::Node& node) override void apply(osg::Node& node) override
{ {
if (!(node.getNodeMask() & mAnalyzeMask))
return;
if (node.getStateSet()) if (node.getStateSet())
mCurrentStateSet = node.getStateSet(); mCurrentStateSet = node.getStateSet();
@ -308,9 +305,6 @@ namespace MWRender
} }
void apply(osg::Geometry& geom) override void apply(osg::Geometry& geom) override
{ {
if (!(geom.getNodeMask() & mAnalyzeMask))
return;
if (osg::Array* array = geom.getVertexArray()) if (osg::Array* array = geom.getVertexArray())
mResult.mNumVerts += array->getNumElements(); mResult.mNumVerts += array->getNumElements();
@ -345,7 +339,6 @@ namespace MWRender
osg::StateSet* mCurrentStateSet; osg::StateSet* mCurrentStateSet;
StateSetCounter mGlobalStateSetCounter; StateSetCounter mGlobalStateSetCounter;
float mCurrentDistance; float mCurrentDistance;
osg::Node::NodeMask mAnalyzeMask;
}; };
class DebugVisitor : public osg::NodeVisitor class DebugVisitor : public osg::NodeVisitor