Update GroundLightManager

[flightgear.git] / src / Main / renderer.cxx

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index b4dcbc9e7771642e10e35a73ad074f3248c25b30..e4f0d5230acf64265f421ff873440c364c89f0c4 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -49,6 +49,7 @@
 #include <osg/PolygonMode>
 #include <osg/PolygonOffset>
 #include <osg/ShadeModel>
+#include <osg/Version>
 #include <osg/TexEnv>
 
 #include <osgUtil/SceneView>
@@ -69,6 +70,8 @@
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/scene/util/SGUpdateVisitor.hxx>
+#include <simgear/scene/util/RenderConstants.hxx>
+#include <simgear/scene/tgdb/GroundLightManager.hxx>
 #include <simgear/scene/tgdb/pt_lights.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
@@ -97,10 +100,16 @@
 #include <Instrumentation/instrument_mgr.hxx>
 #include <Instrumentation/HUD/HUD.hxx>
 
+#include <Include/general.hxx>
 #include "splash.hxx"
 #include "renderer.hxx"
 #include "main.hxx"
 
+// XXX Make this go away when OSG 2.2 is released.
+#if (FG_OSG_VERSION >= 21004)
+#define UPDATE_VISITOR_IN_VIEWER 1
+#endif
+
 class SGPuDrawable : public osg::Drawable {
 public:
   SGPuDrawable()
@@ -366,9 +375,7 @@ FGRenderer::FGRenderer()
 #ifdef FG_JPEG_SERVER
    jpgRenderFrame = FGRenderer::update;
 #endif
-#ifdef ENABLE_OSGVIEWER
    manipulator = new FGManipulator;
-#endif   
 }
 
 FGRenderer::~FGRenderer()
@@ -388,12 +395,16 @@ FGRenderer::splashinit( void ) {
        sceneView = 0;
        mRealRoot = dynamic_cast<osg::Group*>(viewer->getSceneData());
        mRealRoot->addChild(fgCreateSplashNode());
-       osgViewer::Scene* scene = viewer->getScene();
        mFrameStamp = viewer->getFrameStamp();
        // Scene doesn't seem to pass the frame stamp to the update
        // visitor automatically.
        mUpdateVisitor->setFrameStamp(mFrameStamp.get());
+#ifdef UPDATE_VISITOR_IN_VIEWER
+        viewer->setUpdateVisitor(mUpdateVisitor.get());
+#else
+        osgViewer::Scene* scene = viewer->getScene();
        scene->setUpdateVisitor(mUpdateVisitor.get());
+#endif
     } else {
        // Add the splash screen node
        mRealRoot->addChild(fgCreateSplashNode());
@@ -817,20 +828,19 @@ FGRenderer::update( bool refresh_camera_settings ) {
                              l->adj_fog_color(),
                              l->get_sun_angle()*SGD_RADIANS_TO_DEGREES);
     mUpdateVisitor->setVisibility(actual_visibility);
+    simgear::GroundLightManager::instance()->update(mUpdateVisitor.get());
     bool hotspots = fgGetBool("/sim/panel-hotspots");
+    osg::Node::NodeMask cullMask = ~simgear::LIGHTS_BITS & ~simgear::PICK_BIT;
+    cullMask |= simgear::GroundLightManager::instance()
+        ->getLightNodeMask(mUpdateVisitor.get());
+    if (hotspots)
+        cullMask |= simgear::PICK_BIT;
     if (viewer) {
-       if (hotspots)
-           camera->setCullMask(camera->getCullMask()|SG_NODEMASK_PICK_BIT);
-       else
-           camera->setCullMask(camera->getCullMask()
-                               & ~SG_NODEMASK_PICK_BIT);
+        camera->setCullMask(cullMask);
+        for (int i = 0; i < viewer->getNumSlaves(); ++i)
+            viewer->getSlave(i)._camera->setCullMask(cullMask);
     } else {
-       if (hotspots)
-           sceneView->setCullMask(sceneView->getCullMask()
-                                  |SG_NODEMASK_PICK_BIT);
-       else
-           sceneView->setCullMask(sceneView->getCullMask()
-                                  &(~SG_NODEMASK_PICK_BIT));
+        sceneView->setCullMask(cullMask);
        sceneView->update();
        sceneView->cull();
        sceneView->draw();
@@ -1048,10 +1058,24 @@ FGRenderer::pick( unsigned x, unsigned y,
   }
 }
 
-bool fgDumpSceneGraphToFile(const char* filename)
+void
+FGRenderer::addCamera(osg::Camera* camera, bool useSceneData)
+{
+    mRealRoot->addChild(camera);
+}
+
+bool
+fgDumpSceneGraphToFile(const char* filename)
 {
     return osgDB::writeNodeFile(*mRealRoot.get(), filename);
 }
 
+bool
+fgDumpTerrainBranchToFile(const char* filename)
+{
+    return osgDB::writeNodeFile( *globals->get_scenery()->get_terrain_branch(),
+                                 filename );
+}
+
 // end of renderer.cxx