manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(nothing, really: comment cleanup, indent, beautification, translation...)

This commit is contained in:
mtarini 2013-06-04 11:55:33 +00:00
parent 6b7ca162ce
commit 2c3d20ca40
1 changed files with 314 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wrap/io_trimesh/import_ply.h
View File

@ -65,10 +65,8 @@ typedef typename OpenMeshType::VertexIterator VertexIterator;
typedef typename OpenMeshType::FaceIterator FaceIterator; typedef typename OpenMeshType::FaceIterator FaceIterator;
typedef typename OpenMeshType::EdgeIterator EdgeIterator; typedef typename OpenMeshType::EdgeIterator EdgeIterator;
//template <class T> int PlyType () { assert(0); return 0;}
#define MAX_USER_DATA 256 #define MAX_USER_DATA 256
// Struttura ausiliaria per la lettura del file ply // Auxiliary structure for reading ply files
struct LoadPly_FaceAux struct LoadPly_FaceAux
{ {
unsigned char size; unsigned char size;
@ -109,7 +107,7 @@ struct LoadPly_RangeGridAux {
}; };
// Struttura ausiliaria per la lettura del file ply // Auxiliary structure to load vertex data
template<class S> template<class S>
struct LoadPly_VertAux struct LoadPly_VertAux
{ {
@ -126,7 +124,7 @@ struct LoadPly_VertAux
float u,v,w; float u,v,w;
}; };
// Struttura ausiliaria caricamento camera // Auxiliary structure to load the camera
struct LoadPly_Camera struct LoadPly_Camera
{ {
float view_px; float view_px;
@ -414,7 +412,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi )
if(found) pi.mask |= Mask::IOM_CAMERA; if(found) pi.mask |= Mask::IOM_CAMERA;
} }
// Descrittori dati standard (vertex coord e faces) // Standard data desciptors (vertex coord and faces)
if( pf.AddToRead(VertDesc(0))==-1 && pf.AddToRead(VertDesc(22)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; } if( pf.AddToRead(VertDesc(0))==-1 && pf.AddToRead(VertDesc(22)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; }
if( pf.AddToRead(VertDesc(1))==-1 && pf.AddToRead(VertDesc(23)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; } if( pf.AddToRead(VertDesc(1))==-1 && pf.AddToRead(VertDesc(23)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; }
if( pf.AddToRead(VertDesc(2))==-1 && pf.AddToRead(VertDesc(24)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; } if( pf.AddToRead(VertDesc(2))==-1 && pf.AddToRead(VertDesc(24)) ) { pi.status = PlyInfo::E_NO_VERTEX; return pi.status; }
@ -433,7 +431,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi )
} }
} }
// Descrittori facoltativi dei flags // Optional flag descriptors
if(pf.AddToRead(EdgeDesc(0) )!= -1 && pf.AddToRead(EdgeDesc(1)) != -1 ) if(pf.AddToRead(EdgeDesc(0) )!= -1 && pf.AddToRead(EdgeDesc(1)) != -1 )
pi.mask |= Mask::IOM_EDGEINDEX; pi.mask |= Mask::IOM_EDGEINDEX;
@ -537,7 +535,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi )
} }
} }
// Descrittori definiti dall'utente, // User defined descriptors
std::vector<PropDescriptor> VPV(pi.vdn); // property descriptor relative al tipo LoadPly_VertexAux std::vector<PropDescriptor> VPV(pi.vdn); // property descriptor relative al tipo LoadPly_VertexAux
std::vector<PropDescriptor> FPV(pi.fdn); // property descriptor relative al tipo LoadPly_FaceAux std::vector<PropDescriptor> FPV(pi.fdn); // property descriptor relative al tipo LoadPly_FaceAux
if(pi.vdn>0){ if(pi.vdn>0){
@ -1117,19 +1115,19 @@ static bool LoadMask(const char * filename, int &mask, PlyInfo &pi)
if( pf.AddToRead(VertDesc(11))!=-1 ) mask |= Mask::IOM_VERTQUALITY; if( pf.AddToRead(VertDesc(11))!=-1 ) mask |= Mask::IOM_VERTQUALITY;
if( pf.AddToRead(VertDesc(15))!=-1 ) mask |= Mask::IOM_VERTRADIUS; if( pf.AddToRead(VertDesc(15))!=-1 ) mask |= Mask::IOM_VERTRADIUS;
if( pf.AddToRead(VertDesc(28))!=-1 ) mask |= Mask::IOM_VERTRADIUS; if( pf.AddToRead(VertDesc(28))!=-1 ) mask |= Mask::IOM_VERTRADIUS;
if( ( pf.AddToRead(VertDesc( 5))!=-1 ) && if( pf.AddToRead(VertDesc( 5))!=-1 &&
( pf.AddToRead(VertDesc( 6))!=-1 ) && pf.AddToRead(VertDesc( 6))!=-1 &&
( pf.AddToRead(VertDesc( 7))!=-1 ) ) mask |= Mask::IOM_VERTCOLOR; pf.AddToRead(VertDesc( 7))!=-1 ) mask |= Mask::IOM_VERTCOLOR;
if( ( pf.AddToRead(VertDesc( 8))!=-1 ) && if( pf.AddToRead(VertDesc( 8))!=-1 &&
( pf.AddToRead(VertDesc( 9))!=-1 ) && pf.AddToRead(VertDesc( 9))!=-1 &&
( pf.AddToRead(VertDesc(10))!=-1 ) ) mask |= Mask::IOM_VERTCOLOR; pf.AddToRead(VertDesc(10))!=-1 ) mask |= Mask::IOM_VERTCOLOR;
if( pf.AddToRead(VertDesc(19))!=-1 ) mask |= Mask::IOM_VERTCOLOR; if( pf.AddToRead(VertDesc(19))!=-1 ) mask |= Mask::IOM_VERTCOLOR;
if(( pf.AddToRead(VertDesc(20))!=-1 ) && (pf.AddToRead(VertDesc(21))!=-1)) if( pf.AddToRead(VertDesc(20))!=-1 &&
mask |= Mask::IOM_VERTTEXCOORD; pf.AddToRead(VertDesc(21))!=-1) mask |= Mask::IOM_VERTTEXCOORD;
if(( pf.AddToRead(VertDesc(16))!=-1 ) && (pf.AddToRead(VertDesc(17))!=-1)) if( pf.AddToRead(VertDesc(16))!=-1 &&
mask |= Mask::IOM_VERTTEXCOORD; pf.AddToRead(VertDesc(17))!=-1) mask |= Mask::IOM_VERTTEXCOORD;
if( pf.AddToRead(FaceDesc(0))!=-1 ) mask |= Mask::IOM_FACEINDEX; if( pf.AddToRead(FaceDesc(0))!=-1 ) mask |= Mask::IOM_FACEINDEX;
if( pf.AddToRead(FaceDesc(1))!=-1 ) mask |= Mask::IOM_FACEFLAGS; if( pf.AddToRead(FaceDesc(1))!=-1 ) mask |= Mask::IOM_FACEFLAGS;
@ -1138,10 +1136,9 @@ static bool LoadMask(const char * filename, int &mask, PlyInfo &pi)
if( pf.AddToRead(FaceDesc(3))!=-1 ) mask |= Mask::IOM_WEDGTEXCOORD; if( pf.AddToRead(FaceDesc(3))!=-1 ) mask |= Mask::IOM_WEDGTEXCOORD;
if( pf.AddToRead(FaceDesc(5))!=-1 ) mask |= Mask::IOM_WEDGTEXMULTI; if( pf.AddToRead(FaceDesc(5))!=-1 ) mask |= Mask::IOM_WEDGTEXMULTI;
if( pf.AddToRead(FaceDesc(4))!=-1 ) mask |= Mask::IOM_WEDGCOLOR; if( pf.AddToRead(FaceDesc(4))!=-1 ) mask |= Mask::IOM_WEDGCOLOR;
if( ( pf.AddToRead(FaceDesc(6))!=-1 ) && if( pf.AddToRead(FaceDesc(6))!=-1 &&
( pf.AddToRead(FaceDesc(7))!=-1 ) && pf.AddToRead(FaceDesc(7))!=-1 &&
( pf.AddToRead(FaceDesc(8))!=-1 ) ) mask |= Mask::IOM_FACECOLOR; pf.AddToRead(FaceDesc(8))!=-1 ) mask |= Mask::IOM_FACECOLOR;
return true; return true;
} }
@ -1150,7 +1147,6 @@ static bool LoadMask(const char * filename, int &mask, PlyInfo &pi)
}; // end class }; // end class
} // end namespace tri } // end namespace tri
} // end namespace io } // end namespace io
} // end namespace vcg } // end namespace vcg