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

Fixed the handle of triangle fan.

Browse Source
This commit is contained in:
Robert Osfield
2007-04-06 19:51:20 +00:00
parent e2ba8d91c0
commit a78e8d2b6b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgUtil/TangentSpaceGenerator.cpp
View File

@@ -55,12 +55,12 @@ void TangentSpaceGenerator::generate(osg::Geometry *geo, int normal_map_tex_unit
}
}
unsigned i; // VC6 doesn't like for-scoped variables
unsigned int i; // VC6 doesn't like for-scoped variables
for (unsigned pri=0; pri<geo->getNumPrimitiveSets(); ++pri) {
for (unsigned int pri=0; pri<geo->getNumPrimitiveSets(); ++pri) {
osg::PrimitiveSet *pset = geo->getPrimitiveSet(pri);
unsigned N = pset->getNumIndices();
unsigned int N = pset->getNumIndices();
switch (pset->getMode()) {
@@ -80,9 +80,9 @@ void TangentSpaceGenerator::generate(osg::Geometry *geo, int normal_map_tex_unit
case osg::PrimitiveSet::TRIANGLE_STRIP:
if (pset->getType() == osg::PrimitiveSet::DrawArrayLengthsPrimitiveType) {
osg::DrawArrayLengths *dal = static_cast<osg::DrawArrayLengths *>(pset);
unsigned j = 0;
unsigned int j = 0;
for (osg::DrawArrayLengths::const_iterator pi=dal->begin(); pi!=dal->end(); ++pi) {
unsigned iN = static_cast<unsigned>(*pi-2);
unsigned int iN = static_cast<unsigned int>(*pi-2);
for (i=0; i<iN; ++i, ++j) {
if ((i%2) == 0) {
compute(pset, vx, nx, tx, j, j+1, j+2);
@@ -106,9 +106,9 @@ void TangentSpaceGenerator::generate(osg::Geometry *geo, int normal_map_tex_unit
case osg::PrimitiveSet::TRIANGLE_FAN:
if (pset->getType() == osg::PrimitiveSet::DrawArrayLengthsPrimitiveType) {
osg::DrawArrayLengths *dal = static_cast<osg::DrawArrayLengths *>(pset);
unsigned j = 0;
unsigned int j = 0;
for (osg::DrawArrayLengths::const_iterator pi=dal->begin(); pi!=dal->end(); ++pi) {
unsigned iN = static_cast<unsigned>(*pi-2);
unsigned int iN = static_cast<unsigned int>(*pi-2);
for (i=0; i<iN; ++i) {
compute(pset, vx, nx, tx, 0, j+1, j+2);
}
@@ -116,7 +116,7 @@ void TangentSpaceGenerator::generate(osg::Geometry *geo, int normal_map_tex_unit
}
} else {
for (i=0; i<N-2; ++i) {
compute(pset, vx, nx, tx, 2, i+1, i+2);
compute(pset, vx, nx, tx, 0, i+1, i+2);
}
}
break;