Globe: Fix compilation with osgearth 2.4

pka · pka · commit 1436056f77d6 · 2013-04-08T23:54:29.000+02:00
diff --git a/cmake/FindOSGEARTH.cmake b/cmake/FindOSGEARTH.cmake
@@ -44,6 +44,7 @@ ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_
 
 FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR   osgEarth/Common )
 FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR       osgEarth/TileSource )
+FIND_OSGEARTH_INCLUDE( OSGEARTH_ELEVATION_QUERY   osgEarth/ElevationQuery )
 
 ###### libraries ######
 
diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -9,6 +9,10 @@ IF(HAVE_OSGEARTH_CHILD_SPACING)
   ADD_DEFINITIONS(-DHAVE_OSGEARTH_CHILD_SPACING)
 ENDIF(HAVE_OSGEARTH_CHILD_SPACING)
 
+IF(OSGEARTH_ELEVATION_QUERY)
+  ADD_DEFINITIONS(-DHAVE_OSGEARTH_ELEVATION_QUERY)
+ENDIF(OSGEARTH_ELEVATION_QUERY)
+
 ########################################################
 # Files
 
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -311,9 +311,12 @@ void GlobePlugin::run()
     mOsgViewer->addEventHandler( new FlyToExtentHandler( this ) );
     mOsgViewer->addEventHandler( new KeyboardControlHandler( manip, mQGisIface ) );
 
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#else
     mOsgViewer->addEventHandler( new QueryCoordinatesHandler( this, mElevationManager,
                                  mMapNode->getMap()->getProfile()->getSRS() )
                                );
+#endif
   }
   else
   {
@@ -376,6 +379,8 @@ void GlobePlugin::setupMap()
   elevationLayersChanged();
 
   // model placement utils
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#else
   mElevationManager = new osgEarth::Util::ElevationManager( mMapNode->getMap() );
   mElevationManager->setTechnique( osgEarth::Util::ElevationManager::TECHNIQUE_GEOMETRIC );
   mElevationManager->setMaxTilesToCache( 50 );
@@ -398,6 +403,7 @@ void GlobePlugin::setupMap()
       }
     }
   }
+#endif
 
 }
 
@@ -863,6 +869,8 @@ void GlobePlugin::help()
 
 void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt /*= 0.0*/ )
 {
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#else
   // get elevation
   double elevation = 0.0;
   double resolution = 0.0;
@@ -875,6 +883,7 @@ void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt
   osg::MatrixTransform* mt = new osg::MatrixTransform( mat );
   mt->addChild( node );
   mRootNode->addChild( mt );
+#endif
 }
 
 void GlobePlugin::copyFolder( QString sourceFolder, QString destFolder )
@@ -1068,6 +1077,8 @@ bool FlyToExtentHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIAct
   return false;
 }
 
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#else
 bool QueryCoordinatesHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )
 {
   if ( ea.getEventType() == osgGA::GUIEventAdapter::MOVE )
@@ -1144,6 +1155,7 @@ osg::Vec3d QueryCoordinatesHandler::getCoords( float x, float y, osgViewer::View
   }
   return coords;
 }
+#endif
 
 /**
  * Required extern functions needed  for every plugin
diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
@@ -38,8 +38,13 @@ using namespace osgEarth::Util::Controls21;
 #include <osgEarthUtil/Controls>
 using namespace osgEarth::Util::Controls;
 #endif
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#include <osgEarth/ElevationQuery>
+#include <osgEarthUtil/ObjectLocator>
+#else
 #include <osgEarthUtil/ElevationManager>
 #include <osgEarthUtil/ObjectPlacer>
+#endif
 
 class QAction;
 class QToolBar;
@@ -136,10 +141,17 @@ class GlobePlugin : public QObject, public QgisPlugin
     osgEarth::Drivers::QgsOsgEarthTileSource* mTileSource;
     //! Control Canvas
     ControlCanvas* mControlCanvas;
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+    //! Elevation manager
+    osgEarth::ElevationQuery* mElevationManager;
+    //! Object placer
+    osgEarth::Util::ObjectLocator* mObjectPlacer;
+#else
     //! Elevation manager
     osgEarth::Util::ElevationManager* mElevationManager;
     //! Object placer
     osgEarth::Util::ObjectPlacer* mObjectPlacer;
+#endif
     //! tracks if the globe is open
     bool mIsGlobeRunning;
     //! coordinates of the right-clicked point on the globe
@@ -164,6 +176,8 @@ class FlyToExtentHandler : public osgGA::GUIEventHandler
 };
 
 // An event handler that will print out the coordinates at the clicked point
+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+#else
 class QueryCoordinatesHandler : public osgGA::GUIEventHandler
 {
   public:
@@ -181,6 +195,7 @@ class QueryCoordinatesHandler : public osgGA::GUIEventHandler
     osg::ref_ptr<osgEarth::Util::ElevationManager> _elevMan;
     bool _mouseDown;
 };
+#endif
 
 
 class KeyboardControlHandler : public osgGA::GUIEventHandler

Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,12 @@ void GlobePlugin::run()`
`311`	`311`	`mOsgViewer->addEventHandler( new FlyToExtentHandler( this ) );`
`312`	`312`	`mOsgViewer->addEventHandler( new KeyboardControlHandler( manip, mQGisIface ) );`
`313`	`313`
	`314`	`+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY`
	`315`	`+#else`
`314`	`316`	`mOsgViewer->addEventHandler( new QueryCoordinatesHandler( this, mElevationManager,`
`315`	`317`	`mMapNode->getMap()->getProfile()->getSRS() )`
`316`	`318`	`);`
	`319`	`+#endif`
`317`	`320`	`}`
`318`	`321`	`else`
`319`	`322`	`{`
`@@ -376,6 +379,8 @@ void GlobePlugin::setupMap()`
`376`	`379`	`elevationLayersChanged();`
`377`	`380`
`378`	`381`	`// model placement utils`
	`382`	`+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY`
	`383`	`+#else`
`379`	`384`	`mElevationManager = new osgEarth::Util::ElevationManager( mMapNode->getMap() );`
`380`	`385`	`mElevationManager->setTechnique( osgEarth::Util::ElevationManager::TECHNIQUE_GEOMETRIC );`
`381`	`386`	`mElevationManager->setMaxTilesToCache( 50 );`
`@@ -398,6 +403,7 @@ void GlobePlugin::setupMap()`
`398`	`403`	`}`
`399`	`404`	`}`
`400`	`405`	`}`
	`406`	`+#endif`
`401`	`407`
`402`	`408`	`}`
`403`	`409`
`@@ -863,6 +869,8 @@ void GlobePlugin::help()`
`863`	`869`
`864`	`870`	`void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt /= 0.0/ )`
`865`	`871`	`{`
	`872`	`+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY`
	`873`	`+#else`
`866`	`874`	`// get elevation`
`867`	`875`	`double elevation = 0.0;`
`868`	`876`	`double resolution = 0.0;`
`@@ -875,6 +883,7 @@ void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt`
`875`	`883`	`osg::MatrixTransform* mt = new osg::MatrixTransform( mat );`
`876`	`884`	`mt->addChild( node );`
`877`	`885`	`mRootNode->addChild( mt );`
	`886`	`+#endif`
`878`	`887`	`}`
`879`	`888`
`880`	`889`	`void GlobePlugin::copyFolder( QString sourceFolder, QString destFolder )`
`@@ -1068,6 +1077,8 @@ bool FlyToExtentHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIAct`
`1068`	`1077`	`return false;`
`1069`	`1078`	`}`
`1070`	`1079`
	`1080`	`+#ifdef HAVE_OSGEARTH_ELEVATION_QUERY`
	`1081`	`+#else`
`1071`	`1082`	`bool QueryCoordinatesHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )`
`1072`	`1083`	`{`
`1073`	`1084`	`if ( ea.getEventType() == osgGA::GUIEventAdapter::MOVE )`
`@@ -1144,6 +1155,7 @@ osg::Vec3d QueryCoordinatesHandler::getCoords( float x, float y, osgViewer::View`
`1144`	`1155`	`}`
`1145`	`1156`	`return coords;`
`1146`	`1157`	`}`
	`1158`	`+#endif`
`1147`	`1159`
`1148`	`1160`	`/**`
`1149`	`1161`	`* Required extern functions needed for every plugin`