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

improved the support of per vertex texture data. Now it is correctly handled in OFF and PLY

This commit is contained in:
Paolo Cignoni 2010-02-23 01:51:25 +00:00
parent 18c92582d4
commit 866abb0921
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wrap/io_trimesh/export_off.h
View File

@ -159,7 +159,8 @@ namespace vcg {
{ {
int capability = 0; int capability = 0;
capability |= vcg::tri::io::Mask::IOM_VERTCOORD; capability |= vcg::tri::io::Mask::IOM_VERTCOORD;
capability |= vcg::tri::io::Mask::IOM_VERTCOLOR; capability |= vcg::tri::io::Mask::IOM_VERTCOLOR;
capability |= vcg::tri::io::Mask::IOM_VERTTEXCOORD;
capability |= vcg::tri::io::Mask::IOM_FACEINDEX; capability |= vcg::tri::io::Mask::IOM_FACEINDEX;
capability |= vcg::tri::io::Mask::IOM_BITPOLYGONAL; capability |= vcg::tri::io::Mask::IOM_BITPOLYGONAL;
return capability; return capability;

31
wrap/io_trimesh/export_ply.h
View File

@ -300,7 +300,13 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
"property float radius\n" "property float radius\n"
); );
} }
if( ( m.HasPerVertexTexCoord() && pi.mask & Mask::IOM_VERTTEXCOORD ) )
{
fprintf(fpout,
"property float texture_u\n"
"property float texture_v\n"
);
}
for(i=0;i<pi.vdn;i++) for(i=0;i<pi.vdn;i++)
fprintf(fpout,"property %s %s\n",pi.VertexData[i].stotypename(),pi.VertexData[i].propname); fprintf(fpout,"property %s %s\n",pi.VertexData[i].stotypename(),pi.VertexData[i].propname);
@ -310,15 +316,14 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
,m.fn ,m.fn
); );
if(m.HasPerFaceFlags() && (pi.mask & Mask::IOM_FACEFLAGS) ) if(HasPerFaceFlags(m) && (pi.mask & Mask::IOM_FACEFLAGS) )
{ {
fprintf(fpout, fprintf(fpout,
"property int flags\n" "property int flags\n"
); );
} }
if( ( m.HasPerVertexTexCoord() && pi.mask & Mask::IOM_VERTTEXCOORD ) || if( (HasPerWedgeTexCoord(m) || HasPerVertexTexCoord(m) ) && pi.mask & Mask::IOM_WEDGTEXCOORD ) // Note that you can save VT as WT if you really want it...
( m.HasPerWedgeTexCoord() && pi.mask & Mask::IOM_WEDGTEXCOORD ) )
{ {
fprintf(fpout, fprintf(fpout,
"property list uchar float texcoord\n" "property list uchar float texcoord\n"
@ -330,7 +335,7 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
); );
} }
if( m.HasPerFaceColor() && (pi.mask & Mask::IOM_FACECOLOR) ) if( HasPerFaceColor(m) && (pi.mask & Mask::IOM_FACECOLOR) )
{ {
fprintf(fpout, fprintf(fpout,
"property uchar red\n" "property uchar red\n"
@ -340,14 +345,14 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
); );
} }
if ( m.HasPerWedgeColor() && (pi.mask & Mask::IOM_WEDGCOLOR) ) if ( HasPerWedgeColor(m) && (pi.mask & Mask::IOM_WEDGCOLOR) )
{ {
fprintf(fpout, fprintf(fpout,
"property list uchar float color\n" "property list uchar float color\n"
); );
} }
if( m.HasPerFaceQuality() && (pi.mask & Mask::IOM_FACEQUALITY) ) if( HasPerFaceQuality(m) && (pi.mask & Mask::IOM_FACEQUALITY) )
{ {
fprintf(fpout, fprintf(fpout,
"property float quality\n" "property float quality\n"
@ -464,6 +469,11 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
if( HasPerVertexRadius(m) && (pi.mask & Mask::IOM_VERTRADIUS) ) if( HasPerVertexRadius(m) && (pi.mask & Mask::IOM_VERTRADIUS) )
fwrite(&( vp->R() ),sizeof(float),1,fpout); fwrite(&( vp->R() ),sizeof(float),1,fpout);
if( HasPerVertexTexCoord(m) && (pi.mask & Mask::IOM_VERTTEXCOORD) )
{
t = float(vp->T().u()); fwrite(&t,sizeof(float),1,fpout);
t = float(vp->T().v()); fwrite(&t,sizeof(float),1,fpout);
}
for(i=0;i<pi.vdn;i++) for(i=0;i<pi.vdn;i++)
{ {
@ -499,6 +509,9 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
if( HasPerVertexRadius(m) && (pi.mask & Mask::IOM_VERTRADIUS) ) if( HasPerVertexRadius(m) && (pi.mask & Mask::IOM_VERTRADIUS) )
fprintf(fpout,"%g ",vp->R()); fprintf(fpout,"%g ",vp->R());
if( HasPerVertexTexCoord(m) && (pi.mask & Mask::IOM_VERTTEXCOORD) )
fprintf(fpout,"%g %g",vp->T().u(),vp->T().v());
for(i=0;i<pi.vdn;i++) for(i=0;i<pi.vdn;i++)
{ {
float tf(0); double td(0); float tf(0); double td(0);
@ -548,7 +561,7 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
if(m.HasPerFaceFlags()&&( pi.mask & Mask::IOM_FACEFLAGS) ) if(m.HasPerFaceFlags()&&( pi.mask & Mask::IOM_FACEFLAGS) )
fwrite(&(fp->Flags()),sizeof(int),1,fpout); fwrite(&(fp->Flags()),sizeof(int),1,fpout);
if( m.HasPerVertexTexCoord() && (pi.mask & Mask::IOM_VERTTEXCOORD) ) if( m.HasPerVertexTexCoord() && (pi.mask & Mask::IOM_WEDGTEXCOORD) ) // you can save VT as WT if you really want it...
{ {
fwrite(&b6,sizeof(char),1,fpout); fwrite(&b6,sizeof(char),1,fpout);
float t[6]; float t[6];
@ -620,7 +633,7 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p
if(m.HasPerFaceFlags()&&( pi.mask & Mask::IOM_FACEFLAGS )) if(m.HasPerFaceFlags()&&( pi.mask & Mask::IOM_FACEFLAGS ))
fprintf(fpout,"%d ",fp->Flags()); fprintf(fpout,"%d ",fp->Flags());
if( m.HasPerVertexTexCoord() && (pi.mask & Mask::IOM_VERTTEXCOORD) ) if( m.HasPerVertexTexCoord() && (pi.mask & Mask::IOM_WEDGTEXCOORD) ) // you can save VT as WT if you really want it...
{ {
fprintf(fpout,"6 "); fprintf(fpout,"6 ");
for(int k=0;k<3;++k) for(int k=0;k<3;++k)