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

Till BUSCH:

Browse Source 
this is a small (-1/+3) patch to fix pick animations on scenery objects.
since picking apparently doesn't care for polygon offsets, the objects
got into the picklist in the wrong way. now, no matter if the "highlight
group" or the "normal group" gets hit first, the callback will fire.
This commit is contained in:
mfranz
2008-04-23 12:28:45 +00:00
parent c7dab4abea
commit 8f48515b80
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+3 -1
View File
@@ -2027,14 +2027,16 @@ SGPickAnimation::createAnimationGroup(osg::Group& parent)
// Contains the normal geometry that is interactive // Contains the normal geometry that is interactive
osg::ref_ptr<osg::Group> normalGroup = new osg::Group; osg::ref_ptr<osg::Group> normalGroup = new osg::Group;
normalGroup->setName("pick normal group");
normalGroup->addChild(commonGroup); normalGroup->addChild(commonGroup);
// 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->setName("pick highlight group");
highlightGroup->setNodeMask(SG_NODEMASK_PICK_BIT); highlightGroup->setNodeMask(SG_NODEMASK_PICK_BIT);
highlightGroup->addChild(commonGroup); highlightGroup->addChild(commonGroup);
SGSceneUserData* ud; SGSceneUserData* ud;
ud = SGSceneUserData::getOrCreateSceneUserData(highlightGroup); ud = SGSceneUserData::getOrCreateSceneUserData(commonGroup);
std::vector<SGPropertyNode_ptr> actions; std::vector<SGPropertyNode_ptr> actions;
actions = getConfig()->getChildren("action"); actions = getConfig()->getChildren("action");
for (unsigned int i = 0; i < actions.size(); ++i) for (unsigned int i = 0; i < actions.size(); ++i)