Merge branch 'jmt/ref_ptr-conv'

[simgear.git] / simgear / scene / tgdb / GroundLightManager.cxx

diff --git a/simgear/scene/tgdb/GroundLightManager.cxx b/simgear/scene/tgdb/GroundLightManager.cxx
index 09309087bc9f01aae0365586e1f04b4b48f2f3f6..9be3f6de21b6ec6bcd34b1098acf8c5e934ad9a7 100644 (file)
--- a/simgear/scene/tgdb/GroundLightManager.cxx
+++ b/simgear/scene/tgdb/GroundLightManager.cxx
@@ -24,33 +24,26 @@ namespace simgear
 {
 GroundLightManager::GroundLightManager()
 {
-    osg::Fog* fog;
     runwayLightSS = makeLightSS();
     taxiLightSS = makeLightSS();
     groundLightSS = makeLightSS();
 }
 
-GroundLightManager* GroundLightManager::instance()
-{
-    static ref_ptr<GroundLightManager> manager = new GroundLightManager;
-    return manager.get();
-}
-
 void GroundLightManager::update(const SGUpdateVisitor* updateVisitor)
 {
     osg::Fog* fog;
     SGVec4f fogColor = updateVisitor->getFogColor();
     fog = static_cast<osg::Fog*>(runwayLightSS
                                  ->getAttribute(StateAttribute::FOG));
-    fog->setColor(fogColor.osg());
+    fog->setColor(toOsg(fogColor));
     fog->setDensity(updateVisitor->getRunwayFogExp2Density());
     fog = static_cast<osg::Fog*>(taxiLightSS
                                  ->getAttribute(StateAttribute::FOG));
-    fog->setColor(fogColor.osg());
+    fog->setColor(toOsg(fogColor));
     fog->setDensity(updateVisitor->getTaxiFogExp2Density());
     fog = static_cast<osg::Fog*>(groundLightSS
                                  ->getAttribute(StateAttribute::FOG));
-    fog->setColor(fogColor.osg());
+    fog->setColor(toOsg(fogColor));
     fog->setDensity(updateVisitor->getGroundLightsFogExp2Density());
 }