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

added support of internal edge bit for keeping track of triangulated polygonal faces

This commit is contained in:
Paolo Cignoni 2008-06-26 08:41:11 +00:00
parent 674096eb00
commit e5572b4f05
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wrap/io_trimesh/import_obj.h
View File

@ -162,6 +162,7 @@ struct ObjIndexedFace
int n[3]; int n[3];
int t[3]; int t[3];
int tInd; int tInd;
bool edge[3];
Color4b c; Color4b c;
}; };
@ -376,6 +377,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
else if (header.compare("f")==0) // face else if (header.compare("f")==0) // face
{ {
if (numTokens < 4) return E_LESS_THAN_3VERTINFACE; if (numTokens < 4) return E_LESS_THAN_3VERTINFACE;
int vertexesPerFace = static_cast<int>(tokens.size()-1);
std::string vertex; std::string vertex;
std::string texcoord; std::string texcoord;
@ -416,6 +418,9 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
if( oi.mask & vcg::tri::io::Mask::IOM_FACECOLOR) if( oi.mask & vcg::tri::io::Mask::IOM_FACECOLOR)
ff.c = currentColor; ff.c = currentColor;
// by default there are no internal edge
ff.edge[0]=ff.edge[1]=ff.edge[2]=false;
if(vertexesPerFace>3) ff.edge[2]=true;
++numTriangles; ++numTriangles;
indexedFaces.push_back(ff); indexedFaces.push_back(ff);
/* /*
@ -437,7 +442,6 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
// triangles, and this may lead to the creation of very thin triangles. // triangles, and this may lead to the creation of very thin triangles.
*/ */
int vertexesPerFace = static_cast<int>(tokens.size()-1);
int iVertex = 3; int iVertex = 3;
while (iVertex < vertexesPerFace) // add other triangles while (iVertex < vertexesPerFace) // add other triangles
{ {
@ -478,7 +482,11 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
ffNew.n[1]=ff.n[2]; ffNew.n[1]=ff.n[2];
ffNew.n[2]=vn4_index; ffNew.n[2]=vn4_index;
} }
// Setting internal edges: edge 1 (the opposite to vertex 0) is always an external edge.
ffNew.edge[0]=true;
ffNew.edge[1]=false;
if(iVertex < vertexesPerFace) ffNew.edge[2]=true;
else ffNew.edge[2]=false;
++numTriangles; ++numTriangles;
++extraTriangles; ++extraTriangles;
indexedFaces.push_back(ffNew); indexedFaces.push_back(ffNew);
@ -550,6 +558,9 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
} }
if ( oi.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL ) if ( oi.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL )
m.face[i].WN(j).Import(normals[indexedFaces[i].n[j]]); m.face[i].WN(j).Import(normals[indexedFaces[i].n[j]]);
// set border flags according to internals faces
if(indexedFaces[i].edge[j]) m.face[i].SetF(j);
else m.face[i].ClearF(j);
} }
if ( oi.mask & vcg::tri::io::Mask::IOM_FACECOLOR ) if ( oi.mask & vcg::tri::io::Mask::IOM_FACECOLOR )
m.face[i].C()=indexedFaces[i].c; m.face[i].C()=indexedFaces[i].c;
@ -558,6 +569,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
m.face[i].N().Import(m.face[i].WN(0)+m.face[i].WN(1)+m.face[i].WN(2)); m.face[i].N().Import(m.face[i].WN(0)+m.face[i].WN(1)+m.face[i].WN(2));
else // computing face normal from position of face vertices else // computing face normal from position of face vertices
face::ComputeNormalizedNormal(m.face[i]); face::ComputeNormalizedNormal(m.face[i]);
} }
return result; return result;