diff --git a/apps/trimeshinfo/main.cpp b/apps/trimeshinfo/main.cpp index 26a4ffb9..22222a34 100644 --- a/apps/trimeshinfo/main.cpp +++ b/apps/trimeshinfo/main.cpp @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.8 2005/02/15 12:26:06 rita_borgo +Minor changes to self-intersection + Revision 1.7 2005/02/07 15:44:31 rita_borgo Fixed Color and Volume @@ -93,7 +96,8 @@ void OpenMesh(const char *filename, MyMesh &m) inline char* GetExtension(char* filename) { - for(int i=strlen(filename)-1; i >= 0; i--) + int i; + for(i=strlen(filename)-1; i >= 0; i--) if(filename[i] == '.') break; if(i > 0) @@ -157,9 +161,9 @@ static int DuplicateVertex( MyMesh & m ) // V1.0 } return deleted; } -void main(int argc,char ** argv){ +int main(int argc,char ** argv) +{ - char *fmt; MyMesh m; bool DEBUG = false; //load the mesh @@ -207,8 +211,8 @@ void main(int argc,char ** argv){ if(m.HasPerFaceColor()||m.HasPerVertexColor()) { Color4b Color=m.C(); - fprintf(index, "
Object color(4b): %f %f %f
\n\n", Color[0], Color[1], Color[2]); - printf( "\t Object color(4b): %f %f %f \n", Color[0], Color[1], Color[2]); + fprintf(index, "Object color(4b): %i %i %i
\n\n", Color[0], Color[1], Color[2]); + printf( "\t Object color(4b): %i %i %i \n", Color[0], Color[1], Color[2]); } @@ -221,7 +225,6 @@ void main(int argc,char ** argv){ vcg::face::PosNumber of holes: %d
\nNumber of border edges: %d
", numholes, BEdges); - printf("\t Number of holes: %d \n", numholes, BEdges); - printf("\t Number of border edges: %d\n", numholes, BEdges); + printf("\t Number of holes: %d \n", numholes); + printf("\t Number of border edges: %d\n", BEdges); } else { @@ -397,8 +400,6 @@ void main(int argc,char ** argv){ } // Mesh Volume - float vol = m.Volume(); - int nuh = numholes; if((m.Volume()>0.)&&(Manifold)&&(numholes==0)) { fprintf(index,"Volume: %d
\n", m.Volume()); @@ -411,23 +412,23 @@ void main(int argc,char ** argv){ for(f=m.face.begin();f!=m.face.end();++f) (*f).ClearS(); - g=m.face.begin(); f=g; - int CountComp=0; int CountOrient=0; - stack