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

Reset: don't leak EffectPropertyListener.

Browse Source 
Track and free listeners from effect expressions.
This commit is contained in:
James Turner 2013-12-03 21:34:23 +00:00
parent 5861b52cff
commit 053e761d8f
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
simgear/scene/material/Effect.cxx
View File

@ -1358,14 +1358,25 @@ template<typename T>
class PropertyExpression : public SGExpression<T>
{
public:
PropertyExpression(SGPropertyNode* pnode) : _pnode(pnode) {}
PropertyExpression(SGPropertyNode* pnode) : _pnode(pnode), _listener(NULL) {}
~PropertyExpression()
{
delete _listener;
}
void eval(T& value, const expression::Binding*) const
{
value = _pnode->getValue<T>();
}
void setListener(SGPropertyChangeListener* l)
{
_listener = l;
}
protected:
SGPropertyNode_ptr _pnode;
SGPropertyChangeListener* _listener;
};
class EffectPropertyListener : public SGPropertyChangeListener
@ -1378,6 +1389,9 @@ public:
if (_tniq.valid())
_tniq->refreshValidity();
}
virtual ~EffectPropertyListener() { }
protected:
osg::observer_ptr<Technique> _tniq;
};
@ -1391,9 +1405,12 @@ Expression* propertyExpressionParser(const SGPropertyNode* exp,
PropertyExpression<T>* pexp = new PropertyExpression<T>(pnode);
TechniquePredParser* predParser
= dynamic_cast<TechniquePredParser*>(parser);
if (predParser)
pnode->addChangeListener(new EffectPropertyListener(predParser
->getTechnique()));
if (predParser) {
EffectPropertyListener* l = new EffectPropertyListener(predParser
->getTechnique());
pexp->setListener(l);
pnode->addChangeListener(l);
}
return pexp;
}