Fix mesh visibility on pick animations.

(caused by incorrectly overloaded methods)
This commit is contained in:
Richard Harrison
2017-05-11 19:17:24 +02:00
parent 4acd047982
commit 11ff1d256c
3 changed files with 7 additions and 7 deletions

View File

@@ -371,12 +371,12 @@ osg::StateSet* sharedHighlightStateSet()
}
void
SGPickAnimation::apply(simgear::SGTransientModelData &modelData)
SGPickAnimation::apply(osg::Group& group)
{
if (_objectNames.empty() && _proxyNames.empty()) {
return;
}
osg::Group& group = *modelData.getNode()->asGroup();
group.traverse(*this);
// iterate over all group children

View File

@@ -38,8 +38,8 @@ public:
SGPickAnimation(simgear::SGTransientModelData &modelData);
// override so we can treat object-name specially
virtual void apply(simgear::SGTransientModelData &modelData);
virtual void apply(osg::Group& group);
void apply(osg::Node* node);
protected:

View File

@@ -490,13 +490,13 @@ SGAnimation::animate(simgear::SGTransientModelData &modelData)
anim.apply(modelData);
} else if (type == "pick") {
SGPickAnimation anim(modelData);
anim.apply(modelData);
anim.apply(modelData.getNode());
} else if (type == "knob") {
SGKnobAnimation anim(modelData);
anim.apply(modelData);
anim.apply(modelData.getNode());
} else if (type == "slider") {
SGSliderAnimation anim(modelData);
anim.apply(modelData);
anim.apply(modelData.getNode());
} else if (type == "range") {
SGRangeAnimation anim(modelData);
anim.apply(modelData);