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

From Tom Jolly, fixed incorrect setTexCoordIndices to setColorIndices.

Browse Source 
Added support for triangle fan primitives.
This commit is contained in:
Robert Osfield
2003-11-11 16:30:35 +00:00
parent 21881490cd
commit 02274f0ea9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgPlugins/pfb/ConvertFromPerformer.cpp
View File

@@ -551,6 +551,10 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_STRIP,0,np,plen));
break;
case PFGS_TRIFANS :
geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_FAN,0,np,plen));
break;
case PFGS_FLAT_TRISTRIPS :
geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_STRIP,0,np,plen));
break;
@@ -567,6 +571,12 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_LINE_STRIP,0,np,plen));
break;
default:
std::cout << "ConvertFromPerformer::visitGeoSet: Osg can't convert primitive "
<< geoset->getPrimType()
<< std::endl;
break;
}
@@ -896,7 +906,8 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
if(ilist)
{
geom->setTexCoordIndices(0,new osg::UShortArray(nn,ilist));
// geom->setTexCoordIndices(0,new osg::UShortArray(nn,ilist));
geom->setColorIndices(new osg::UShortArray(nn,ilist));
}
}