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

15
src/osgPlugins/OpenFlight/GeometryRecords.cpp
View File

@@ -12,7 +12,7 @@
*/
//
// OpenFlight<EFBFBD> loader for OpenSceneGraph
// OpenFlight loader for OpenSceneGraph
//
// Copyright (C) 2005-2007 Brede Johansen
//
@@ -589,10 +589,9 @@ protected:
osg::Vec4 col = getPrimaryColor();
col[3] = 1.0f - getTransparency();
geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
osg::Vec4Array* colors = new osg::Vec4Array(1);
(*colors)[0] = col;
geometry->setColorArray(colors);
geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
}
// Normal binding
@@ -602,8 +601,7 @@ protected:
}
else
{
geometry->setNormalBinding(osg::Geometry::BIND_OFF);
geometry->setNormalArray(NULL);
geometry->setNormalArray(0);
}
}
}
@@ -1421,10 +1419,10 @@ protected:
osg::Vec4 col = mesh->getPrimaryColor();
col[3] = 1.0f - mesh->getTransparency();
geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
osg::Vec4Array* colors = new osg::Vec4Array(1);
(*colors)[0] = col;
geometry->setColorArray(colors);
geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
}
// Normal binding
@@ -1434,8 +1432,7 @@ protected:
}
else
{
geometry->setNormalBinding(osg::Geometry::BIND_OFF);
geometry->setNormalArray(NULL);
geometry->setNormalArray(0);
}
mesh->addGeometry(*geometry);