From 6dca4be1ab4e27ecc81cdd79e67e22118464f94f Mon Sep 17 00:00:00 2001 From: cignoni Date: Tue, 10 Jan 2006 13:20:42 +0000 Subject: [PATCH] Changed ply::PlyMask to io::Mask --- apps/metro/metro.cpp | 6 ++- apps/shadevis/shadevis.cpp | 6 ++- wrap/io_trimesh/export_off.h | 4 +- wrap/io_trimesh/export_ply.h | 62 ++++++++++++----------- wrap/io_trimesh/import_off.h | 22 ++++++-- wrap/io_trimesh/import_ply.h | 69 +++++++++++++------------ wrap/io_trimesh/io_mask.h | 98 ++++++++++++++++++------------------ 7 files changed, 148 insertions(+), 119 deletions(-) diff --git a/apps/metro/metro.cpp b/apps/metro/metro.cpp index 478a01bc..22f11798 100644 --- a/apps/metro/metro.cpp +++ b/apps/metro/metro.cpp @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.17 2005/10/02 23:11:00 cignoni +Version 4.06, Added possibility of using three different search structures UG Hash and AABB + Revision 1.16 2005/09/16 11:52:14 cignoni removed wrong %v in vertex number printing @@ -326,7 +329,8 @@ int main(int argc, char**argv) if(flags & SamplingFlags::SAVE_ERROR) { vcg::tri::io::PlyInfo p; - p.mask|=vcg::ply::PLYMask::PM_VERTCOLOR|vcg::ply::PLYMask::PM_VERTQUALITY; + p.mask|=vcg::tri::io::Mask::IOM_VERTCOLOR | vcg::tri::io::Mask::IOM_VERTQUALITY /* | vcg::ply::PLYMask::PM_VERTQUALITY*/ ; + //p.mask|=vcg::ply::PLYMask::PM_VERTCOLOR|vcg::ply::PLYMask::PM_VERTQUALITY; if(ColorMax!=0 || ColorMin != 0){ vcg::tri::UpdateColor::VertexQuality(S1,ColorMin,ColorMax); vcg::tri::UpdateColor::VertexQuality(S2,ColorMin,ColorMax); diff --git a/apps/shadevis/shadevis.cpp b/apps/shadevis/shadevis.cpp index 8b40dfe1..8b4cc7e8 100644 --- a/apps/shadevis/shadevis.cpp +++ b/apps/shadevis/shadevis.cpp @@ -24,6 +24,10 @@ History $Log: not supported by cvs2svn $ +Revision 1.10 2005/11/12 06:48:47 cignoni +Version 1.0 +Added management of point set, correct bug in printing on the screen, + Revision 1.9 2005/01/03 13:59:54 cignoni Resolved min/max macro conflict @@ -396,7 +400,7 @@ void ViewKey(unsigned char key, int , int ) case 'S' : { vcg::tri::io::PlyInfo p; - p.mask|=vcg::ply::PLYMask::PM_VERTCOLOR /* | vcg::ply::PLYMask::PM_VERTQUALITY*/ ; + p.mask|=vcg::tri::io::Mask::IOM_VERTCOLOR /* | vcg::ply::PLYMask::PM_VERTQUALITY*/ ; tri::io::ExporterPLY::Save(m,OutNameMsh.c_str(),false,p); } break; diff --git a/wrap/io_trimesh/export_off.h b/wrap/io_trimesh/export_off.h index 0c359d99..31a99218 100644 --- a/wrap/io_trimesh/export_off.h +++ b/wrap/io_trimesh/export_off.h @@ -29,9 +29,9 @@ #ifndef __VCGLIB_EXPORT_OFF #define __VCGLIB_EXPORT_OFF -#include - #include +#include + namespace vcg { namespace tri { diff --git a/wrap/io_trimesh/export_ply.h b/wrap/io_trimesh/export_ply.h index f9b1be61..528ff66c 100644 --- a/wrap/io_trimesh/export_ply.h +++ b/wrap/io_trimesh/export_ply.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.11 2005/11/23 15:48:25 pietroni +changed shot::similarity to shot::Similarity() and shot::camera to shot::Camera() + Revision 1.10 2004/10/28 00:52:45 cignoni Better Doxygen documentation @@ -67,7 +70,8 @@ Initial commit #ifndef __VCGLIB_EXPORT_PLY #define __VCGLIB_EXPORT_PLY -#include +//#include +#include #include #include @@ -149,7 +153,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ,h ); - if( pi.mask & ply::PLYMask::PM_WEDGTEXCOORD ) + if( pi.mask & Mask::IOM_WEDGTEXCOORD ) { //const char * TFILE = "TextureFile"; @@ -159,7 +163,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & //if(textures.size()>1 && (HasPerWedgeTexture() || HasPerVertexTexture())) multit = true; } - if( (pi.mask & ply::PLYMask::PM_CAMERA) && m.shot.IsValid()) + if( (pi.mask & Mask::IOM_CAMERA) && m.shot.IsValid()) { fprintf(fpout, "element camera 1\n" @@ -198,14 +202,14 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ); - if( pi.mask & ply::PLYMask::PM_VERTFLAGS ) + if( pi.mask & Mask::IOM_VERTFLAGS ) { fprintf(fpout, "property int flags\n" ); } - if( m.HasPerVertexColor() && (pi.mask & ply::PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & Mask::IOM_VERTCOLOR) ) { fprintf(fpout, "property uchar red\n" @@ -215,7 +219,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ); } - if( m.HasPerVertexQuality() && (pi.mask & ply::PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & Mask::IOM_VERTQUALITY) ) { fprintf(fpout, "property float quality\n" @@ -231,7 +235,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ,m.fn ); - if( pi.mask & ply::PLYMask::PM_FACEFLAGS ) + if( pi.mask & Mask::IOM_FACEFLAGS ) { fprintf(fpout, "property int flags\n" @@ -250,7 +254,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ); } - if( m.HasPerFaceColor() && (pi.mask & ply::PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & Mask::IOM_FACECOLOR) ) { fprintf(fpout, "property uchar red\n" @@ -260,14 +264,14 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & ); } - if ( m.HasPerWedgeColor() && (pi.mask & ply::PLYMask::PM_WEDGCOLOR) ) + if ( m.HasPerWedgeColor() && (pi.mask & Mask::IOM_WEDGCOLOR) ) { fprintf(fpout, "property list uchar float color\n" ); } - if( m.HasPerFaceQuality() && (pi.mask & ply::PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & Mask::IOM_FACEQUALITY) ) { fprintf(fpout, "property float quality\n" @@ -280,7 +284,7 @@ static bool Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo & fprintf(fpout, "end_header\n" ); // Salvataggio camera - if( (pi.mask & ply::PLYMask::PM_CAMERA) && m.shot.IsValid() ) + if( (pi.mask & Mask::IOM_CAMERA) && m.shot.IsValid() ) { if(binary) { @@ -362,13 +366,13 @@ std::vector FlagV; 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 & ply::PLYMask::PM_VERTFLAGS ) + if( pi.mask & Mask::IOM_VERTFLAGS ) fwrite(&(vp->UberFlags()),sizeof(int),1,fpout); - if( m.HasPerVertexColor() && (pi.mask & ply::PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & Mask::IOM_VERTCOLOR) ) fwrite(&( vp->C() ),sizeof(char),4,fpout); - if( m.HasPerVertexQuality() && (pi.mask & ply::PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & Mask::IOM_VERTQUALITY) ) fwrite(&( vp->Q() ),sizeof(float),1,fpout); @@ -391,13 +395,13 @@ std::vector FlagV; { fprintf(fpout,"%g %g %g " ,vp->P()[0],vp->P()[1],vp->P()[2]); - if( pi.mask & ply::PLYMask::PM_VERTFLAGS ) + if( pi.mask & Mask::IOM_VERTFLAGS ) fprintf(fpout,"%d ",vp->UberFlags()); - if( m.HasPerVertexColor() && (pi.mask & ply::PLYMask::PM_VERTCOLOR) ) + if( m.HasPerVertexColor() && (pi.mask & Mask::IOM_VERTCOLOR) ) fprintf(fpout,"%d %d %d %d ",vp->C()[0],vp->C()[1],vp->C()[2],vp->C()[3] ); - if( m.HasPerVertexQuality() && (pi.mask & ply::PLYMask::PM_VERTQUALITY) ) + if( m.HasPerVertexQuality() && (pi.mask & Mask::IOM_VERTQUALITY) ) fprintf(fpout,"%g ",vp->Q()); for(i=0;i FlagV; fwrite(&c,1,1,fpout); fwrite(vv,sizeof(int),3,fpout); - if( pi.mask & ply::PLYMask::PM_FACEFLAGS ) + if( pi.mask & Mask::IOM_FACEFLAGS ) fwrite(&(fp->Flags()),sizeof(int),1,fpout); - if( m.HasPerVertexTexture() && (pi.mask & ply::PLYMask::PM_VERTTEXCOORD) ) + if( m.HasPerVertexTexture() && (pi.mask & Mask::IOM_VERTTEXCOORD) ) { fwrite(&b6,sizeof(char),1,fpout); float t[6]; @@ -459,7 +463,7 @@ std::vector FlagV; } fwrite(t,sizeof(float),6,fpout); } - else if( m.HasPerWedgeTexture() && (pi.mask & ply::PLYMask::PM_WEDGTEXCOORD) ) + else if( m.HasPerWedgeTexture() && (pi.mask & Mask::IOM_WEDGTEXCOORD) ) { fwrite(&b6,sizeof(char),1,fpout); float t[6]; @@ -477,11 +481,11 @@ std::vector FlagV; fwrite(&t,sizeof(int),1,fpout); } - if( m.HasPerFaceColor() && (pi.mask & ply::PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & Mask::IOM_FACECOLOR) ) fwrite(&( fp->C() ),sizeof(char),4,fpout); - if( m.HasPerWedgeColor() && (pi.mask & ply::PLYMask::PM_WEDGCOLOR) ) + if( m.HasPerWedgeColor() && (pi.mask & Mask::IOM_WEDGCOLOR) ) { fwrite(&b9,sizeof(char),1,fpout); float t[3]; @@ -494,7 +498,7 @@ std::vector FlagV; } } - if( m.HasPerFaceQuality() && (pi.mask & ply::PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & Mask::IOM_FACEQUALITY) ) fwrite( &(fp->Q()),sizeof(float),1,fpout); @@ -517,10 +521,10 @@ std::vector FlagV; fprintf(fpout,"3 %d %d %d ", fp->cV(0)->UberFlags(), fp->cV(1)->UberFlags(), fp->cV(2)->UberFlags() ); - if( pi.mask & ply::PLYMask::PM_FACEFLAGS ) + if( pi.mask & Mask::IOM_FACEFLAGS ) fprintf(fpout,"%d ",fp->Flags()); - if( m.HasPerVertexTexture() && (pi.mask & ply::PLYMask::PM_VERTTEXCOORD) ) + if( m.HasPerVertexTexture() && (pi.mask & Mask::IOM_VERTTEXCOORD) ) { fprintf(fpout,"6 "); for(int k=0;k<3;++k) @@ -529,7 +533,7 @@ std::vector FlagV; ,fp->V(k)->T().v() ); } - else if( m.HasPerWedgeTexture() && (pi.mask & ply::PLYMask::PM_WEDGTEXCOORD) ) + else if( m.HasPerWedgeTexture() && (pi.mask & Mask::IOM_WEDGTEXCOORD) ) { fprintf(fpout,"6 "); for(int k=0;k<3;++k) @@ -544,7 +548,7 @@ std::vector FlagV; fprintf(fpout,"%d ",fp->WT(0).n()); } - if( m.HasPerFaceColor() && (pi.mask & ply::PLYMask::PM_FACECOLOR) ) + if( m.HasPerFaceColor() && (pi.mask & Mask::IOM_FACECOLOR) ) { float t[3]; t[0] = float(fp->C()[0])/255; @@ -555,7 +559,7 @@ std::vector FlagV; fprintf(fpout,"%g %g %g ",t[0],t[1],t[2]); fprintf(fpout,"%g %g %g ",t[0],t[1],t[2]); } - else if( m.HasPerWedgeColor() && (pi.mask & ply::PLYMask::PM_WEDGCOLOR) ) + else if( m.HasPerWedgeColor() && (pi.mask & Mask::IOM_WEDGCOLOR) ) { fprintf(fpout,"9 "); for(int z=0;z<3;++z) @@ -566,7 +570,7 @@ std::vector FlagV; ); } - if( m.HasPerFaceQuality() && (pi.mask & ply::PLYMask::PM_FACEQUALITY) ) + if( m.HasPerFaceQuality() && (pi.mask & Mask::IOM_FACEQUALITY) ) fprintf(fpout,"%g ",fp->Q()); for(i=0;i #include -#include +#include #include #include #include @@ -398,7 +401,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) break; } } - if(found) pi.mask |= ply::PLYMask::PM_CAMERA; + if(found) pi.mask |= Mask::IOM_CAMERA; } // Descrittori dati standard (vertex coord e faces) @@ -415,13 +418,13 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) // Descrittori facoltativi dei flags if(VertexType::HasFlags() && (pf.AddToRead(VertDesc(3))!=-1 ) ) - pi.mask |= ply::PLYMask::PM_VERTFLAGS; + pi.mask |= Mask::IOM_VERTFLAGS; if( VertexType::HasQuality() ) { if( pf.AddToRead(VertDesc(4))!=-1 || pf.AddToRead(VertDesc(8))!=-1 ) - pi.mask |= ply::PLYMask::PM_VERTQUALITY; + pi.mask |= Mask::IOM_VERTQUALITY; } if( VertexType::HasColor() ) @@ -430,25 +433,25 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { pf.AddToRead(VertDesc(6)); pf.AddToRead(VertDesc(7)); - pi.mask |= ply::PLYMask::PM_VERTCOLOR; + pi.mask |= Mask::IOM_VERTCOLOR; } if( pf.AddToRead(VertDesc(8))!=-1 ) { pf.AddToRead(VertDesc(9)); pf.AddToRead(VertDesc(10)); - pi.mask |= ply::PLYMask::PM_VERTCOLOR; + pi.mask |= Mask::IOM_VERTCOLOR; } } // se ci sono i flag per vertice ci devono essere anche i flag per faccia if( pf.AddToRead(FaceDesc(1))!=-1 ) - pi.mask |= ply::PLYMask::PM_FACEFLAGS; + pi.mask |= Mask::IOM_FACEFLAGS; if( FaceType::HasFaceQuality()) { if( pf.AddToRead(FaceDesc(2))!=-1 ) - pi.mask |= ply::PLYMask::PM_FACEQUALITY; + pi.mask |= Mask::IOM_FACEQUALITY; } if( FaceType::HasFaceColor() ) @@ -457,7 +460,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { pf.AddToRead(FaceDesc(7)); pf.AddToRead(FaceDesc(8)); - pi.mask |= ply::PLYMask::PM_FACECOLOR; + pi.mask |= Mask::IOM_FACECOLOR; } } @@ -468,9 +471,9 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if(pf.AddToRead(FaceDesc(5))==0) { multit=true; // try to read also the multi texture indicies - pi.mask |= ply::PLYMask::PM_WEDGTEXMULTI; + pi.mask |= Mask::IOM_WEDGTEXMULTI; } - pi.mask |= ply::PLYMask::PM_WEDGTEXCOORD; + pi.mask |= Mask::IOM_WEDGTEXCOORD; } } @@ -478,7 +481,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) { if( pf.AddToRead(FaceDesc(4))!=-1 ) { - pi.mask |= ply::PLYMask::PM_WEDGCOLOR; + pi.mask |= Mask::IOM_WEDGCOLOR; } } @@ -594,13 +597,13 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) (*vi).P()[1] = va.p[1]; (*vi).P()[2] = va.p[2]; - if( pi.mask & ply::PLYMask::PM_VERTFLAGS ) + if( pi.mask & Mask::IOM_VERTFLAGS ) (*vi).UberFlags() = va.flags; - if( pi.mask & ply::PLYMask::PM_VERTQUALITY ) + if( pi.mask & Mask::IOM_VERTQUALITY ) (*vi).Q() = va.q; - if( pi.mask & ply::PLYMask::PM_VERTCOLOR ) + if( pi.mask & Mask::IOM_VERTCOLOR ) { (*vi).C()[0] = va.r; (*vi).C()[1] = va.g; @@ -639,24 +642,24 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) } if(fa.size!=3) { // Non triangular face are manageable ONLY if there are no Per Wedge attributes - if( ( pi.mask & ply::PLYMask::PM_WEDGCOLOR ) || ( pi.mask & ply::PLYMask::PM_WEDGTEXCOORD ) ) + if( ( pi.mask & Mask::IOM_WEDGCOLOR ) || ( pi.mask & Mask::IOM_WEDGTEXCOORD ) ) { pi.status = PlyInfo::E_NO_3VERTINFACE; return pi.status; } } - if( pi.mask & ply::PLYMask::PM_FACEFLAGS ) + if( pi.mask & Mask::IOM_FACEFLAGS ) { (*fi).UberFlags() = fa.flags; } - if( pi.mask & ply::PLYMask::PM_FACEQUALITY ) + if( pi.mask & Mask::IOM_FACEQUALITY ) { (*fi).Q() = fa.q; } - if( pi.mask & ply::PLYMask::PM_FACECOLOR ) + if( pi.mask & Mask::IOM_FACECOLOR ) { (*fi).C()[0] = fa.r; (*fi).C()[1] = fa.g; @@ -664,7 +667,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) (*fi).C()[3] = 255; } - if( pi.mask & ply::PLYMask::PM_WEDGTEXCOORD ) + if( pi.mask & Mask::IOM_WEDGTEXCOORD ) { for(int k=0;k<3;++k) { @@ -675,7 +678,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) } } - if( pi.mask & ply::PLYMask::PM_WEDGCOLOR ) + if( pi.mask & Mask::IOM_WEDGCOLOR ) { if(FaceType::HasWedgeColor()){ for(int k=0;k<3;++k) @@ -941,25 +944,25 @@ static bool LoadMask(const char * filename, int &mask, PlyInfo &pi) if( pf.AddToRead(VertDesc(0))!=-1 && pf.AddToRead(VertDesc(1))!=-1 && - pf.AddToRead(VertDesc(2))!=-1 ) mask |= ply::PLYMask::PM_VERTCOORD; + pf.AddToRead(VertDesc(2))!=-1 ) mask |= Mask::IOM_VERTCOORD; - if( pf.AddToRead(VertDesc(3))!=-1 ) mask |= ply::PLYMask::PM_VERTFLAGS; - if( pf.AddToRead(VertDesc(4))!=-1 ) mask |= ply::PLYMask::PM_VERTQUALITY; - if( pf.AddToRead(VertDesc(8))!=-1 ) mask |= ply::PLYMask::PM_VERTQUALITY; + if( pf.AddToRead(VertDesc(3))!=-1 ) mask |= Mask::IOM_VERTFLAGS; + if( pf.AddToRead(VertDesc(4))!=-1 ) mask |= Mask::IOM_VERTQUALITY; + if( pf.AddToRead(VertDesc(8))!=-1 ) mask |= Mask::IOM_VERTQUALITY; if( ( pf.AddToRead(VertDesc(5))!=-1 ) && ( pf.AddToRead(VertDesc(6))!=-1 ) && - ( pf.AddToRead(VertDesc(7))!=-1 ) ) mask |= ply::PLYMask::PM_VERTCOLOR; + ( pf.AddToRead(VertDesc(7))!=-1 ) ) mask |= Mask::IOM_VERTCOLOR; - if( pf.AddToRead(FaceDesc(0))!=-1 ) mask |= ply::PLYMask::PM_FACEINDEX; - if( pf.AddToRead(FaceDesc(1))!=-1 ) mask |= ply::PLYMask::PM_FACEFLAGS; + if( pf.AddToRead(FaceDesc(0))!=-1 ) mask |= Mask::IOM_FACEINDEX; + if( pf.AddToRead(FaceDesc(1))!=-1 ) mask |= Mask::IOM_FACEFLAGS; - if( pf.AddToRead(FaceDesc(2))!=-1 ) mask |= ply::PLYMask::PM_FACEQUALITY; - if( pf.AddToRead(FaceDesc(3))!=-1 ) mask |= ply::PLYMask::PM_WEDGTEXCOORD; - if( pf.AddToRead(FaceDesc(5))!=-1 ) mask |= ply::PLYMask::PM_WEDGTEXMULTI; - if( pf.AddToRead(FaceDesc(4))!=-1 ) mask |= ply::PLYMask::PM_WEDGCOLOR; + if( pf.AddToRead(FaceDesc(2))!=-1 ) mask |= Mask::IOM_FACEQUALITY; + if( pf.AddToRead(FaceDesc(3))!=-1 ) mask |= Mask::IOM_WEDGTEXCOORD; + if( pf.AddToRead(FaceDesc(5))!=-1 ) mask |= Mask::IOM_WEDGTEXMULTI; + if( pf.AddToRead(FaceDesc(4))!=-1 ) mask |= Mask::IOM_WEDGCOLOR; if( ( pf.AddToRead(FaceDesc(6))!=-1 ) && ( pf.AddToRead(FaceDesc(7))!=-1 ) && - ( pf.AddToRead(FaceDesc(8))!=-1 ) ) mask |= ply::PLYMask::PM_FACECOLOR; + ( pf.AddToRead(FaceDesc(8))!=-1 ) ) mask |= Mask::IOM_FACECOLOR; return true; diff --git a/wrap/io_trimesh/io_mask.h b/wrap/io_trimesh/io_mask.h index 0f27cc74..efd2eeb1 100644 --- a/wrap/io_trimesh/io_mask.h +++ b/wrap/io_trimesh/io_mask.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.4 2004/10/28 00:52:45 cignoni +Better Doxygen documentation + Revision 1.3 2004/05/12 10:19:30 ganovelli new line added at the end of file @@ -37,8 +40,7 @@ Initial commit #ifndef __VCGLIB_IOTRIMESH_IO_MASK #define __VCGLIB_IOTRIMESH_IO_MASK -#include -#include +//#include namespace vcg { namespace tri { @@ -49,7 +51,7 @@ namespace io { */ //@{ -class PLYMask +class Mask { public: @@ -58,57 +60,57 @@ public: */ enum { - PM_NONE = 0x0000, + IOM_NONE = 0x0000, - PM_VERTCOORD = 0x0001, - PM_VERTFLAGS = 0x0002, - PM_VERTCOLOR = 0x0004, - PM_VERTQUALITY = 0x0008, - PM_VERTNORMAL = 0x0010, - PM_VERTTEXCOORD = 0x0020, + IOM_VERTCOORD = 0x0001, + IOM_VERTFLAGS = 0x0002, + IOM_VERTCOLOR = 0x0004, + IOM_VERTQUALITY = 0x0008, + IOM_VERTNORMAL = 0x0010, + IOM_VERTTEXCOORD = 0x0020, - PM_FACEINDEX = 0x0040, - PM_FACEFLAGS = 0x0080, - PM_FACECOLOR = 0x0100, - PM_FACEQUALITY = 0x0200, - PM_FACENORMAL = 0x0400, - PM_WEDGCOLOR = 0x0800, - PM_WEDGTEXCOORD = 0x1000, - PM_WEDGTEXMULTI = 0x2000, // Se ha anche l'indice di texture esplicito - PM_WEDGNORMAL = 0x4000, + IOM_FACEINDEX = 0x0040, + IOM_FACEFLAGS = 0x0080, + IOM_FACECOLOR = 0x0100, + IOM_FACEQUALITY = 0x0200, + IOM_FACENORMAL = 0x0400, + IOM_WEDGCOLOR = 0x0800, + IOM_WEDGTEXCOORD = 0x1000, + IOM_WEDGTEXMULTI = 0x2000, // Se ha anche l'indice di texture esplicito + IOM_WEDGNORMAL = 0x4000, - PM_CAMERA = 0x8000, + IOM_CAMERA = 0x8000, - PM_FLAGS = PM_VERTFLAGS + PM_FACEFLAGS, + IOM_FLAGS = IOM_VERTFLAGS + IOM_FACEFLAGS, - PM_ALL = 0xFFFF + IOM_ALL = 0xFFFF }; - - -static void SMFlags2String( int mask, char str[] ) -{ - str[0] = 0; - - strcat(str,"V:"); - if( mask & PM_VERTFLAGS ) strcat(str,"flag,"); - if( mask & PM_VERTCOLOR ) strcat(str,"color,"); - if( mask & PM_VERTQUALITY ) strcat(str,"quality,"); - if( mask & PM_VERTTEXCOORD ) strcat(str,"tcoord,"); - if( mask & PM_VERTNORMAL ) strcat(str,"normal,"); - - strcat(str," F:"); - if( mask & PM_FACEFLAGS ) strcat(str,"mask,"); - if( mask & PM_FACECOLOR ) strcat(str,"color,"); - if( mask & PM_FACEQUALITY ) strcat(str,"quality,"); - if( mask & PM_FACENORMAL ) strcat(str,"normal,"); - - strcat(str," W:"); - if( mask & PM_WEDGCOLOR ) strcat(str,"color,"); - if( mask & PM_WEDGTEXCOORD ) strcat(str,"tcoord,"); - if( mask & PM_WEDGNORMAL ) strcat(str,"normal,"); - - if( mask & PM_CAMERA ) strcat(str," camera"); -} +// +// +//static void IOMask2String( int mask, char str[] ) +//{ +// str[0] = 0; +// +// strcat(str,"V:"); +// if( mask & IOM_VERTFLAGS ) strcat(str,"flag,"); +// if( mask & IOM_VERTCOLOR ) strcat(str,"color,"); +// if( mask & IOM_VERTQUALITY ) strcat(str,"quality,"); +// if( mask & IOM_VERTTEXCOORD ) strcat(str,"tcoord,"); +// if( mask & IOM_VERTNORMAL ) strcat(str,"normal,"); +// +// strcat(str," F:"); +// if( mask & IOM_FACEFLAGS ) strcat(str,"mask,"); +// if( mask & IOM_FACECOLOR ) strcat(str,"color,"); +// if( mask & IOM_FACEQUALITY ) strcat(str,"quality,"); +// if( mask & IOM_FACENORMAL ) strcat(str,"normal,"); +// +// strcat(str," W:"); +// if( mask & IOM_WEDGCOLOR ) strcat(str,"color,"); +// if( mask & IOM_WEDGTEXCOORD ) strcat(str,"tcoord,"); +// if( mask & IOM_WEDGNORMAL ) strcat(str,"normal,"); +// +// if( mask & IOM_CAMERA ) strcat(str," camera"); +//} }; // end class //@}