manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Paolo Cignoni 2005-09-28 10:30:14 +00:00
parent 5b728745f4
commit 239c1a5260
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
wrap/io_trimesh/import_off.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.6 2005/01/26 22:44:51 cignoni
Resolved scoping of constant of OFF codes
Revision 1.5 2005/01/18 12:35:18 rita_borgo Revision 1.5 2005/01/18 12:35:18 rita_borgo
Added #include<vcg/complex/trimesh/allocate.h> Added #include<vcg/complex/trimesh/allocate.h>
it was giving problems with Allocator:: it was giving problems with Allocator::
@ -158,9 +161,25 @@ namespace vcg
return UnexpectedEOF; return UnexpectedEOF;
TokenizeNextLine(stream, tokens); TokenizeNextLine(stream, tokens);
for (unsigned int j=0; j<3; j++) if(tokens.size() ==3)
{
for (unsigned int j=0; j<3; j++)
(*v_iter).P()[j] = (ScalarType) atof(tokens[j].c_str()); (*v_iter).P()[j] = (ScalarType) atof(tokens[j].c_str());
}
else
{
int k = tokens.size();
for (unsigned int j=0; j<3; j++)
{
(*v_iter).P()[j] = (ScalarType) atof(tokens[k].c_str());
k--;
if(k==0)
{
TokenizeNextLine(stream, tokens);
k = tokens.size();
}
}
}
if (isNormalDefined) if (isNormalDefined)
for (unsigned int j=3; j<6; j++) for (unsigned int j=3; j<6; j++)
(*v_iter).N()[j] = (ScalarType) atof(tokens[j].c_str()); (*v_iter).N()[j] = (ScalarType) atof(tokens[j].c_str());
@ -183,9 +202,26 @@ namespace vcg
int vert_per_face = atoi(tokens[0].c_str()); int vert_per_face = atoi(tokens[0].c_str());
if (vert_per_face == 3) if (vert_per_face == 3)
{ {
mesh.face[f].V(0) = &(mesh.vert[ atoi(tokens[1].c_str()) ]); if(tokens.size() ==4)
mesh.face[f].V(1) = &(mesh.vert[ atoi(tokens[2].c_str()) ]); {
mesh.face[f].V(2) = &(mesh.vert[ atoi(tokens[3].c_str()) ]); for(unsigned int j = 0; j<3; j++)
mesh.face[f].V(j) = &(mesh.vert[ atoi(tokens[j+1].c_str()) ]);
}
else
{
TokenizeNextLine(stream, tokens);
int k = tokens.size();
for (unsigned int j=0; j<3; j++)
{
mesh.face[f].V(j) = &(mesh.vert[ atoi(tokens[j].c_str()) ]);
k--;
if(k==0)
{
TokenizeNextLine(stream, tokens);
k = tokens.size();
}
}
}
} }
else else
{ {