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

Eliminate unitialized warning

Browse Source
This commit is contained in:
Scott Giese
2019-12-15 02:00:16 -06:00
parent 2289618cea
commit c653a82619
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGLight.cxx
+6 -1
View File
@@ -14,6 +14,8 @@
// License along with this library; if not, write to the Free Software // License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#include <stdexcept>
#include "SGLight.hxx" #include "SGLight.hxx"
#include <osg/Geode> #include <osg/Geode>
@@ -107,7 +109,7 @@ SGLight::appendLight(const SGPropertyNode *configNode,
} }
align->setMatrix(r * t); align->setMatrix(r * t);
osg::Shape *debug_shape; osg::Shape *debug_shape = nullptr;
if (light->getType() == SGLight::Type::POINT) { if (light->getType() == SGLight::Type::POINT) {
debug_shape = new osg::Sphere(osg::Vec3(0, 0, 0), light->getRange()); debug_shape = new osg::Sphere(osg::Vec3(0, 0, 0), light->getRange());
} else if (light->getType() == SGLight::Type::SPOT) { } else if (light->getType() == SGLight::Type::SPOT) {
@@ -116,7 +118,10 @@ SGLight::appendLight(const SGPropertyNode *configNode,
osg::Vec3(0, 0, -0.75 * light->getRange()), osg::Vec3(0, 0, -0.75 * light->getRange()),
tan(light->getSpotCutoff() * SG_DEGREES_TO_RADIANS) * light->getRange(), tan(light->getSpotCutoff() * SG_DEGREES_TO_RADIANS) * light->getRange(),
light->getRange()); light->getRange());
} else {
throw std::domain_error("Unsupported SGLight::Type");
} }
osg::ShapeDrawable *debug_drawable = new osg::ShapeDrawable(debug_shape); osg::ShapeDrawable *debug_drawable = new osg::ShapeDrawable(debug_shape);
debug_drawable->setColor(osg::Vec4(1.0, 0.0, 0.0, 1.0)); debug_drawable->setColor(osg::Vec4(1.0, 0.0, 0.0, 1.0));
osg::Geode *debug_geode = new osg::Geode; osg::Geode *debug_geode = new osg::Geode;