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

Minor change in LoadMask

This commit is contained in:
Massimiliano Corsini 2006-03-29 08:16:31 +00:00
parent a467768485
commit bfe721721e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wrap/io_trimesh/import.h
View File

@ -25,6 +25,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.9 2006/03/27 07:17:49 cignoni
Added generic LoadMask
Revision 1.8 2006/03/07 13:19:29 cignoni Revision 1.8 2006/03/07 13:19:29 cignoni
First Release with OBJ import support First Release with OBJ import support
@ -146,6 +149,7 @@ static const char *ErrorMsg(int error)
static bool LoadMask(const char * filename, int &mask) static bool LoadMask(const char * filename, int &mask)
{ {
bool err; bool err;
if(FileExtension(filename,"ply")) if(FileExtension(filename,"ply"))
{ {
err = ImporterPLY<OpenMeshType>::LoadMask(filename, mask); err = ImporterPLY<OpenMeshType>::LoadMask(filename, mask);
@ -154,12 +158,13 @@ static bool LoadMask(const char * filename, int &mask)
else if(FileExtension(filename,"stl")) else if(FileExtension(filename,"stl"))
{ {
mask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX; mask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX;
err = true;
LastType()=KT_STL; LastType()=KT_STL;
} }
else if(FileExtension(filename,"off")) else if(FileExtension(filename,"off"))
{ {
mask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX; mask = Mask::IOM_VERTCOORD | Mask::IOM_FACEINDEX;
//err = ImporterOFF<OpenMeshType>::Open(m, filename, loadmask, cb); err = ImporterOFF<OpenMeshType>::LoadMask(filename, mask);
LastType()=KT_OFF; LastType()=KT_OFF;
} }
else if(FileExtension(filename,"obj")) else if(FileExtension(filename,"obj"))
@ -167,8 +172,9 @@ static bool LoadMask(const char * filename, int &mask)
err = ImporterOBJ<OpenMeshType>::LoadMask(filename, mask); err = ImporterOBJ<OpenMeshType>::LoadMask(filename, mask);
LastType()=KT_OBJ; LastType()=KT_OBJ;
} }
else { else
err=false; {
err = false;
LastType()=KT_UNKNOWN; LastType()=KT_UNKNOWN;
} }