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

corrected a small bug in the progress bar of large files

This commit is contained in:
Paolo Cignoni 2009-07-14 08:58:48 +00:00
parent d71d110703
commit abf6773153
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wrap/io_trimesh/import_stl.h
View File

@ -226,13 +226,13 @@ static int OpenBinary( OpenMeshType &m, const char * filename, CallBackPos *cb=0
STLFacet f; STLFacet f;
int cnt=0; int cnt=0;
int lineCnt=0;
int ret; int ret;
/* Read a single facet from an ASCII .STL file */ /* Read a single facet from an ASCII .STL file */
while(!feof(fp)) while(!feof(fp))
{ {
if((++cnt)%1000) cb( (ftell(fp)*100)/fileLen, "STL Mesh Loading"); if((++cnt)%1000) cb( int(double(ftell(fp))*100.0/fileLen), "STL Mesh Loading");
ret=fscanf(fp, "%*s %*s %f %f %f\n", &f.n.X(), &f.n.Y(), &f.n.Z()); // --> "facet normal 0 0 0"
ret=fscanf(fp, "%*s %*s %f %f %f\n", &f.n.X(), &f.n.Y(), &f.n.Z());
if(ret!=3) if(ret!=3)
{ {
// we could be in the case of a multiple solid object, where after a endfaced instead of another facet we have to skip two lines: // we could be in the case of a multiple solid object, where after a endfaced instead of another facet we have to skip two lines:
@ -241,20 +241,22 @@ static int OpenBinary( OpenMeshType &m, const char * filename, CallBackPos *cb=0
//endsolid <- continue on ret==0 will skip this line //endsolid <- continue on ret==0 will skip this line
//solid ascii <- and this one. //solid ascii <- and this one.
// facet normal 0.000000e+000 7.700727e-001 -6.379562e-001 // facet normal 0.000000e+000 7.700727e-001 -6.379562e-001
lineCnt++;
continue; continue;
} }
ret=fscanf(fp, "%*s %*s"); ret=fscanf(fp, "%*s %*s"); // --> "outer loop"
ret=fscanf(fp, "%*s %f %f %f\n", &f.v[0].X(), &f.v[0].Y(), &f.v[0].Z()); ret=fscanf(fp, "%*s %f %f %f\n", &f.v[0].X(), &f.v[0].Y(), &f.v[0].Z()); // --> "vertex x y z"
if(ret!=3) if(ret!=3)
return E_UNESPECTEDEOF; return E_UNESPECTEDEOF;
ret=fscanf(fp, "%*s %f %f %f\n", &f.v[1].X(), &f.v[1].Y(), &f.v[1].Z()); ret=fscanf(fp, "%*s %f %f %f\n", &f.v[1].X(), &f.v[1].Y(), &f.v[1].Z()); // --> "vertex x y z"
if(ret!=3) if(ret!=3)
return E_UNESPECTEDEOF; return E_UNESPECTEDEOF;
ret=fscanf(fp, "%*s %f %f %f\n", &f.v[2].X(), &f.v[2].Y(), &f.v[2].Z()); ret=fscanf(fp, "%*s %f %f %f\n", &f.v[2].X(), &f.v[2].Y(), &f.v[2].Z()); // --> "vertex x y z"
if(ret!=3) if(ret!=3)
return E_UNESPECTEDEOF; return E_UNESPECTEDEOF;
ret=fscanf(fp, "%*s"); // end loop ret=fscanf(fp, "%*s"); // --> "endloop"
ret=fscanf(fp, "%*s"); // end facet ret=fscanf(fp, "%*s"); // --> "endfacet"
lineCnt+=7;
if(feof(fp)) break; if(feof(fp)) break;
FaceIterator fi=Allocator<OpenMeshType>::AddFaces(m,1); FaceIterator fi=Allocator<OpenMeshType>::AddFaces(m,1);
VertexIterator vi=Allocator<OpenMeshType>::AddVertices(m,3); VertexIterator vi=Allocator<OpenMeshType>::AddVertices(m,3);