mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Clean the object root of StateSets and hidden nodes

Browse Source
This commit is contained in:
scrawl 2017-03-01 03:09:32 +01:00
parent 4e0011bfc8
commit 2873c10284
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/openmw/mwrender/animation.cpp
View File

@ -192,24 +192,38 @@ namespace
}; };
// Removes all drawables from a graph. // Removes all drawables from a graph.
class RemoveDrawableVisitor : public RemoveVisitor class CleanObjectRootVisitor : public RemoveVisitor
{ {
public: public:
virtual void apply(osg::Drawable& drw) virtual void apply(osg::Drawable& drw)
{ {
applyImpl(drw); applyDrawable(drw);
} }
virtual void apply(osg::Group& node) virtual void apply(osg::Group& node)
{ {
traverse(node); applyNode(node);
} }
virtual void apply(osg::MatrixTransform& node) virtual void apply(osg::MatrixTransform& node)
{ {
traverse(node); applyNode(node);
}
virtual void apply(osg::Node& node)
{
applyNode(node);
} }
void applyImpl(osg::Node& node) void applyNode(osg::Node& node)
{
if (node.getStateSet())
node.setStateSet(NULL);
if (node.getNodeMask() == 0x1 && node.getNumParents() == 1)
mToRemove.push_back(std::make_pair(&node, node.getParent(0)));
else
traverse(node);
}
void applyDrawable(osg::Node& node)
{ {
osg::NodePath::iterator parent = getNodePath().end()-2; osg::NodePath::iterator parent = getNodePath().end()-2;
// We know that the parent is a Group because only Groups can have children. // We know that the parent is a Group because only Groups can have children.
@ -1134,7 +1148,7 @@ namespace MWRender
{ {
osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(model); osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(model);
RemoveDrawableVisitor removeDrawableVisitor; CleanObjectRootVisitor removeDrawableVisitor;
created->accept(removeDrawableVisitor); created->accept(removeDrawableVisitor);
removeDrawableVisitor.remove(); removeDrawableVisitor.remove();