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

Modified Files:

Browse Source 
animation.cxx: Add a visible configuration option to the pick
	animation.
This commit is contained in:
frohlich
2007-01-15 19:01:20 +00:00
parent 4d4d26aef8
commit 63730a6e2c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+10 -7
View File
@@ -2161,18 +2161,19 @@ SGPickAnimation::createAnimationGroup(osg::Group& parent)
osg::Group* commonGroup = new osg::Group; osg::Group* commonGroup = new osg::Group;
// Contains the normal geometry that is interactive // Contains the normal geometry that is interactive
osg::Group* normalGroup = new osg::Group; osg::ref_ptr<osg::Group> normalGroup = new osg::Group;
normalGroup->addChild(commonGroup); normalGroup->addChild(commonGroup);
SGSceneUserData* ud = SGSceneUserData::getOrCreateSceneUserData(normalGroup);
std::vector<SGPropertyNode_ptr> actions;
actions = getConfig()->getChildren("action");
for (unsigned int i = 0; i < actions.size(); ++i)
ud->addPickCallback(new PickCallback(actions[i], getModelRoot()));
// Used to render the geometry with just yellow edges // Used to render the geometry with just yellow edges
osg::Group* highlightGroup = new osg::Group; osg::Group* highlightGroup = new osg::Group;
highlightGroup->setNodeMask(SG_NODEMASK_PICK_BIT); highlightGroup->setNodeMask(SG_NODEMASK_PICK_BIT);
highlightGroup->addChild(commonGroup); highlightGroup->addChild(commonGroup);
SGSceneUserData* ud;
ud = SGSceneUserData::getOrCreateSceneUserData(highlightGroup);
std::vector<SGPropertyNode_ptr> actions;
actions = getConfig()->getChildren("action");
for (unsigned int i = 0; i < actions.size(); ++i)
ud->addPickCallback(new PickCallback(actions[i], getModelRoot()));
// prepare a state set that paints the edges of this object yellow // prepare a state set that paints the edges of this object yellow
osg::StateSet* stateSet = highlightGroup->getOrCreateStateSet(); osg::StateSet* stateSet = highlightGroup->getOrCreateStateSet();
@@ -2197,7 +2198,9 @@ SGPickAnimation::createAnimationGroup(osg::Group& parent)
material->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 0)); material->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 0));
stateSet->setAttribute(material, osg::StateAttribute::OVERRIDE); stateSet->setAttribute(material, osg::StateAttribute::OVERRIDE);
parent.addChild(normalGroup); // Only add normal geometry if configured
if (getConfig()->getBoolValue("visible", true))
parent.addChild(normalGroup.get());
parent.addChild(highlightGroup); parent.addChild(highlightGroup);
return commonGroup; return commonGroup;