diff -Nru openwalnut-1.3.1+hg5849/debian/changelog openwalnut-1.3.1+hg5849/debian/changelog
--- openwalnut-1.3.1+hg5849/debian/changelog 2013-01-31 12:17:27.000000000 +0000
+++ openwalnut-1.3.1+hg5849/debian/changelog 2013-09-28 00:56:52.000000000 +0000
@@ -1,3 +1,10 @@
+openwalnut (1.3.1+hg5849-1+rpi1) jessie-staging; urgency=low
+
+ * Build with boost 1.49 explicitly due to FTBFS with 1.54
+ * Add patch to make package build with new openscenegraph (Closes: #719388)
+
+ -- Peter Michael Green <plugwash@raspbian.org> Sat, 28 Sep 2013 00:51:44 +0000
+
openwalnut (1.3.1+hg5849-1) unstable; urgency=low
* Minor changes compared to 1.3.0 but included several bug fixes.
diff -Nru openwalnut-1.3.1+hg5849/debian/control openwalnut-1.3.1+hg5849/debian/control
--- openwalnut-1.3.1+hg5849/debian/control 2013-01-31 12:17:27.000000000 +0000
+++ openwalnut-1.3.1+hg5849/debian/control 2013-09-27 18:43:30.000000000 +0000
@@ -9,9 +9,9 @@
libopenscenegraph-dev (>= 3.0.0), libopenthreads-dev (>= 3.0.0),
libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0),
libqtwebkit-dev (>= 2.0.0),
- libboost-dev (>= 1.46.0), libboost-program-options-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0),
- libboost-filesystem-dev (>= 1.46.0), libboost-date-time-dev (>= 1.46.0), libboost-system-dev (>= 1.46.0),
- libboost-signals-dev (>= 1.46.0), libboost-regex-dev (>= 1.46.0),
+ libboost1.49-dev (>= 1.46.0), libboost-program-options1.49-dev (>= 1.46.0), libboost-thread1.49-dev (>= 1.46.0),
+ libboost-filesystem1.49-dev (>= 1.46.0), libboost-date-time1.49-dev (>= 1.46.0), libboost-system1.49-dev (>= 1.46.0),
+ libboost-signals1.49-dev (>= 1.46.0), libboost-regex1.49-dev (>= 1.46.0),
libeigen3-dev (>= 3.0.0),
libbiosig-dev (>= 0.85.0),
libnifti-dev (>= 2.0.0),
diff -Nru openwalnut-1.3.1+hg5849/debian/patches/series openwalnut-1.3.1+hg5849/debian/patches/series
--- openwalnut-1.3.1+hg5849/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ openwalnut-1.3.1+hg5849/debian/patches/series 2013-09-28 00:47:53.000000000 +0000
@@ -0,0 +1 @@
+use_deprecated_osg::Geometry.patch
diff -Nru openwalnut-1.3.1+hg5849/debian/patches/use_deprecated_osg::Geometry.patch openwalnut-1.3.1+hg5849/debian/patches/use_deprecated_osg::Geometry.patch
--- openwalnut-1.3.1+hg5849/debian/patches/use_deprecated_osg::Geometry.patch 1970-01-01 00:00:00.000000000 +0000
+++ openwalnut-1.3.1+hg5849/debian/patches/use_deprecated_osg::Geometry.patch 2013-09-28 00:51:24.000000000 +0000
@@ -0,0 +1,671 @@
+Description: Use deprecated_osg::Geometry
+ The new version of openscenegraph has moved some deprecated functionality
+ from osg::Geometry to deprecated_osg::Geometry
+
+ Note that search and replace was used in the creation of this patch, it is
+ Therefore possible that not all instances that were changed actually needed
+ to be changed.
+
+Author: Peter Michael Green <plugwash@debian.org>
+Bug-Debian: http://bugs.debian.org/719388
+
+--- openwalnut-1.3.1+hg5849.orig/src/modules/isosurface/WMIsosurface.cpp
++++ openwalnut-1.3.1+hg5849/src/modules/isosurface/WMIsosurface.cpp
+@@ -374,7 +374,7 @@ void WMIsosurface::renderMesh()
+ lock.unlock();
+ }
+
+- osg::ref_ptr< osg::Geometry > surfaceGeometry( new osg::Geometry() );
++ osg::ref_ptr< deprecated_osg::Geometry > surfaceGeometry( new deprecated_osg::Geometry() );
+ m_surfaceGeode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+
+ m_surfaceGeode->setName( "iso surface" );
+@@ -396,12 +396,12 @@ void WMIsosurface::renderMesh()
+ if( m_useMarchingLego->get( true ) )
+ {
+ surfaceGeometry->setNormalArray( m_triMesh->getTriangleNormalArray() );
+- surfaceGeometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ surfaceGeometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+ }
+ else
+ {
+ surfaceGeometry->setNormalArray( m_triMesh->getVertexNormalArray() );
+- surfaceGeometry->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
++ surfaceGeometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+ }
+
+ m_surfaceGeode->addDrawable( surfaceGeometry );
+@@ -413,7 +413,7 @@ void WMIsosurface::renderMesh()
+
+ colors->push_back( m_surfaceColor->get( true ) );
+ surfaceGeometry->setColorArray( colors );
+- surfaceGeometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ surfaceGeometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ osg::ref_ptr<osg::LightModel> lightModel( new osg::LightModel() );
+ lightModel->setTwoSided( true );
+--- openwalnut-1.3.1+hg5849.orig/src/modules/histogramView/WMHistogramView.cpp
++++ openwalnut-1.3.1+hg5849/src/modules/histogramView/WMHistogramView.cpp
+@@ -562,12 +562,12 @@ void WMHistogramView::createGeometryBars
+
+ // create drawable for the quads
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 * m_histograms[ k ]->size() ) );
+ geometry->setVertexArray( quadVertices );
+ geometry->setColorArray( quadColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ geometry->setTexCoordArray( 0, quadTexCoords );
+
+ // enable VBO
+@@ -579,12 +579,12 @@ void WMHistogramView::createGeometryBars
+
+ // create drawable for the outlines
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINES, 0, 6 * m_histograms[ k ]->size() ) );
+ geometry->setVertexArray( lineVertices );
+ geometry->setColorArray( lineColors );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // enable VBO
+ geometry->setUseDisplayList( false );
+@@ -717,12 +717,12 @@ void WMHistogramView::createGeometryCurv
+
+ // create drawable for the quads
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 * m_histograms[ k ]->size() - 4 ) );
+ geometry->setVertexArray( quadVertices );
+ geometry->setColorArray( quadColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ geometry->setTexCoordArray( 0, quadTexCoords );
+
+ // enable VBO
+@@ -734,12 +734,12 @@ void WMHistogramView::createGeometryCurv
+
+ // create drawable for the outlines
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINE_STRIP, 0, m_histograms[ k ]->size() ) );
+ geometry->setVertexArray( lineVertices );
+ geometry->setColorArray( lineColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ // enable VBO
+ geometry->setUseDisplayList( false );
+@@ -838,12 +838,12 @@ void WMHistogramView::createGeometryStai
+
+ // create drawable for the lines
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINE_STRIP, 0, 2 * m_histograms[ k ]->size() + 2 ) );
+ geometry->setVertexArray( lineVertices );
+ geometry->setColorArray( lineColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ // enable VBO
+ geometry->setUseDisplayList( false );
+@@ -1098,12 +1098,12 @@ void WMHistogramView::createFrame()
+
+ // create drawable for the lines
+ {
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINES, 0, 4 + 2 * numLabels ) );
+ geometry->setVertexArray( lineVertices );
+ geometry->setColorArray( lineColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ // enable VBO
+ geometry->setUseDisplayList( false );
+@@ -1224,12 +1224,12 @@ void WMHistogramView::createInfo()
+ quadVertices->push_back( histogramSpaceToWindowSpace(
+ WVector2d( m_histograms[ 0 ]->getIntervalForIndex( bin ).first, m_histogramUpperRight[ 1 ] ) ) );
+
+- osg::Geometry* geometry = new osg::Geometry;
++ deprecated_osg::Geometry* geometry = new deprecated_osg::Geometry;
+
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 ) );
+ geometry->setVertexArray( quadVertices );
+ geometry->setColorArray( quadColors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ // enable VBO
+ geometry->setUseDisplayList( false );
+--- openwalnut-1.3.1+hg5849.orig/src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp
++++ openwalnut-1.3.1+hg5849/src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp
+@@ -764,7 +764,7 @@ void WMClusterDisplayVoxels::renderMesh(
+ {
+ for( size_t i = 0; i < m_triMeshes.size(); ++i )
+ {
+- osg::Geometry* surfaceGeometry = new osg::Geometry();
++ deprecated_osg::Geometry* surfaceGeometry = new deprecated_osg::Geometry();
+ osg::ref_ptr< osg::Geode >outputGeode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+
+ outputGeode->setName( ( std::string( "cluster" ) + string_utils::toString( m_activatedClusters[i] ) ).c_str() );
+@@ -774,14 +774,14 @@ void WMClusterDisplayVoxels::renderMesh(
+ // ------------------------------------------------
+ // normals
+ surfaceGeometry->setNormalArray( m_triMeshes[i]->getTriangleNormalArray() );
+- surfaceGeometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ surfaceGeometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // ------------------------------------------------
+ // colors
+ osg::Vec4Array* colors = new osg::Vec4Array;
+ colors->push_back( m_clusterColors[m_activatedClusters[i]] );
+ surfaceGeometry->setColorArray( colors );
+- surfaceGeometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ surfaceGeometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ osg::DrawElementsUInt* surfaceElement = new osg::DrawElementsUInt( osg::PrimitiveSet::TRIANGLES, 0 );
+
+@@ -807,7 +807,7 @@ void WMClusterDisplayVoxels::renderMesh(
+ }
+ if( m_propShowVoxelTriangulation->get( true ) && m_showNotInClusters->get() )
+ {
+- osg::Geometry* surfaceGeometry = new osg::Geometry();
++ deprecated_osg::Geometry* surfaceGeometry = new deprecated_osg::Geometry();
+ osg::ref_ptr< osg::Geode >outputGeode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+
+ outputGeode->setName( ( std::string( "non active" ) ).c_str() );
+@@ -817,7 +817,7 @@ void WMClusterDisplayVoxels::renderMesh(
+ // ------------------------------------------------
+ // normals
+ surfaceGeometry->setNormalArray( m_nonActiveMesh->getTriangleNormalArray() );
+- surfaceGeometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ surfaceGeometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // ------------------------------------------------
+ // colors
+@@ -825,7 +825,7 @@ void WMClusterDisplayVoxels::renderMesh(
+
+ colors->push_back( osg::Vec4( 0.3, 0.3, 0.3, 1.0f ) );
+ surfaceGeometry->setColorArray( colors );
+- surfaceGeometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ surfaceGeometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ osg::DrawElementsUInt* surfaceElement = new osg::DrawElementsUInt( osg::PrimitiveSet::TRIANGLES, 0 );
+
+--- openwalnut-1.3.1+hg5849.orig/src/modules/coordinateHUD/WMCoordinateHUD.cpp
++++ openwalnut-1.3.1+hg5849/src/modules/coordinateHUD/WMCoordinateHUD.cpp
+@@ -178,7 +178,7 @@ void WMCoordinateHUD::buildColorAxis()
+ {
+ // build the geometry & geode for the coordinate axis
+ osg::ref_ptr< osg::Geode > coordGeode = new osg::Geode();
+- osg::ref_ptr< osg::Geometry> coordGeom = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry> coordGeom = new deprecated_osg::Geometry;
+
+ // Vertices
+ osg::Vec3Array* vertices = new osg::Vec3Array;
+@@ -209,7 +209,7 @@ void WMCoordinateHUD::buildColorAxis()
+
+ // add color to geometry
+ coordGeom->setColorArray( color );
+- coordGeom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ coordGeom->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+
+ // primitives = draw lines between vertices
+ osg::DrawArrays *da = new osg::DrawArrays( osg::PrimitiveSet::LINES, 0, vertices->size( ) );
+@@ -227,7 +227,7 @@ void WMCoordinateHUD::buildBWAxis()
+ {
+ //build the geometry & geode for the coordinate axis
+ osg::ref_ptr< osg::Geode > coordGeode = new osg::Geode();
+- osg::ref_ptr< osg::Geometry> coordGeom = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry> coordGeom = new deprecated_osg::Geometry;
+
+ //Vertices
+ osg::Vec3Array* vertices = new osg::Vec3Array;
+@@ -253,7 +253,7 @@ void WMCoordinateHUD::buildBWAxis()
+
+ //add color to geometry
+ coordGeom->setColorArray( color );
+- coordGeom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ coordGeom->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+
+ //primitives = draw lines between vertices
+ osg::DrawArrays *da = new osg::DrawArrays( osg::PrimitiveSet::LINES, 0, vertices->size( ) );
+@@ -271,7 +271,7 @@ void WMCoordinateHUD::buildColorCube( bo
+ {
+ // build the geometry & geode for the coordinate axis
+ osg::ref_ptr< osg::Geode > coordGeode = new osg::Geode();
+- osg::ref_ptr< osg::Geometry> coordGeom = new osg::Geometry;
++ osg::ref_ptr< deprecated_osg::Geometry> coordGeom = new deprecated_osg::Geometry;
+
+ // Vertices
+ osg::Vec3Array* vertices = new osg::Vec3Array( 36 );
+@@ -301,7 +301,7 @@ void WMCoordinateHUD::buildColorCube( bo
+
+ // add color to geometry
+ coordGeom->setColorArray( color );
+- coordGeom->setColorBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ coordGeom->setColorBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // primitives = draw lines between vertices
+ osg::DrawArrays *da = new osg::DrawArrays( osg::PrimitiveSet::TRIANGLES, 0, vertices->size( ) );
+--- openwalnut-1.3.1+hg5849.orig/src/modules/voxelizer/WMVoxelizer.cpp
++++ openwalnut-1.3.1+hg5849/src/modules/voxelizer/WMVoxelizer.cpp
+@@ -318,7 +318,7 @@ osg::ref_ptr< osg::Geode > WMVoxelizer::
+ using osg::ref_ptr;
+ ref_ptr< osg::Vec3Array > vertices = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ ref_ptr< osg::Vec4Array > colors = ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+- ref_ptr< osg::Geometry > geometry = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > geometry = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+ ref_ptr< osg::Vec3Array > normals = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+
+ // cycle through all positions in the dataSet
+@@ -349,9 +349,9 @@ osg::ref_ptr< osg::Geode > WMVoxelizer::
+ geometry->setVertexArray( vertices );
+ colors->push_back( WColor( 1.0, 0.0, 0.0, 0.1 ) );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+ geometry->setNormalArray( normals );
+- geometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ geometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+ osg::ref_ptr< osg::Geode > geode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+ geode->addDrawable( geometry );
+
+--- openwalnut-1.3.1+hg5849.orig/src/core/graphicsEngine/WGEGeodeUtils.h
++++ openwalnut-1.3.1+hg5849/src/core/graphicsEngine/WGEGeodeUtils.h
+@@ -72,26 +72,26 @@ namespace wge
+ osg::ref_ptr< osg::Node > generateSolidBoundingBoxNode( const WBoundingBox& bb, const WColor& color, bool threeDTexCoords = true );
+
+ /**
+- * Creates a osg::Geometry containing an unit cube, having 3D texture coordinates.
++ * Creates a deprecated_osg::Geometry containing an unit cube, having 3D texture coordinates.
+ *
+ * \param color the color to set for all vertices
+ *
+ * \return the geometry
+ */
+- osg::ref_ptr< osg::Geometry > createUnitCube( const WColor& color );
++ osg::ref_ptr< deprecated_osg::Geometry > createUnitCube( const WColor& color );
+
+ /**
+- * Creates a osg::Geometry containing an unit cube as line-strips, having 3D texture coordinates.
++ * Creates a deprecated_osg::Geometry containing an unit cube as line-strips, having 3D texture coordinates.
+ *
+ * \param color the color to set for all vertices
+ *
+ * \return the geometry
+ */
+- osg::ref_ptr< osg::Geometry > createUnitCubeAsLines( const WColor& color );
++ osg::ref_ptr< deprecated_osg::Geometry > createUnitCubeAsLines( const WColor& color );
+
+ /**
+ * Extract the vertices and triangles from a WTriangleMesh and save them
+- * into an osg::Geometry. It can use the normals and per-vertex colors of the mesh.
++ * into an deprecated_osg::Geometry. It can use the normals and per-vertex colors of the mesh.
+ *
+ * \param mesh the WTriangleMesh used as input
+ * \param includeNormals When true, calculate the vertex normals and include
+@@ -99,10 +99,10 @@ namespace wge
+ * \param defaultColor This color is used in case the useMeshColor parameter is false or no colors are defined in the mesh.
+ * \param lighting if true, a standard lighting is activated for this geometry
+ * \param useMeshColor if true, the mesh color is used. If false, the defaultColor is used.
+- * \return an osg::Geometry containing the mesh
+- * \note mesh cannot be const since osg::Geometry needs non-const pointers to the contained arrays
++ * \return an deprecated_osg::Geometry containing the mesh
++ * \note mesh cannot be const since deprecated_osg::Geometry needs non-const pointers to the contained arrays
+ */
+- osg::ref_ptr< osg::Geometry > convertToOsgGeometry( WTriangleMesh::SPtr mesh,
++ osg::ref_ptr< deprecated_osg::Geometry > convertToOsgGeometry( WTriangleMesh::SPtr mesh,
+ const WColor& defaultColor = WColor( 1.0, 1.0, 1.0, 1.0 ),
+ bool includeNormals = false,
+ bool lighting = false,
+@@ -110,7 +110,7 @@ namespace wge
+
+ /**
+ * Extract the vertices and triangles from a WTriangleMesh and save them
+- * into an osg::Geometry. It can use the normals and per-vertex colors of the mesh.
++ * into an deprecated_osg::Geometry. It can use the normals and per-vertex colors of the mesh.
+ * This method additionally uses the specified vertexID-color map to provide additional coloring.
+ *
+ * \param mesh the WTriangleMesh used as input
+@@ -119,10 +119,10 @@ namespace wge
+ * them into the geometry.
+ * \param defaultColor This color is used in case the colorMap does not provide a color for a vertex
+ * \param lighting if true, a standard lighting is activated for this geometry*
+- * \return an osg::Geometry containing the mesh
+- * \note mesh cannot be const since osg::Geometry needs non-const pointers to the contained arrays
++ * \return an deprecated_osg::Geometry containing the mesh
++ * \note mesh cannot be const since deprecated_osg::Geometry needs non-const pointers to the contained arrays
+ */
+- osg::ref_ptr< osg::Geometry > convertToOsgGeometry( WTriangleMesh::SPtr mesh, const WColoredVertices& colorMap,
++ osg::ref_ptr< deprecated_osg::Geometry > convertToOsgGeometry( WTriangleMesh::SPtr mesh, const WColoredVertices& colorMap,
+ const WColor& defaultColor = WColor( 1.0, 1.0, 1.0, 1.0 ),
+ bool includeNormals = false,
+ bool lighting = false
+@@ -135,9 +135,9 @@ namespace wge
+ * \param defaultColor This color is used in case the useMeshColor parameter is false or no colors are defined in the mesh.
+ * \param useMeshColor If true, the mesh color is used. If false, the defaultColor is used.
+ *
+- * \return an osg::Geometry containing the mesh as lines
++ * \return an deprecated_osg::Geometry containing the mesh as lines
+ */
+- osg::ref_ptr< osg::Geometry > convertToOsgGeometryLines( WTriangleMesh::SPtr mesh,
++ osg::ref_ptr< deprecated_osg::Geometry > convertToOsgGeometryLines( WTriangleMesh::SPtr mesh,
+ const WColor& defaultColor = WColor( 1.0, 1.0, 1.0, 1.0 ),
+ bool useMeshColor = true );
+
+@@ -250,7 +250,7 @@ template< class Container > inline osg::
+ {
+ osg::ref_ptr< osg::Vec3Array > vertices = osg::ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ osg::ref_ptr< osg::Vec4Array > colors = osg::ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+- osg::ref_ptr< osg::Geometry > geometry = osg::ref_ptr< osg::Geometry >( new osg::Geometry );
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = osg::ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+ osg::ref_ptr< osg::Vec3Array > normals = osg::ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+
+ for( typename Container::const_iterator point = points->begin(); point != points->end(); ++point )
+@@ -278,9 +278,9 @@ template< class Container > inline osg::
+ geometry->setVertexArray( vertices );
+ colors->push_back( color );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ geometry->setNormalArray( normals );
+- geometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ geometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+ osg::ref_ptr< osg::Geode > geode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+ geode->addDrawable( geometry );
+ return geode;
+--- openwalnut-1.3.1+hg5849.orig/src/core/graphicsEngine/WROIArbitrary.cpp
++++ openwalnut-1.3.1+hg5849/src/core/graphicsEngine/WROIArbitrary.cpp
+@@ -155,7 +155,7 @@ void WROIArbitrary::updateGFX()
+ &m_vals,
+ m_threshold->get() );
+
+- osg::Geometry* surfaceGeometry = new osg::Geometry();
++ deprecated_osg::Geometry* surfaceGeometry = new deprecated_osg::Geometry();
+ setName( "roi" );
+
+ surfaceGeometry->setVertexArray( m_triMesh->getVertexArray() );
+@@ -163,14 +163,14 @@ void WROIArbitrary::updateGFX()
+ // ------------------------------------------------
+ // normals
+ surfaceGeometry->setNormalArray( m_triMesh->getTriangleNormalArray() );
+- surfaceGeometry->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ surfaceGeometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // ------------------------------------------------
+ // colors
+ osg::Vec4Array* colors = new osg::Vec4Array;
+ colors->push_back( m_color );
+ surfaceGeometry->setColorArray( colors );
+- surfaceGeometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ surfaceGeometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ osg::DrawElementsUInt* surfaceElement = new osg::DrawElementsUInt( osg::PrimitiveSet::TRIANGLES, 0 );
+
+--- openwalnut-1.3.1+hg5849.orig/src/core/graphicsEngine/WGEGeodeUtils.cpp
++++ openwalnut-1.3.1+hg5849/src/core/graphicsEngine/WGEGeodeUtils.cpp
+@@ -58,7 +58,7 @@ osg::ref_ptr< osg::Geode > wge::generate
+ using osg::ref_ptr;
+ ref_ptr< osg::Vec3Array > vertices = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ ref_ptr< osg::Vec4Array > colors = ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+- ref_ptr< osg::Geometry > geometry = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > geometry = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+
+ vertices->push_back( osg::Vec3( pos1[0], pos1[1], pos1[2] ) );
+ vertices->push_back( osg::Vec3( pos2[0], pos1[1], pos1[2] ) );
+@@ -85,7 +85,7 @@ osg::ref_ptr< osg::Geode > wge::generate
+ geometry->setVertexArray( vertices );
+ colors->push_back( color );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ osg::ref_ptr< osg::Geode > geode = osg::ref_ptr< osg::Geode >( new osg::Geode );
+ geode->addDrawable( geometry );
+
+@@ -96,10 +96,10 @@ osg::ref_ptr< osg::Geode > wge::generate
+ return geode;
+ }
+
+-osg::ref_ptr< osg::Geometry > wge::createUnitCube( const WColor& color )
++osg::ref_ptr< deprecated_osg::Geometry > wge::createUnitCube( const WColor& color )
+ {
+ // create the unit cube manually as the ShapeDrawable and osg::Box does not provide 3D texture coordinates
+- osg::ref_ptr< osg::Geometry > cube = new osg::Geometry();
++ osg::ref_ptr< deprecated_osg::Geometry > cube = new deprecated_osg::Geometry();
+ osg::ref_ptr< osg::Vec3Array > vertices = osg::ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ osg::ref_ptr< osg::Vec3Array > normals = osg::ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ osg::ref_ptr< osg::Vec4Array > colors = osg::ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+@@ -155,20 +155,20 @@ osg::ref_ptr< osg::Geometry > wge::creat
+
+ // set normals
+ cube->setNormalArray( normals );
+- cube->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ cube->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ // finally, the colors
+ colors->push_back( color );
+ cube->setColorArray( colors );
+- cube->setColorBinding( osg::Geometry::BIND_OVERALL );
++ cube->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ return cube;
+ }
+
+-osg::ref_ptr< osg::Geometry > wge::createUnitCubeAsLines( const WColor& color )
++osg::ref_ptr< deprecated_osg::Geometry > wge::createUnitCubeAsLines( const WColor& color )
+ {
+ // create the unit cube manually as the ShapeDrawable and osg::Box does not provide 3D texture coordinates
+- osg::ref_ptr< osg::Geometry > cube = new osg::Geometry();
++ osg::ref_ptr< deprecated_osg::Geometry > cube = new deprecated_osg::Geometry();
+ osg::ref_ptr< osg::Vec3Array > vertices = osg::ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ osg::ref_ptr< osg::Vec4Array > colors = osg::ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+
+@@ -203,7 +203,7 @@ osg::ref_ptr< osg::Geometry > wge::creat
+ // finally, the colors
+ colors->push_back( color );
+ cube->setColorArray( colors );
+- cube->setColorBinding( osg::Geometry::BIND_OVERALL );
++ cube->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ return cube;
+ }
+@@ -244,13 +244,13 @@ osg::ref_ptr< osg::Node > wge::generateS
+ return transform;
+ }
+
+-osg::ref_ptr< osg::Geometry > wge::convertToOsgGeometry( WTriangleMesh::SPtr mesh,
++osg::ref_ptr< deprecated_osg::Geometry > wge::convertToOsgGeometry( WTriangleMesh::SPtr mesh,
+ const WColor& defaultColor,
+ bool includeNormals,
+ bool lighting,
+ bool useMeshColor )
+ {
+- osg::ref_ptr< osg::Geometry> geometry( new osg::Geometry );
++ osg::ref_ptr< deprecated_osg::Geometry> geometry( new deprecated_osg::Geometry );
+ geometry->setVertexArray( mesh->getVertexArray() );
+
+ osg::DrawElementsUInt* surfaceElement;
+@@ -270,14 +270,14 @@ osg::ref_ptr< osg::Geometry > wge::conve
+ if( mesh->getVertexColorArray() && useMeshColor )
+ {
+ geometry->setColorArray( mesh->getVertexColorArray() );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+ }
+ else
+ {
+ osg::ref_ptr< osg::Vec4Array > colors = osg::ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+ colors->push_back( defaultColor );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ }
+
+ // ------------------------------------------------
+@@ -285,7 +285,7 @@ osg::ref_ptr< osg::Geometry > wge::conve
+ if( includeNormals )
+ {
+ geometry->setNormalArray( mesh->getVertexNormalArray() );
+- geometry->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setNormalBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+
+ if( lighting )
+ {
+@@ -314,10 +314,10 @@ osg::ref_ptr< osg::Geometry > wge::conve
+ return geometry;
+ }
+
+-osg::ref_ptr< osg::Geometry > wge::convertToOsgGeometry( WTriangleMesh::SPtr mesh, const WColoredVertices& colorMap, const WColor& defaultColor,
++osg::ref_ptr< deprecated_osg::Geometry > wge::convertToOsgGeometry( WTriangleMesh::SPtr mesh, const WColoredVertices& colorMap, const WColor& defaultColor,
+ bool includeNormals, bool lighting )
+ {
+- osg::Geometry* geometry = convertToOsgGeometry( mesh, defaultColor, includeNormals, lighting, false );
++ deprecated_osg::Geometry* geometry = convertToOsgGeometry( mesh, defaultColor, includeNormals, lighting, false );
+
+ // ------------------------------------------------
+ // colors
+@@ -336,16 +336,16 @@ osg::ref_ptr< osg::Geometry > wge::conve
+ }
+
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+
+ return geometry;
+ }
+
+-osg::ref_ptr< osg::Geometry > wge::convertToOsgGeometryLines( WTriangleMesh::SPtr mesh,
++osg::ref_ptr< deprecated_osg::Geometry > wge::convertToOsgGeometryLines( WTriangleMesh::SPtr mesh,
+ const WColor& defaultColor,
+ bool useMeshColor )
+ {
+- osg::ref_ptr< osg::Geometry > geometry( new osg::Geometry );
++ osg::ref_ptr< deprecated_osg::Geometry > geometry( new deprecated_osg::Geometry );
+ geometry->setVertexArray( mesh->getVertexArray() );
+
+ osg::DrawElementsUInt* meshElement;
+@@ -369,14 +369,14 @@ osg::ref_ptr< osg::Geometry > wge::conve
+ if( mesh->getVertexColorArray() && useMeshColor )
+ {
+ geometry->setColorArray( mesh->getVertexColorArray() );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+ }
+ else
+ {
+ osg::ref_ptr< osg::Vec4Array > colors = osg::ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+ colors->push_back( defaultColor );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ }
+
+ osg::StateSet* stateset = geometry->getOrCreateStateSet();
+@@ -391,7 +391,7 @@ osg::ref_ptr< osg::Geode > wge::generate
+ using osg::ref_ptr;
+ ref_ptr< osg::Vec3Array > vertices = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ ref_ptr< osg::Vec4Array > colors = ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+- ref_ptr< osg::Geometry > geometry = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > geometry = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+
+ for( size_t i = 1; i < line.size(); ++i )
+ {
+@@ -409,12 +409,12 @@ osg::ref_ptr< osg::Geode > wge::generate
+ colors->clear();
+ colors->push_back( color );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ }
+ else
+ {
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_VERTEX );
+ }
+
+ // line width
+@@ -467,7 +467,7 @@ osg::ref_ptr< osg::Geode > wge::genFinit
+ using osg::ref_ptr;
+ ref_ptr< osg::Vec3Array > vertices = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ ref_ptr< osg::Vec4Array > colors = ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+- ref_ptr< osg::Geometry > geometry = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > geometry = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+
+ colors->push_back( color );
+
+@@ -479,7 +479,7 @@ osg::ref_ptr< osg::Geode > wge::genFinit
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 ) );
+ geometry->setVertexArray( vertices );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+
+ osg::StateSet* stateset = new osg::StateSet;
+ stateset->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
+@@ -491,13 +491,13 @@ osg::ref_ptr< osg::Geode > wge::genFinit
+ if( border )
+ {
+ vertices->push_back( vertices->front() );
+- ref_ptr< osg::Geometry > borderGeom = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > borderGeom = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+ borderGeom->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINE_STRIP, 0, 4 ) );
+ borderGeom->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::LINE_STRIP, 3, 2 ) );
+ ref_ptr< osg::Vec4Array > colors = ref_ptr< osg::Vec4Array >( new osg::Vec4Array );
+ colors->push_back( inverseColor( color ) );
+ borderGeom->setColorArray( colors );
+- borderGeom->setColorBinding( osg::Geometry::BIND_OVERALL );
++ borderGeom->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ borderGeom->setVertexArray( vertices );
+ geode->addDrawable( borderGeom );
+ }
+@@ -534,11 +534,11 @@ osg::ref_ptr< osg::Geode > wge::genFinit
+ texcoords0->push_back( bNorm );
+
+ // put it all together
+- osg::ref_ptr< osg::Geometry > geometry = new osg::Geometry();
++ osg::ref_ptr< deprecated_osg::Geometry > geometry = new deprecated_osg::Geometry();
+ geometry->setVertexArray( vertices );
+ geometry->setTexCoordArray( 0, texcoords0 );
+- geometry->setNormalBinding( osg::Geometry::BIND_OVERALL );
+- geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setNormalBinding( deprecated_osg::Geometry::BIND_OVERALL );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ geometry->setNormalArray( normals );
+ geometry->setColorArray( colors );
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 ) );
+@@ -578,16 +578,16 @@ osg::ref_ptr< WGESubdividedPlane > wge::
+ }
+ }
+
+- ref_ptr< osg::Geometry > geometry = ref_ptr< osg::Geometry >( new osg::Geometry );
++ ref_ptr< deprecated_osg::Geometry > geometry = ref_ptr< deprecated_osg::Geometry >( new deprecated_osg::Geometry );
+ geometry->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, vertices->size() ) );
+ geometry->setVertexArray( vertices );
+ geometry->setColorArray( colors );
+- geometry->setColorBinding( osg::Geometry::BIND_PER_PRIMITIVE );
++ geometry->setColorBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE );
+
+ ref_ptr< osg::Vec3Array > normals = ref_ptr< osg::Vec3Array >( new osg::Vec3Array );
+ normals->push_back( osg::Vec3( 0.0, 0.0, 1.0 ) );
+ geometry->setNormalArray( normals );
+- geometry->setNormalBinding( osg::Geometry::BIND_OVERALL );
++ geometry->setNormalBinding( deprecated_osg::Geometry::BIND_OVERALL );
+ osg::ref_ptr< WGESubdividedPlane > geode = osg::ref_ptr< WGESubdividedPlane >( new WGESubdividedPlane );
+ geode->addDrawable( geometry );
+ geode->setCenterArray( centers );