From: timoore <timoore>
Date: Sun, 12 Aug 2007 23:01:51 +0000 (+0000)
Subject: Compilation fix for OSG 2.1.4
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=41a22fa6a9427f8422e73c19664bf6196f95015f;p=flightgear.git

Compilation fix for OSG 2.1.4
setUpdateViewer has been moved to the osgViewer::Viewer object.
---

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 87e8932c1..3a7b944c4 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -101,6 +101,12 @@
 #include "renderer.hxx"
 #include "main.hxx"
 
+// XXX Make this go away when OSG 2.2 is released.
+#if ((2 >= OSG_VERSION_MAJOR) && (1 >= OSG_VERSION_MINOR) \
+     && (4 >= OSG_VERSION_PATCH))
+#define UPDATE_VISITOR_IN_VIEWER 1
+#endif
+
 class SGPuDrawable : public osg::Drawable {
 public:
   SGPuDrawable()
@@ -388,12 +394,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());