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

Protect against null reference when effect not found

Browse Source
This commit is contained in:
Richard Harrison
2019-12-29 13:48:40 +01:00
parent d93ce29b20
commit 1eadaa4cda
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGLightAnimation.cxx
+22 -17
View File
@@ -63,22 +63,23 @@ public:
simgear::EffectGeode* geode = dynamic_cast<simgear::EffectGeode*>( node ); simgear::EffectGeode* geode = dynamic_cast<simgear::EffectGeode*>( node );
if (geode != 0) { if (geode != 0) {
osg::ref_ptr<simgear::Effect> effect = geode->getEffect(); osg::ref_ptr<simgear::Effect> effect = geode->getEffect();
if (effect != nullptr) {
SGPropertyNode* params = effect->parametersProp; SGPropertyNode* params = effect->parametersProp;
params->getNode("ambient")->setValue(_ambient * dim); params->getNode("ambient")->setValue(_ambient * dim);
params->getNode("diffuse")->setValue(_diffuse * dim); params->getNode("diffuse")->setValue(_diffuse * dim);
params->getNode("specular")->setValue(_specular * dim); params->getNode("specular")->setValue(_specular * dim);
BOOST_FOREACH(osg::ref_ptr<simgear::Technique>& technique, effect->techniques) { BOOST_FOREACH(osg::ref_ptr<simgear::Technique> & technique, effect->techniques) {
BOOST_FOREACH(osg::ref_ptr<simgear::Pass>& pass, technique->passes) { BOOST_FOREACH(osg::ref_ptr<simgear::Pass> & pass, technique->passes) {
osg::Uniform* amb = pass->getUniform("Ambient"); osg::Uniform* amb = pass->getUniform("Ambient");
if (amb) if (amb)
amb->set(osg::Vec4f(_ambient.x() * dim, _ambient.y() * dim, _ambient.z() * dim, _ambient.w() * dim)); amb->set(osg::Vec4f(_ambient.x() * dim, _ambient.y() * dim, _ambient.z() * dim, _ambient.w() * dim));
osg::Uniform* dif = pass->getUniform("Diffuse"); osg::Uniform* dif = pass->getUniform("Diffuse");
if (dif) if (dif)
dif->set(osg::Vec4f(_diffuse.x() * dim, _diffuse.y() * dim, _diffuse.z() * dim, _diffuse.w() * dim)); dif->set(osg::Vec4f(_diffuse.x() * dim, _diffuse.y() * dim, _diffuse.z() * dim, _diffuse.w() * dim));
osg::Uniform* spe = pass->getUniform("Specular"); osg::Uniform* spe = pass->getUniform("Specular");
if (spe) if (spe)
spe->set(osg::Vec4f(_specular.x() * dim, _specular.y() * dim, _specular.z() * dim, _specular.w() * dim)); spe->set(osg::Vec4f(_specular.x() * dim, _specular.y() * dim, _specular.z() * dim, _specular.w() * dim));
}
} }
} }
} }
@@ -189,7 +190,11 @@ SGLightAnimation::install(osg::Node& node)
} else { } else {
effect = iter->second.get(); effect = iter->second.get();
} }
if (effect == nullptr) {
printf("invalid effect - hiding geometry as light not valid.\n");
node.setNodeMask(0);
return;
}
node.setNodeMask( simgear::MODELLIGHT_BIT ); node.setNodeMask( simgear::MODELLIGHT_BIT );
simgear::EffectGeode* geode = dynamic_cast<simgear::EffectGeode*>(&node); simgear::EffectGeode* geode = dynamic_cast<simgear::EffectGeode*>(&node);
if (geode == 0) { if (geode == 0) {