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

Try to exclude unwanted geometry in the additional light pass

Browse Source
This commit is contained in:
Frederic Bouvier
2012-05-20 15:42:55 +02:00
parent 1387f47a79
commit d479686804
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
simgear/scene/model/SGReaderWriterXML.cxx
View File

@@ -198,6 +198,20 @@ void makeEffectAnimations(PropertyList& animation_nodes,
}
}
class SGSetNodeMaskVisitor : public osg::NodeVisitor {
public:
SGSetNodeMaskVisitor(osg::Node::NodeMask nms, osg::Node::NodeMask nmc) :
osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), nodeMaskSet(nms), nodeMaskClear(nmc)
{}
virtual void apply(osg::Geode& node) {
node.setNodeMask((node.getNodeMask() | nodeMaskSet) & ~nodeMaskClear);
traverse(node);
}
private:
osg::Node::NodeMask nodeMaskSet;
osg::Node::NodeMask nodeMaskClear;
};
static osg::Node *
sgLoad3DModel_internal(const SGPath& path,
const osgDB::Options* dbOptions,
@@ -430,6 +444,7 @@ sgLoad3DModel_internal(const SGPath& path,
prop_root,
options.get()));
}
PropertyList effect_nodes = props->getChildren("effect");
PropertyList animation_nodes = props->getChildren("animation");
PropertyList light_nodes = props->getChildren("light");
@@ -440,6 +455,9 @@ sgLoad3DModel_internal(const SGPath& path,
= instantiateEffects(group.get(), effect_nodes, options.get());
group = static_cast<Group*>(modelWithEffects.get());
}
SGSetNodeMaskVisitor snmv(0, simgear::MODELLIGHT_BIT);
group->accept(snmv);
for (unsigned i = 0; i < animation_nodes.size(); ++i)
/// OSGFIXME: duh, why not only model?????
SGAnimation::animate(group.get(), animation_nodes[i], prop_root,