diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af5d2b55..2a41c0b70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,16 @@ find_package(ZLIB REQUIRED) find_package(Threads REQUIRED) find_package(OpenGL REQUIRED) find_package(OpenAL REQUIRED) -find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA) +find_package(OpenSceneGraph 3.2.0 REQUIRED + osgText + osgSim + osgDB + osgParticle + osgFX + osgUtil + osgViewer + osgGA +) if (MSVC) find_package(CrashRpt) diff --git a/src/Model/panelnode.cxx b/src/Model/panelnode.cxx index 11b6125d6..6399133f3 100644 --- a/src/Model/panelnode.cxx +++ b/src/Model/panelnode.cxx @@ -315,7 +315,12 @@ FGPanelNode::drawImplementation(osg::State& state) const } osg::BoundingBox -FGPanelNode::computeBound() const +#if OSG_VERSION_LESS_THAN(3,3,2) +FGPanelNode::computeBound() +#else +FGPanelNode::computeBoundingBox() +#endif +const { osg::Vec3 coords[3]; diff --git a/src/Model/panelnode.hxx b/src/Model/panelnode.hxx index 9d9a7c836..48f18f706 100644 --- a/src/Model/panelnode.hxx +++ b/src/Model/panelnode.hxx @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,15 @@ public: { drawImplementation(*renderInfo.getState()); } void drawImplementation(osg::State& state) const; - virtual osg::BoundingBox computeBound() const; + + virtual osg::BoundingBox +#if OSG_VERSION_LESS_THAN(3,3,2) + computeBound() +#else + computeBoundingBox() +#endif + const; + /** Return true, FGPanelNode does support accept(PrimitiveFunctor&). */ virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }