FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Sebastian Messerschmidt, "I've taken some time and refactored some places where the old set*Binding were used."

Browse Source
This commit is contained in:
Robert Osfield
2013-06-26 16:16:23 +00:00
parent bead0740f2
commit a459033eff
13 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgManipulator/RotateCylinderDragger.cpp
View File

@@ -57,8 +57,7 @@ osg::Geometry* createDiskGeometry(float radius, float offset, float z, unsigned
osg::Geometry* geometry = new osg::Geometry;
geometry->setVertexArray(vertexArray);
geometry->setNormalArray(normalArray);
geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
geometry->setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
geometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLE_STRIP, 0, vertexArray->size()));
return geometry;
}

6
src/osgManipulator/TabPlaneDragger.cpp
View File

@@ -42,8 +42,7 @@ osg::Node* createHandleNode(Scale2DDragger* cornerScaleDragger, float handleScal
osg::Vec3Array* normals = new osg::Vec3Array;
normals->push_back(osg::Vec3(0.0,1.0,0.0));
geometry->setNormalArray(normals);
geometry->setNormalBinding(osg::Geometry::BIND_OVERALL);
geometry->setNormalArray(normals, osg::Array::BIND_OVERALL);
osg::Geode* geode = new osg::Geode;
geode->setName("Dragger Handle");
@@ -173,8 +172,7 @@ void createTranslateDraggerGeometry(Scale2DDragger* cornerScaleDragger, Translat
osg::Vec3Array* normals = new osg::Vec3Array;
normals->push_back(osg::Vec3(0.0,1.0,0.0));
geometry->setNormalArray(normals);
geometry->setNormalBinding(osg::Geometry::BIND_OVERALL);
geometry->setNormalArray(normals, osg::Array::BIND_OVERALL);
geode->addDrawable(geometry);

3
src/osgManipulator/TrackballDragger.cpp
View File

@@ -44,8 +44,7 @@ osg::Geometry* createCircleGeometry(float radius, unsigned int numSegments)
}
osg::Geometry* geometry = new osg::Geometry();
geometry->setVertexArray(vertexArray);
geometry->setNormalArray(normalArray);
geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
geometry->setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
geometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_LOOP,0,vertexArray->size()));
return geometry;
}

3
src/osgManipulator/TranslatePlaneDragger.cpp
View File

@@ -88,8 +88,7 @@ void TranslatePlaneDragger::setupDefaultGeometry()
osg::Vec3Array* normals = new osg::Vec3Array;
normals->push_back(osg::Vec3(0.0,1.0,0.0));
geometry->setNormalArray(normals);
geometry->setNormalBinding(osg::Geometry::BIND_OVERALL);
geometry->setNormalArray(normals, osg::Array::BIND_OVERALL);
geode->addDrawable(geometry);