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

Removed comments, and move the tri stipper slightly later in the code to

Browse Source 
apply it on all geometries.
This commit is contained in:
Robert Osfield
2003-12-12 16:34:46 +00:00
parent f4b5c075be
commit 3fefc3cc7e
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@@ -591,18 +591,10 @@ osg::Drawable* ReaderWriterOBJ::makeDrawable_useSeperateIndices(GLMmodel* obj, G
if (indexArraysEqual)
{
//std::cout<<"Use draw element"<<std::endl;
geom->addPrimitiveSet(new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES,vertexIndices->begin(),vertexIndices->end()));
osgUtil::TriStripVisitor tsv;
tsv.stripify(*geom);
}
else
{
//std::cout<<"Use sepeate indices arrays"<<std::endl;
geom->setVertexIndices(vertexIndices.get());
if (needColors) geom->setColorIndices(vertexIndices.get());
if (needNormals) geom->setNormalIndices(normalIndices.get());
@@ -613,6 +605,9 @@ osg::Drawable* ReaderWriterOBJ::makeDrawable_useSeperateIndices(GLMmodel* obj, G
}
osgUtil::TriStripVisitor tsv;
tsv.stripify(*geom);
if (obj->numnormals==0)
{
osgUtil::SmoothingVisitor tsv;

4
src/osgPlugins/obj/glm.cpp
View File

@@ -277,11 +277,9 @@ _glmReadMTLTextureOptions(GLMmodel* model, unsigned int materialIndex, char* lin
{
char *token;
char seps[] = " \t\n\r\f\v";
std::cout<<"line ["<<line<<"]"<<std::endl;
token = ::strtok(line, seps);
while(NULL != token)
{
std::cout<<"token ["<<token<<"]"<<std::endl;
switch(token[0])
{
case '-':
@@ -346,8 +344,6 @@ _glmReadMTLTextureOptions(GLMmodel* model, unsigned int materialIndex, char* lin
if (0 != strlen(token))
{
model->materials[materialIndex].textureName = strdup(token);
std::cout<<"token ["<<token<<"]"<<std::endl;
std::cout<<"reading material ["<<model->materials[materialIndex].textureName<<"]"<<std::endl;
}
}