From c69c140e0a1cf569d09dac037739300aaa075449 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Mon, 4 Aug 2008 14:49:02 +0000 Subject: [PATCH] minor changes for gcc compiler --- wrap/io_trimesh/export_vmi.h | 12 ++++----- wrap/io_trimesh/import_vmi.h | 51 +++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/wrap/io_trimesh/export_vmi.h b/wrap/io_trimesh/export_vmi.h index a9df2833..d0bccf11 100644 --- a/wrap/io_trimesh/export_vmi.h +++ b/wrap/io_trimesh/export_vmi.h @@ -63,7 +63,7 @@ namespace io { unsigned int i; int vertSize,faceSize; FILE * f = fopen(filename,"wb"); - std::vector nameF,nameV; + std::vector nameF,nameV; SaveMeshType::FaceType::Name(nameF); SaveMeshType::VertexType::Name(nameV); vertSize = m.vert.size(); @@ -89,21 +89,21 @@ namespace io { fwrite(&offsetF,sizeof( int),1,f); /* save the object mesh */ - fwrite(&m.camera,sizeof(Camera),1,f); - fwrite(&m.shot,sizeof(Shot),1,f); + fwrite(&m.camera,sizeof(Camera),1,f); + fwrite(&m.shot,sizeof(Shot),1,f); fwrite(&m.vn,sizeof(int),1,f); fwrite(&m.fn,sizeof(int),1,f); fwrite(&m.imark,sizeof(int),1,f); - fwrite(&m.bbox,sizeof(Box3),1,f); + fwrite(&m.bbox,sizeof(Box3),1,f); fwrite(&m.C(),sizeof(Color4b),1,f); int written; /* save the vertices */ - written = fwrite((void*)&m.vert[0],sizeof(SaveMeshType::VertexType),m.vert.size(),f); + written = fwrite((void*)&m.vert[0],sizeof(typename SaveMeshType::VertexType),m.vert.size(),f); assert(written==m.vert.size()); /* save the faces */ - written = fwrite((void*)&m.face[0],sizeof(SaveMeshType::FaceType),m.face.size(),f); + written = fwrite((void*)&m.face[0],sizeof(typename SaveMeshType::FaceType),m.face.size(),f); assert(written==m.face.size()); // fflush(f); diff --git a/wrap/io_trimesh/import_vmi.h b/wrap/io_trimesh/import_vmi.h index 0512e4d2..6883e6c5 100644 --- a/wrap/io_trimesh/import_vmi.h +++ b/wrap/io_trimesh/import_vmi.h @@ -92,10 +92,12 @@ namespace io { } static bool Open(OpenMeshType &m,char * filename){ int i; - OpenMeshType::FaceIterator fi; - OpenMeshType::VertexIterator vi; + typedef typename OpenMeshType::VertexType VertexType; + typedef typename OpenMeshType::FaceType FaceType; + typename OpenMeshType::FaceIterator fi; + typename OpenMeshType::VertexIterator vi; FILE * f = fopen(filename,"rb"); - std::vector nameF,nameV,fnameF,fnameV; + std::vector nameF,nameV,fnameF,fnameV; int vertSize,faceSize; /* read the header */ @@ -117,12 +119,12 @@ namespace io { fread(&offsetF,sizeof( int),1,f); /* read the object mesh */ - fread(&m.camera,sizeof(Camera),1,f); - fread(&m.shot,sizeof(Shot),1,f); + fread(&m.camera,sizeof(Camera),1,f); + fread(&m.shot,sizeof(Shot),1,f); fread(&m.vn,sizeof(int),1,f); fread(&m.fn,sizeof(int),1,f); fread(&m.imark,sizeof(int),1,f); - fread(&m.bbox,sizeof(Box3),1,f); + fread(&m.bbox,sizeof(Box3),1,f); fread(&m.C(),sizeof(Color4b),1,f); /* resize the vector of vertices */ @@ -130,46 +132,47 @@ namespace io { int read; /* load the vertices */ - read=fread((void*)& m.vert[0],sizeof(OpenMeshType::VertexType),vertSize,f); + read=fread((void*)& m.vert[0],sizeof(VertexType),vertSize,f); assert(ferror(f)==0); assert(read==vertSize); m.face.resize(faceSize); /* load the faces */ - read = fread((void*)& m.face[0],sizeof(OpenMeshType::FaceType),faceSize,f); + read = fread((void*)& m.face[0],sizeof(FaceType),faceSize,f); assert(ferror(f)==0); assert(!feof(f)); assert(read==faceSize); - if(OpenMeshType::FaceType::HasVFAdjacency()) + if(FaceType::HasVFAdjacency()) for(vi = m.vert.begin(); vi != m.vert.end(); ++vi){ - (*vi).VFp() = (*vi).VFp()-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*vi).VFp() = (*vi).VFp()-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*vi).VFp() = (*vi).VFp()-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; + (*vi).VFp() = (*vi).VFp()-(FaceType*)offsetF+ &m.face[0]; + (*vi).VFp() = (*vi).VFp()-(FaceType*)offsetF+ &m.face[0]; + (*vi).VFp() = (*vi).VFp()-(FaceType*)offsetF+ &m.face[0]; } - if(OpenMeshType::FaceType::HasVertexRef()) + if(FaceType::HasVertexRef()) for(fi = m.face.begin(); fi != m.face.end(); ++fi){ - (*fi).V(0) = (*fi).V(0)-(OpenMeshType::VertexType*)offsetV+ &m.vert[0]; - (*fi).V(1) = (*fi).V(1)-(OpenMeshType::VertexType*)offsetV+ &m.vert[0]; - (*fi).V(2) = (*fi).V(2)-(OpenMeshType::VertexType*)offsetV+ &m.vert[0]; + (*fi).V(0) = (*fi).V(0)-(VertexType*)offsetV+ &m.vert[0]; + (*fi).V(1) = (*fi).V(1)-(VertexType*)offsetV+ &m.vert[0]; + (*fi).V(2) = (*fi).V(2)-(VertexType*)offsetV+ &m.vert[0]; } - if(OpenMeshType::FaceType::HasFFAdjacency()) + if(FaceType::HasFFAdjacency()) for(fi = m.face.begin(); fi != m.face.end(); ++fi){ - (*fi).FFp(0) = (*fi).FFp(0)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*fi).FFp(1) = (*fi).FFp(1)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*fi).FFp(2) = (*fi).FFp(2)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; + (*fi).FFp(0) = (*fi).FFp(0)-(FaceType*)offsetF+ &m.face[0]; + (*fi).FFp(1) = (*fi).FFp(1)-(FaceType*)offsetF+ &m.face[0]; + (*fi).FFp(2) = (*fi).FFp(2)-(FaceType*)offsetF+ &m.face[0]; } - if(OpenMeshType::FaceType::HasVFAdjacency()) + if(FaceType::HasVFAdjacency()) for(fi = m.face.begin(); fi != m.face.end(); ++fi){ - (*fi).VFp(0) = (*fi).VFp(0)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*fi).VFp(1) = (*fi).VFp(1)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; - (*fi).VFp(2) = (*fi).VFp(2)-(OpenMeshType::FaceType*)offsetF+ &m.face[0]; + (*fi).VFp(0) = (*fi).VFp(0)-(FaceType*)offsetF+ &m.face[0]; + (*fi).VFp(1) = (*fi).VFp(1)-(FaceType*)offsetF+ &m.face[0]; + (*fi).VFp(2) = (*fi).VFp(2)-(FaceType*)offsetF+ &m.face[0]; } fclose(f); + return true; } }; // end class