OpenSceneGraph-3.3.2.patch

   1 --- flightgear-3.2.0/src/Model/panelnode.cxx.orig       2014-08-17 15:40:24.000000000 +0200
   2 +++ flightgear-3.2.0/src/Model/panelnode.cxx    2014-11-02 12:27:29.031193511 +0100
   3 @@ -10,6 +10,7 @@
   4  #include <osg/Geode>
   5  #include <osg/Switch>
   6  #include <osg/BlendFunc>
   7 +#include <osg/Version>
   8
   9  #include <simgear/compiler.h>
  10  #include <simgear/structure/exception.hxx>
  11 @@ -315,7 +316,11 @@
  12  }
  13
  14  osg::BoundingBox
  15 +#if OSG_VERSION_LESS_THAN(3,3,2)
  16  FGPanelNode::computeBound() const
  17 +#else
  18 +FGPanelNode::computeBoundingBox() const
  19 +#endif
  20  {
  21
  22    osg::Vec3 coords[3];
  23 --- flightgear-3.2.0/src/Model/panelnode.hxx.orig       2014-08-17 15:40:24.000000000 +0200
  24 +++ flightgear-3.2.0/src/Model/panelnode.hxx    2014-11-02 12:27:11.551194127 +0100
  25 @@ -4,6 +4,7 @@
  26  #include <osg/Vec3>
  27  #include <osg/Matrix>
  28  #include <osg/Drawable>
  29 +#include <osg/Version>
  30
  31  #include <memory>
  32  #include <simgear/structure/SGSharedPtr.hxx>
  33 @@ -30,7 +31,11 @@
  34      { drawImplementation(*renderInfo.getState()); }
  35
  36      void drawImplementation(osg::State& state) const;
  37 +#if OSG_VERSION_LESS_THAN(3,3,2)
  38      virtual osg::BoundingBox computeBound() const;
  39 +#else
  40 +    virtual osg::BoundingBox computeBoundingBox() const;
  41 +#endif
  42
  43      /** Return true, FGPanelNode does support accept(PrimitiveFunctor&). */
  44      virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }