Arch Linux

For svn version 535 I needed the following patch:

Index: src/osgwTools/MeshOptimizers.cpp
===================================================================
--- src/osgwTools/MeshOptimizers.cpp (revision 535)
+++ src/osgwTools/MeshOptimizers.cpp (working copy)
@@ -113,7 +113,7 @@
if (array)
_arrayList.push_back(array);
}
- else if (binding == osg::Geometry::BIND_PER_PRIMITIVE)
+ else if (binding == deprecated_osg::Geometry::BIND_PER_PRIMITIVE)
_useDrawElements = false;
}

@@ -260,17 +260,13 @@

void IndexMeshVisitor::makeMesh(Geometry& geom)
{
- if (geom.getNormalBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
- geom.getNormalBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
+ if ( geom.getNormalBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;

- if (geom.getColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
- geom.getColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
+ if ( geom.getColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;

- if (geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
- geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
+ if ( geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;

- if (geom.getFogCoordBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
- geom.getFogCoordBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
+ if ( geom.getFogCoordBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;

// no point optimizing if we don't have enough vertices.
if (!geom.getVertexArray() || geom.getVertexArray()->getNumElements()<3) return;
Index: src/osgwTools/TangentSpaceGeneratorDouble.cpp
===================================================================
--- src/osgwTools/TangentSpaceGeneratorDouble.cpp (revision 535)
+++ src/osgwTools/TangentSpaceGeneratorDouble.cpp (working copy)
@@ -67,21 +67,9 @@


unsigned int vertex_count = vx->getNumElements();
- if (geo->getVertexIndices() == NULL) {
- T_->assign(vertex_count, osg::Vec4());
- B_->assign(vertex_count, osg::Vec4());
- N_->assign(vertex_count, osg::Vec4());
- } else {
- unsigned int index_count = geo->getVertexIndices()->getNumElements();
- T_->assign(index_count, osg::Vec4());
- B_->assign(index_count, osg::Vec4());
- N_->assign(index_count, osg::Vec4());
- indices_ = new osg::UIntArray();
- unsigned int i;
- for (i=0;i<index_count;i++) {
- indices_->push_back(i);
- }
- }
+ T_->assign(vertex_count, osg::Vec4());
+ B_->assign(vertex_count, osg::Vec4());
+ N_->assign(vertex_count, osg::Vec4());

unsigned int i; // VC6 doesn't like for-scoped variables

@@ -162,9 +150,6 @@
// normalize basis vectors and force the normal vector to match
// the triangle normal's direction
unsigned int attrib_count = vx->getNumElements();
- if (geo->getVertexIndices() != NULL) {
- attrib_count = geo->getVertexIndices()->getNumElements();
- }
for (i=0; i<attrib_count; ++i) {
osg::Vec4 &vT = (*T_)[i];
osg::Vec4 &vB = (*B_)[i];