From 96ce1e8a4a286751864e54328bd132d9b9402d00 Mon Sep 17 00:00:00 2001 From: cignoni Date: Mon, 30 Jan 2006 15:02:50 +0000 Subject: [PATCH] Added mask filling in open --- wrap/io_trimesh/import_off.h | 6 +++++- wrap/io_trimesh/import_stl.h | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/wrap/io_trimesh/import_off.h b/wrap/io_trimesh/import_off.h index 082d32dd..42c0323f 100644 --- a/wrap/io_trimesh/import_off.h +++ b/wrap/io_trimesh/import_off.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.10 2006/01/10 13:20:42 cignoni +Changed ply::PlyMask to io::Mask + Revision 1.9 2005/12/01 00:58:56 cignoni Added and removed typenames for gcc compiling... @@ -328,7 +331,8 @@ namespace vcg } //end switch } // end if (isColorDefined) } - + loadmask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX; + if(isColorDefined) loadmask |= Mask::IOM_FACECOLOR; return NoError; } // end Open diff --git a/wrap/io_trimesh/import_stl.h b/wrap/io_trimesh/import_stl.h index 479e8fb0..a9a52ea0 100644 --- a/wrap/io_trimesh/import_stl.h +++ b/wrap/io_trimesh/import_stl.h @@ -25,6 +25,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.10 2006/01/04 16:14:43 cignoni +Added callback managment on loading of binary stl + Revision 1.9 2005/09/15 09:29:45 m_di_benedetto #included missing and @@ -109,6 +112,12 @@ static const char *ErrorMsg(int error) else return stl_error_msg[error]; }; +static int Open(OpenMeshType &mesh, const char *filename, int &loadmask, CallBackPos *cb=0) +{ + loadmask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX; + return Open(mesh,filename,cb); +} + static int Open( OpenMeshType &m, const char * filename, CallBackPos *cb=0) { FILE *fp;