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

Destructor tweaks from some animation nodes

Browse Source
This commit is contained in:
James Turner 2020-08-14 11:12:51 +01:00
parent 7b4c50fd7e
commit e659ad3872
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/model/ConditionNode.hxx
View File

@ -34,7 +34,7 @@ public:
ConditionNode(const ConditionNode& rhs,
const osg::CopyOp& op = osg::CopyOp::SHALLOW_COPY);
META_Node(simgear,ConditionNode);
~ConditionNode();
virtual ~ConditionNode();
const SGCondition* getCondition() const { return _condition.ptr(); }
void setCondition(const SGCondition* condition) { _condition = condition; }

4
simgear/scene/model/SGMaterialAnimation.cxx
View File

@ -357,7 +357,7 @@ public:
_textureProp = modelRoot->getNode(node->getStringValue(), true);
}
virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
void operator()(osg::Node* node, osg::NodeVisitor* nv) override
{
osg::StateSet* stateSet = node->getStateSet();
if (stateSet) {
@ -425,6 +425,8 @@ SGMaterialAnimation::SGMaterialAnimation(simgear::SGTransientModelData &modelDat
"no longer supported.");
}
SGMaterialAnimation::~SGMaterialAnimation() = default;
osg::Group*
SGMaterialAnimation::createAnimationGroup(osg::Group& parent)
{

2
simgear/scene/model/SGMaterialAnimation.hxx
View File

@ -22,6 +22,8 @@
class SGMaterialAnimation : public SGAnimation {
public:
SGMaterialAnimation(simgear::SGTransientModelData &modelData);
virtual ~SGMaterialAnimation();
virtual osg::Group* createAnimationGroup(osg::Group& parent);
virtual void install(osg::Node& node);
static SGPropertyNode_ptr makeEffectProperties(const SGPropertyNode* animProp);