fly/flightgear
1
0
Fork 0
Code Activity

Fix for #1244 (Canvas placements with pick animation).

Browse source
This commit is contained in:
Thomas Geymayer 2013-10-24 01:30:01 +02:00
parent 961905a6cf
commit c4f02cc41e
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Cockpit/od_gauge.cxx
View file

@ -138,7 +138,7 @@ class ReplaceStaticTextureVisitor:
return; return;
osg::Group *parent = node.getParent(0); osg::Group *parent = node.getParent(0);
if( !_node_name.empty() && parent->getName() != _node_name ) if( !_node_name.empty() && getNodeName(*parent) != _node_name )
return; return;
if( !_parent_name.empty() ) if( !_parent_name.empty() )
@ -233,6 +233,21 @@ class ReplaceStaticTextureVisitor:
simgear::canvas::CanvasWeakPtr _canvas; simgear::canvas::CanvasWeakPtr _canvas;
simgear::canvas::Placements _placements; simgear::canvas::Placements _placements;
const std::string& getNodeName(const osg::Node& node) const
{
if( !node.getName().empty() )
return node.getName();
// Special handling for pick animation which clears the name of the object
// and instead sets the name of a parent group with one or two groups
// attached (one for normal rendering and one for the picking highlight).
osg::Group const* parent = node.getParent(0);
if( parent->getName() == "pick render group" )
return parent->getParent(0)->getName();
return node.getName();
}
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------