diff --git a/src/Cockpit/wxradar.cxx b/src/Cockpit/wxradar.cxx index 2d3ce04c5..a5b11c992 100644 --- a/src/Cockpit/wxradar.cxx +++ b/src/Cockpit/wxradar.cxx @@ -1078,13 +1078,9 @@ wxRadarBg::updateFont() } else { tpath = path; } - -#if (FG_OSG_VERSION >= 21000) + osg::ref_ptr fontOptions = new osgDB::ReaderWriter::Options("monochrome"); osg::ref_ptr font = osgText::readFontFile(tpath.c_str(), fontOptions.get()); -#else - osg::ref_ptr font = osgText::readFontFile(tpath.c_str()); -#endif if (font != 0) { _font = font; diff --git a/src/Viewer/CameraGroup.cxx b/src/Viewer/CameraGroup.cxx index 7d903a5a1..b09622bb7 100644 --- a/src/Viewer/CameraGroup.cxx +++ b/src/Viewer/CameraGroup.cxx @@ -306,10 +306,7 @@ void CameraGroup::update(const osg::Vec3d& position, Camera* camera = info->getCamera(MAIN_CAMERA); if ( camera ) { const View::Slave& slave = _viewer->getSlave(info->getMainSlaveIndex()); -#if SG_OSG_VERSION_LESS_THAN(3,0,0) - // refreshes camera viewports (for now) - info->updateCameras(); -#endif + Matrix viewMatrix; if (info->flags & GUI) { viewMatrix = osg::Matrix(); // identifty transform on the GUI camera diff --git a/src/Viewer/FGEventHandler.hxx b/src/Viewer/FGEventHandler.hxx index 59a25381a..934c1157f 100644 --- a/src/Viewer/FGEventHandler.hxx +++ b/src/Viewer/FGEventHandler.hxx @@ -16,12 +16,10 @@ namespace flightgear public: FGStatsHandler() { -#if (SG_OSG_VERSION >= 30000) // Adjust font type/size for >=OSG3. // OSG defaults aren't working/available for FG. _font = "Fonts/helvetica_medium.txf"; _characterSize = 12.0f; -#endif } }; diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx index 6604ce280..2859e17de 100644 --- a/src/Viewer/renderer.cxx +++ b/src/Viewer/renderer.cxx @@ -597,9 +597,7 @@ void installCullVisitor(Camera* camera) = static_cast(camera->getRenderer()); for (int i = 0; i < 2; ++i) { osgUtil::SceneView* sceneView = renderer->getSceneView(i); -#if SG_OSG_VERSION_LESS_THAN(3,0,0) - sceneView->setCullVisitor(new simgear::EffectCullVisitor); -#else + osg::ref_ptr identifier; identifier = sceneView->getCullVisitor()->getIdentifier(); sceneView->setCullVisitor(new simgear::EffectCullVisitor); @@ -612,7 +610,7 @@ void installCullVisitor(Camera* camera) identifier = sceneView->getCullVisitorRight()->getIdentifier(); sceneView->setCullVisitorRight(sceneView->getCullVisitor()->clone()); sceneView->getCullVisitorRight()->setIdentifier(identifier.get()); -#endif + } }