fly/flightgear
1
0
Fork 0
Code Activity

Compilation fix for OSG 2.1.4

Browse source 
setUpdateViewer has been moved to the osgViewer::Viewer object.
This commit is contained in:
timoore 2007-08-12 23:01:51 +00:00
parent 04b0650bed
commit 41a22fa6a9
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Main/renderer.cxx
View file

@ -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());