Added and removed typenames for gcc compiling...

This commit is contained in:
Paolo Cignoni 2005-12-01 00:58:56 +00:00
parent 9cb3bc6dbb
commit 0863ff9364
4 changed files with 20 additions and 14 deletions

View File

@ -50,14 +50,14 @@ public:
fprintf(o,"2\n"); fprintf(o,"2\n");
fprintf(o,"ENTITIES\n"); fprintf(o,"ENTITIES\n");
SaveMeshType::FaceIterator fi; typename SaveMeshType::FaceIterator fi;
for(fi=m.face.begin(); fi!=m.face.end(); ++fi) for(fi=m.face.begin(); fi!=m.face.end(); ++fi)
{ {
if (!fi->IsD()) if (!fi->IsD())
{ {
SaveMeshType::CoordType v0 = (*fi).V(0)->P(); typename SaveMeshType::CoordType v0 = (*fi).V(0)->P();
SaveMeshType::CoordType v1 = (*fi).V(1)->P(); typename SaveMeshType::CoordType v1 = (*fi).V(1)->P();
SaveMeshType::CoordType v2 = (*fi).V(2)->P(); typename SaveMeshType::CoordType v2 = (*fi).V(2)->P();
fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n"); fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n");
fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X
fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y
@ -96,4 +96,4 @@ public:
#endif #endif

View File

@ -51,8 +51,8 @@ namespace vcg {
static bool Save(SaveMeshType &m, const char * filename ) static bool Save(SaveMeshType &m, const char * filename )
{ {
vcg::face::Pos<SaveMeshType::FaceType> he; vcg::face::Pos<FaceType> he;
vcg::face::Pos<SaveMeshType::FaceType> hei; vcg::face::Pos<FaceType> hei;
FILE * fpout = fopen(filename,"w"); FILE * fpout = fopen(filename,"w");
if(fpout==NULL) return false; if(fpout==NULL) return false;
@ -67,7 +67,7 @@ namespace vcg {
fprintf(fpout,"OFF\n"); fprintf(fpout,"OFF\n");
fprintf(fpout,"%d %d ", m.vn, m.fn); fprintf(fpout,"%d %d ", m.vn, m.fn);
SaveMeshType::FaceIterator fi; typename SaveMeshType::FaceIterator fi;
int count_e = 0; int count_e = 0;
int boundary_e = 0; int boundary_e = 0;
bool counted=false; bool counted=false;
@ -84,7 +84,7 @@ namespace vcg {
{ {
if (face::IsBorder(*fi,j)) //If this edge is a border edge if (face::IsBorder(*fi,j)) //If this edge is a border edge
boundary_e++; // then increase the number of boundary edges boundary_e++; // then increase the number of boundary edges
else if (IsManifold(*fi,j)) //If this edge is manifold else if (face::IsManifold(*fi,j)) //If this edge is manifold
{ {
if((*fi).FFp(j)->IsS()) //If the face on the other side of the edge is already selected if((*fi).FFp(j)->IsS()) //If the face on the other side of the edge is already selected
count_e--; // we counted one edge twice count_e--; // we counted one edge twice
@ -172,4 +172,4 @@ namespace vcg {
} // end namespace io } // end namespace io
} // end namespace vcg } // end namespace vcg
//@} //@}
#endif #endif

View File

@ -25,6 +25,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2004/10/28 00:52:45 cignoni
Better Doxygen documentation
Revision 1.3 2004/03/09 21:26:47 cignoni Revision 1.3 2004/03/09 21:26:47 cignoni
cr lf mismatch cr lf mismatch
@ -124,4 +127,4 @@ static bool Save(SaveMeshType &m, const char * filename , bool binary =true, con
#endif #endif

View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.8 2005/11/12 18:12:16 cignoni
Added casts and changed integral types to remove warnings
Revision 1.7 2005/09/28 10:30:14 rita_borgo Revision 1.7 2005/09/28 10:30:14 rita_borgo
*** empty log message *** *** empty log message ***
@ -516,8 +519,8 @@ namespace vcg
} }
}; };
// /*! @} */ // /*! @} */
}; //namespace io } //namespace io
};//namespace tri }//namespace tri
}; // namespace vcg } // namespace vcg
#endif //__VCGLIB_IMPORT_OFF #endif //__VCGLIB_IMPORT_OFF