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

11
src/osgUtil/SceneGraphBuilder.cpp
View File

@@ -248,26 +248,23 @@ void SceneGraphBuilder::End()
if (_colorSet)
{
_geometry->setColorArray(_colors.get());
_geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
_geometry->setColorArray(_colors.get(), osg::Array::BIND_PER_VERTEX);
}
else
{
osg::Vec4Array* colors = new osg::Vec4Array;
colors->push_back(_color);
_geometry->setColorArray(colors);
_geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
_geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
}
if (_normalSet)
{
_geometry->setNormalArray(_normals.get());
_geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
_geometry->setNormalArray(_normals.get(), osg::Array::BIND_PER_VERTEX);
}
else
{
_geometry->setNormalBinding(osg::Geometry::BIND_OFF);
_geometry->setNormalArray(NULL, osg::Array::BIND_OFF);
}
if (_maxNumTexCoordComponents==1)