From 0508b4362b3a373a85e6102356bd9f9aafa45010 Mon Sep 17 00:00:00 2001 From: cignoni Date: Tue, 9 Mar 2004 21:26:47 +0000 Subject: [PATCH] cr lf mismatch --- wrap/io_trimesh/export_iv.h | 2 +- wrap/io_trimesh/export_ply.h | 189 +++++++++++++++++++--------------- wrap/io_trimesh/export_stl.h | 13 ++- wrap/io_trimesh/export_vrml.h | 2 +- wrap/io_trimesh/import_ply.h | 102 +++++------------- wrap/io_trimesh/import_smf.h | 2 +- wrap/io_trimesh/import_stl.h | 2 +- wrap/io_trimesh/io_mask.h | 8 +- wrap/io_trimesh/io_ply.h | 5 +- 9 files changed, 157 insertions(+), 168 deletions(-) diff --git a/wrap/io_trimesh/export_iv.h b/wrap/io_trimesh/export_iv.h index 6552f429..ace6de7b 100644 --- a/wrap/io_trimesh/export_iv.h +++ b/wrap/io_trimesh/export_iv.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * diff --git a/wrap/io_trimesh/export_ply.h b/wrap/io_trimesh/export_ply.h index 7f06a84a..bdf74838 100644 --- a/wrap/io_trimesh/export_ply.h +++ b/wrap/io_trimesh/export_ply.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2004/03/08 09:21:33 cignoni +Initial commit + Revision 1.1 2004/03/03 15:00:51 cignoni Initial commit @@ -50,29 +53,50 @@ namespace io { template class ExporterPLY { + // Si occupa di convertire da un tipo all'altro. +// usata nella saveply per matchare i tipi tra stotype e memtype. +// Ad es se in memoria c'e' un int e voglio salvare un float +// src sara in effetti un puntatore a int il cui valore deve +// essere convertito al tipo di ritorno desiderato (stotype) + +template +static void PlyConv(int mem_type, void *src, StoType &dest) +{ + switch (mem_type){ + case ply::T_FLOAT : dest = (StoType) (* ((float *) src)); break; + case ply::T_DOUBLE: dest = (StoType) (* ((double *) src)); break; + case ply::T_INT : dest = (StoType) (* ((int *) src)); break; + case ply::T_SHORT : dest = (StoType) (* ((short *) src)); break; + case ply::T_CHAR : dest = (StoType) (* ((char *) src)); break; + case ply::T_UCHAR : dest = (StoType) (* ((unsigned char *)src)); break; + default : assert(0); + } +} + public: typedef ::vcg::ply::PropDescriptor PropDescriptor ; typedef typename SaveMeshType::VertexPointer VertexPointer; typedef typename SaveMeshType::ScalarType ScalarType; typedef typename SaveMeshType::VertexType VertexType; typedef typename SaveMeshType::FaceType FaceType; +typedef typename SaveMeshType::FacePointer FacePointer; typedef typename SaveMeshType::VertexIterator VertexIterator; typedef typename SaveMeshType::FaceIterator FaceIterator; static bool Save(SaveMeshType &m, const char * filename, bool binary=true) { PlyInfo pi; - return SavePly(m,filename,binary,pi); + return Save(m,filename,binary,pi); } -static bool SavePly(SaveMeshType &m, const char * filename, int savemask ) +static bool Save(SaveMeshType &m, const char * filename, int savemask ) { PlyInfo pi; pi.mask=savemask; - return SavePly(m,filename,true,pi); + return Save(m,filename,true,pi); } -static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInfo &pi ) // V1.0 +static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &pi ) // V1.0 { FILE * fpout; int i; @@ -154,7 +178,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if( HasPerVertexColor() && (pi.mask & PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & PLYMask::PM_VERTCOLOR) ) { fprintf(fpout, "property uchar red\n" @@ -164,7 +188,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if( HasPerVertexQuality() && (pi.mask & PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & PLYMask::PM_VERTQUALITY) ) { fprintf(fpout, "property float quality\n" @@ -187,8 +211,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if( ( (vertex_type::OBJ_TYPE & vertex_type::OBJ_TYPE_T ) && (pi.mask & PLYMask::PM_VERTTEXCOORD) ) || - ( (face_type:: OBJ_TYPE & face_type:: OBJ_TYPE_WT) && (pi.mask & PLYMask::PM_WEDGTEXCOORD) ) ) + if( m.HasPerVertexTexture() || m.HasPerWedgeTexture() ) { fprintf(fpout, "property list uchar float texcoord\n" @@ -200,7 +223,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if( HasPerFaceColor() && (pi.mask & PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & PLYMask::PM_FACECOLOR) ) { fprintf(fpout, "property uchar red\n" @@ -210,14 +233,14 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if ( HasPerWedgeColor() && (pi.mask & PLYMask::PM_WEDGCOLOR) ) + if ( m.HasPerWedgeColor() && (pi.mask & PLYMask::PM_WEDGCOLOR) ) { fprintf(fpout, "property list uchar float color\n" ); } - if( HasPerFaceQuality() && (pi.mask & PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & PLYMask::PM_FACEQUALITY) ) { fprintf(fpout, "property float quality\n" @@ -230,8 +253,8 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf fprintf(fpout, "end_header\n" ); // Salvataggio camera - if( (pi.mask & PLYMask::PM_CAMERA) && camera.IsValid() ) - { + //if( (pi.mask & PLYMask::PM_CAMERA) && camera.IsValid() ) + //{ //if(binary) //{ // float t[17]; @@ -291,48 +314,48 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf // ,camera.k[3] // ); //} - } + //} int j; vector FlagV; - MVTYPE * vp; - vertex_iterator vi; + VertexPointer vp; + VertexIterator vi; for(j=0,vi=m.vert.begin();vi!=m.vert.end();++vi) { vp=&(*vi); - FlagV.push_back(vp->Supervisor_Flags()); // Salva in ogni caso flag del vertice - if( ! vp->IsDeleted() ) + FlagV.push_back(vp->UberFlags()); // Salva in ogni caso flag del vertice + if( ! vp->IsD() ) { if(binary) { float t; - t = float(vp->Supervisor_P()[0]); fwrite(&t,sizeof(float),1,fpout); - t = float(vp->Supervisor_P()[1]); fwrite(&t,sizeof(float),1,fpout); - t = float(vp->Supervisor_P()[2]); fwrite(&t,sizeof(float),1,fpout); + t = float(vp->UberP()[0]); fwrite(&t,sizeof(float),1,fpout); + t = float(vp->UberP()[1]); fwrite(&t,sizeof(float),1,fpout); + t = float(vp->UberP()[2]); fwrite(&t,sizeof(float),1,fpout); if( pi.mask & PLYMask::PM_VERTFLAGS ) - fwrite(&(vp->Supervisor_Flags()),sizeof(int),1,fpout); + fwrite(&(vp->UberFlags()),sizeof(int),1,fpout); - if( HasPerVertexColor() && (pi.mask & PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & PLYMask::PM_VERTCOLOR) ) fwrite(&( vp->C() ),sizeof(char),4,fpout); - if( HasPerVertexQuality() && (pi.mask & PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & PLYMask::PM_VERTQUALITY) ) fwrite(&( vp->Q() ),sizeof(float),1,fpout); - for(i=0;iP()[0],vp->P()[1],vp->P()[2]); if( pi.mask & PLYMask::PM_VERTFLAGS ) - fprintf(fpout,"%d ",vp->Supervisor_Flags()); + fprintf(fpout,"%d ",vp->UberFlags()); - if( (vertex_type::OBJ_TYPE & vertex_type::OBJ_TYPE_C) && (pi.mask & PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & PLYMask::PM_VERTCOLOR) ) fprintf(fpout,"%d %d %d %d ",vp->C()[0],vp->C()[1],vp->C()[2],vp->C()[3] ); - if( (vertex_type::OBJ_TYPE & vertex_type::OBJ_TYPE_Q) && (pi.mask & PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & PLYMask::PM_VERTQUALITY) ) fprintf(fpout,"%g ",vp->Q()); - for(i=0;iSupervisor_Flags()=j; // Trucco! Nascondi nei flags l'indice del vertice non deletato! + vp->UberFlags()=j; // Trucco! Nascondi nei flags l'indice del vertice non deletato! j++; } } - assert(j==vn); + assert(j==m.vn); char c = 3; char k = 9; unsigned char b9 = 9; unsigned char b6 = 6; - const MFTYPE * fp; + FacePointer fp; int vv[3]; - face_iterator fi; + FaceIterator fi; int fcnt=0; - for(j=0,fi=face.begin();fi!=face.end();++fi) + for(j=0,fi=m.face.begin();fi!=m.face.end();++fi) { fp=&(*fi); - if( ! fp->IsDeleted() ) + if( ! fp->IsD() ) { fcnt++; if(binary) { - vv[0]=fp->cV(0)->Supervisor_Flags(); - vv[1]=fp->cV(1)->Supervisor_Flags(); - vv[2]=fp->cV(2)->Supervisor_Flags(); + vv[0]=fp->cV(0)->UberFlags(); + vv[1]=fp->cV(1)->UberFlags(); + vv[2]=fp->cV(2)->UberFlags(); fwrite(&c,1,1,fpout); fwrite(vv,sizeof(int),3,fpout); if( pi.mask & PLYMask::PM_FACEFLAGS ) fwrite(&(fp->Flags()),sizeof(int),1,fpout); - if( (vertex_type::OBJ_TYPE & vertex_type::OBJ_TYPE_T) && (pi.mask & PLYMask::PM_VERTTEXCOORD) ) + if( m.HasPerVertexTexture() && (pi.mask & PLYMask::PM_VERTTEXCOORD) ) { fwrite(&b6,sizeof(char),1,fpout); float t[6]; @@ -410,7 +433,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf } fwrite(t,sizeof(float),6,fpout); } - else if( (face_type:: OBJ_TYPE & face_type:: OBJ_TYPE_WT) && (pi.mask & PLYMask::PM_WEDGTEXCOORD) ) + else if( m.HasPerWedgeTexture() && (pi.mask & PLYMask::PM_WEDGTEXCOORD) ) { fwrite(&b6,sizeof(char),1,fpout); float t[6]; @@ -428,11 +451,11 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf fwrite(&t,sizeof(int),1,fpout); } - if( HasPerFaceColor() && (pi.mask & PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & PLYMask::PM_FACECOLOR) ) fwrite(&( fp->C() ),sizeof(char),4,fpout); - if( HasPerWedgeColor() && (pi.mask & PLYMask::PM_WEDGCOLOR) ) + if( m.HasPerWedgeColor() && (pi.mask & PLYMask::PM_WEDGCOLOR) ) { fwrite(&b9,sizeof(char),1,fpout); float t[3]; @@ -445,20 +468,20 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf } } - if( (face_type::OBJ_TYPE & face_type::OBJ_TYPE_Q) && (pi.mask & PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & PLYMask::PM_FACEQUALITY) ) fwrite( &(fp->Q()),sizeof(float),1,fpout); - for(i=0;icV(0)->Supervisor_Flags(), fp->cV(1)->Supervisor_Flags(), fp->cV(2)->Supervisor_Flags() ); + fp->cV(0)->UberFlags(), fp->cV(1)->UberFlags(), fp->cV(2)->UberFlags() ); if( pi.mask & PLYMask::PM_FACEFLAGS ) fprintf(fpout,"%d ",fp->Flags()); - if( (vertex_type::OBJ_TYPE & vertex_type::OBJ_TYPE_T) && (pi.mask & PLYMask::PM_VERTTEXCOORD) ) + if( m.HasPerVertexTexture() && (pi.mask & PLYMask::PM_VERTTEXCOORD) ) { fprintf(fpout,"6 "); for(int k=0;k<3;++k) @@ -480,7 +503,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ,fp->V(k)->T().v() ); } - else if( (face_type:: OBJ_TYPE & face_type:: OBJ_TYPE_WT) && (pi.mask & PLYMask::PM_WEDGTEXCOORD) ) + else if( m.HasPerWedgeTexture() && (pi.mask & PLYMask::PM_WEDGTEXCOORD) ) { fprintf(fpout,"6 "); for(int k=0;k<3;++k) @@ -495,7 +518,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf fprintf(fpout,"%d ",fp->WT(0).n()); } - if( (face_type::OBJ_TYPE & face_type::OBJ_TYPE_C) && (pi.mask & PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & PLYMask::PM_FACECOLOR) ) { float t[3]; t[0] = float(fp->C()[0])/255; @@ -506,7 +529,7 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf fprintf(fpout,"%g %g %g ",t[0],t[1],t[2]); fprintf(fpout,"%g %g %g ",t[0],t[1],t[2]); } - else if( (face_type::OBJ_TYPE & face_type::OBJ_TYPE_WC) && (pi.mask & PLYMask::PM_WEDGCOLOR) ) + else if( m.HasPerWedgeColor() && (pi.mask & PLYMask::PM_WEDGCOLOR) ) { fprintf(fpout,"9 "); for(int z=0;z<3;++z) @@ -517,21 +540,21 @@ static bool SavePly(SaveMeshType &m, const char * filename, bool binary, PlyInf ); } - if( (face_type::OBJ_TYPE & face_type::OBJ_TYPE_Q) && (pi.mask & PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & PLYMask::PM_FACEQUALITY) ) fprintf(fpout,"%g ",fp->Q()); - for(i=0;i class ExporterSTL { @@ -71,7 +78,7 @@ static bool Save(SaveMeshType &m, const char * filename , bool binary =true, con for(fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) { // For each triangle write the normal, the three coords and a short set to zero - p.Import(vcg::NormalizedNormal((*fi).V(0)->P(), (*fi).V(1)->P(), (*fi).V(2)->P())); + p.Import(vcg::NormalizedNormal(*fi)); fwrite(p.V(),3,sizeof(float),fp); for(int k=0;k<3;++k){ @@ -91,7 +98,7 @@ static bool Save(SaveMeshType &m, const char * filename , bool binary =true, con for(fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) { // For each triangle write the normal, the three coords and a short set to zero - p.Import(vcg::NormalizedNormal((*fi).V(0)->P(), (*fi).V(1)->P(), (*fi).V(2)->P())); + p.Import(vcg::NormalizedNormal(*fi)); fprintf(fp," facet normal %13e %13e %13e\n",p[0],p[1],p[2]); fprintf(fp," outer loop\n"); for(int k=0;k<3;++k){ diff --git a/wrap/io_trimesh/export_vrml.h b/wrap/io_trimesh/export_vrml.h index 853e4f06..0078645f 100644 --- a/wrap/io_trimesh/export_vrml.h +++ b/wrap/io_trimesh/export_vrml.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h index edd3ef5d..5387da0b 100644 --- a/wrap/io_trimesh/import_ply.h +++ b/wrap/io_trimesh/import_ply.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * @@ -24,15 +24,15 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2004/03/03 15:00:51 cignoni +Initial commit + ****************************************************************************/ -/** -@name Load and Save in Ply format -*/ -//@{ #include #include #include +#include namespace vcg { @@ -42,13 +42,16 @@ namespace io { template int PlyType () { return 0;} -//template template <> int PlyType () { return ply::T_FLOAT; } template <> int PlyType () { return ply::T_DOUBLE; } template <> int PlyType () { return ply::T_INT; } template <> int PlyType () { return ply::T_SHORT; } template <> int PlyType () { return ply::T_UCHAR; } - + +/** +This class encapsulate a filter for opening ply meshes. +The ply file format is quite extensible... +*/ template class ImporterPLY { @@ -62,63 +65,8 @@ typedef typename OpenMeshType::FaceType FaceType; typedef typename OpenMeshType::VertexIterator VertexIterator; typedef typename OpenMeshType::FaceIterator FaceIterator; -class PlyInfo -{ -public: - PlyInfo() - { - status=0; - mask=0; - cb=0; - vdn=fdn=0; - VertexData=FaceData=0; - } - int status; - int mask; // it overwritten by Open and used by Save - CallBackPos *cb; - - int vdn; - PropDescriptor *VertexData; - int fdn; - PropDescriptor *FaceData; - std::string header; -}; - -enum Error -{ - - // Funzioni superiori - E_NO_VERTEX, // 14 - E_NO_FACE, // 15 - E_SHORTFILE, // 16 - E_NO_3VERTINFACE, // 17 - E_BAD_VERT_INDEX, // 18 - E_NO_6TCOORD, // 19 - E_DIFFER_COLORS, // 20 -}; - //template int PlyType () { assert(0); return 0;} -// Si occupa di convertire da un tipo all'altro. -// usata nella saveply per matchare i tipi tra stotype e memtype. -// Ad es se in memoria c'e' un int e voglio salvare un float -// src sara in effetti un puntatore a int il cui valore deve -// essere convertito al tipo di ritorno desiderato (stotype) - -template -void PlyConv(int mem_type, void *src, StoType &dest) -{ -// float tf; int ti;short ts; char tc; - switch (mem_type){ - case ply::T_FLOAT : dest = (StoType) (* ((float *) src)); break; - case T_DOUBLE : dest = (StoType) (* ((double *) src)); break; - case T_INT : dest = (StoType) (* ((int *) src)); break; - case T_SHORT : dest = (StoType) (* ((short *) src)); break; - case T_CHAR : dest = (StoType) (* ((char *) src)); break; - case T_UCHAR : dest = (StoType) (* ((unsigned char *)src)); break; - default : assert(0); - } -} #define MAX_USER_DATA 256 // Struttura ausiliaria per la lettura del file ply struct LoadPly_FaceAux @@ -264,7 +212,7 @@ static const PropDescriptor &CameraDesc(int i) } - +/// Standard call for reading a mesh static int Open( OpenMeshType &m, const char * filename, CallBackPos *cb=0) { PlyInfo pi; @@ -272,6 +220,7 @@ static int Open( OpenMeshType &m, const char * filename, CallBackPos *cb=0) return Open(m, filename, pi); } +/// Read a mesh and store in loadmask the loaded field static int Open( OpenMeshType &m, const char * filename, int & loadmask, CallBackPos *cb =0) { PlyInfo pi; @@ -281,6 +230,7 @@ static int Open( OpenMeshType &m, const char * filename, int & loadmask, CallBac } +/// read a mesh with all the possible option specified in the PlyInfo obj. static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { assert(filename!=0); @@ -337,13 +287,13 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) } // Descrittori dati standard (vertex coord e faces) - if( pf.AddToRead(VertDesc(0))==-1 ) { pi.status = E_NO_VERTEX; return -1; } - if( pf.AddToRead(VertDesc(1))==-1 ) { pi.status = E_NO_VERTEX; return -1; } - if( pf.AddToRead(VertDesc(2))==-1 ) { pi.status = E_NO_VERTEX; return -1; } + if( pf.AddToRead(VertDesc(0))==-1 ) { pi.status = PlyInfo::E_NO_VERTEX; return -1; } + if( pf.AddToRead(VertDesc(1))==-1 ) { pi.status = PlyInfo::E_NO_VERTEX; return -1; } + if( pf.AddToRead(VertDesc(2))==-1 ) { pi.status = PlyInfo::E_NO_VERTEX; return -1; } if( pf.AddToRead(FaceDesc(0))==-1 ) // Se fallisce si prova anche la sintassi di rapidform con index al posto di indices if( pf.AddToRead(FaceDesc(9))==-1 ) if(pf.AddToRead(TristripDesc(0))==-1) // Se fallisce tutto si prova a vedere se ci sono tristrip alla levoy. - { pi.status = E_NO_FACE; return -1; } + { pi.status = PlyInfo::E_NO_FACE; return -1; } // Descrittori facoltativi dei flags if( pf.AddToRead(VertDesc(3))!=-1 ) @@ -458,7 +408,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if( pf.Read( (void *)&(ca) )==-1 ) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } //camera.valid = true; @@ -500,7 +450,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) (*vi).UberFlags()=0; if( pf.Read( (void *)&(va) )==-1 ) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } @@ -548,12 +498,12 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) if(pi.cb && (j%1000)==0) pi.cb(50+j*50/n,"Face Loading"); if( pf.Read(&fa)==-1 ) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } if(fa.size!=3) { - pi.status = E_NO_3VERTINFACE; + pi.status = PlyInfo::E_NO_3VERTINFACE; return -1; } @@ -561,7 +511,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if( fa.v[k]<0 || fa.v[k]>=m.vn ) { - pi.status = E_BAD_VERT_INDEX; + pi.status = PlyInfo::E_BAD_VERT_INDEX; return -1; } (*fi).V(k) = index[ fa.v[k] ]; @@ -631,7 +581,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) if(pi.cb && (j%1000)==0) pi.cb(50+j*50/n,"Tristrip Face Loading"); if( pf.Read(&tsa)==-1 ) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } int remainder=0; @@ -640,7 +590,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if(pi.cb && (k%1000)==0) pi.cb(50+k*50/tsa.size,"Tristrip Face Loading"); if(tsa.v[k]<0 || tsa.v[k]>=numvert_tmp ) { - pi.status = E_BAD_VERT_INDEX; + pi.status = PlyInfo::E_BAD_VERT_INDEX; return -1; } if(tsa.v[k+2]==-1) @@ -668,7 +618,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if( pf.Read(0)==-1) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } } @@ -769,7 +719,7 @@ int LoadCamera(const char * filename) { if( pf.Read( (void *)&(ca) )==-1 ) { - pi.status = E_SHORTFILE; + pi.status = PlyInfo::E_SHORTFILE; return -1; } camera.valid = true; diff --git a/wrap/io_trimesh/import_smf.h b/wrap/io_trimesh/import_smf.h index 969ef864..622268e3 100644 --- a/wrap/io_trimesh/import_smf.h +++ b/wrap/io_trimesh/import_smf.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * diff --git a/wrap/io_trimesh/import_stl.h b/wrap/io_trimesh/import_stl.h index ac073ab6..0e9bdc96 100644 --- a/wrap/io_trimesh/import_stl.h +++ b/wrap/io_trimesh/import_stl.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * diff --git a/wrap/io_trimesh/io_mask.h b/wrap/io_trimesh/io_mask.h index ae6c2854..5410197f 100644 --- a/wrap/io_trimesh/io_mask.h +++ b/wrap/io_trimesh/io_mask.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * @@ -24,7 +24,12 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2004/03/03 15:00:51 cignoni +Initial commit + ****************************************************************************/ +#ifndef __VCGLIB_IOTRIMESH_IO_MASK +#define __VCGLIB_IOTRIMESH_IO_MASK /** @name Load and Save in Ply format @@ -103,3 +108,4 @@ static void SMFlags2String( int mask, char str[] ) } // end namespace tri } // end namespace io } // end namespace vcg +#endif \ No newline at end of file diff --git a/wrap/io_trimesh/io_ply.h b/wrap/io_trimesh/io_ply.h index 7b2445b6..5017d8a0 100644 --- a/wrap/io_trimesh/io_ply.h +++ b/wrap/io_trimesh/io_ply.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** * VCGLib o o * * Visual and Computer Graphics Library o o * * _ O _ * @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2004/03/08 09:21:34 cignoni +Initial commit + Revision 1.1 2004/03/03 15:00:51 cignoni Initial commit