fly/flightgear
1
0
Fork 0
Code Activity

Update for OpenSceneGraph 3.3.2 API changes.

Browse source
This commit is contained in:
Thomas Geymayer 2014-08-09 19:13:39 +02:00
parent 08263dc1ec
commit 2520124e97
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -219,7 +219,16 @@ find_package(ZLIB REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(OpenAL 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) if (MSVC)
find_package(CrashRpt) find_package(CrashRpt)

7
src/Model/panelnode.cxx
View file

@ -315,7 +315,12 @@ FGPanelNode::drawImplementation(osg::State& state) const
} }
osg::BoundingBox osg::BoundingBox
FGPanelNode::computeBound() const #if OSG_VERSION_LESS_THAN(3,3,2)
FGPanelNode::computeBound()
#else
FGPanelNode::computeBoundingBox()
#endif
const
{ {
osg::Vec3 coords[3]; osg::Vec3 coords[3];

11
src/Model/panelnode.hxx
View file

@ -4,6 +4,7 @@
#include <osg/Vec3> #include <osg/Vec3>
#include <osg/Matrix> #include <osg/Matrix>
#include <osg/Drawable> #include <osg/Drawable>
#include <osg/Version>
#include <memory> #include <memory>
#include <simgear/structure/SGSharedPtr.hxx> #include <simgear/structure/SGSharedPtr.hxx>
@ -30,7 +31,15 @@ public:
{ drawImplementation(*renderInfo.getState()); } { drawImplementation(*renderInfo.getState()); }
void drawImplementation(osg::State& state) const; 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&). */ /** Return true, FGPanelNode does support accept(PrimitiveFunctor&). */
virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }