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

added vert::bitflags to ocf (needed). commented out the lines about occ which is not currently up to date

This commit is contained in:
ganovelli 2006-10-27 13:59:54 +00:00
parent cd438cf489
commit 38a8596b2c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/sample/trimesh_optional/trimesh_optional.cpp
View File

@ -32,9 +32,9 @@ class CVertexOcf;
// OCF Optional Component Fast // OCF Optional Component Fast
// OCC Optional Component Compact // OCC Optional Component Compact
class CVertex : public VertexSimp2< CVertex, CEdge, CFace, vert::Coord3f, vert::Normal3f >{}; class CVertex : public VertexSimp2< CVertex, CEdge, CFace, vert::Coord3f, vert::BitFlags,vert::Normal3f >{};
class CVertexOcf : public VertexSimp2< CVertexOcf, CEdge, CFaceOcf, vert::Coord3f, vert::Normal3f >{}; class CVertexOcf : public VertexSimp2< CVertexOcf, CEdge, CFaceOcf, vert::Coord3f, vert::BitFlags,vert::Normal3f >{};
class CVertexOcc : public VertexSimp2< CVertexOcc, CEdge, CFaceOcc, vert::Coord3f, vert::Normal3f >{}; class CVertexOcc : public VertexSimp2< CVertexOcc, CEdge, CFaceOcc, vert::Coord3f, vert::BitFlags,vert::Normal3f >{};
class CFace : public FaceSimp2< CVertex, CEdge, CFace, face::FFAdj, face::VertexRef, face::BitFlags, face::Normal3f > {}; class CFace : public FaceSimp2< CVertex, CEdge, CFace, face::FFAdj, face::VertexRef, face::BitFlags, face::Normal3f > {};
class CFaceOcf : public FaceSimp2< CVertexOcf, CEdge, CFaceOcf, face::InfoOcf, face::FFAdjOcf, face::VertexRef, face::BitFlags, face::Normal3fOcf > {}; class CFaceOcf : public FaceSimp2< CVertexOcf, CEdge, CFaceOcf, face::InfoOcf, face::FFAdjOcf, face::VertexRef, face::BitFlags, face::Normal3fOcf > {};
@ -50,12 +50,12 @@ int main(int , char **)
{ {
CMesh cm; CMesh cm;
CMeshOcf cmof; CMeshOcf cmof;
CMeshOcc cmoc; // CMeshOcc cmoc;
tri::Tetrahedron(cm); tri::Tetrahedron(cm);
tri::Tetrahedron(cmof); tri::Tetrahedron(cmof);
tri::Tetrahedron(cmoc); // tri::Tetrahedron(cmoc);
printf("Generated mesh has %i vertices and %i triangular faces\n",cm.vn,cm.fn); printf("Generated mesh has %i vertices and %i triangular faces\n",cm.vn,cm.fn);
@ -63,25 +63,25 @@ int main(int , char **)
/// The normal of a vertex v is the weigthed average of the normals of the faces incident on v. /// The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
/// normals are not normalized /// normals are not normalized
cmoc.face.EnableAttribute<CFaceOcc::FFAdjType>(); // cmoc.face.EnableAttribute<CFaceOcc::FFAdjType>();
cmof.face.EnableFFAdjacency(); cmof.face.EnableFFAdjacency();
printf("Size of CFace %3i\n",sizeof(CFace)); printf("Size of CFace %3i\n",sizeof(CFace));
printf("Size of CFaceOcf %3i\n",sizeof(CFaceOcf)); printf("Size of CFaceOcf %3i\n",sizeof(CFaceOcf));
printf("Size of CFaceOcc %3i\n",sizeof(CFaceOcc)); // printf("Size of CFaceOcc %3i\n",sizeof(CFaceOcc));
vcg::tri::UpdateTopology<CMesh >::FaceFace(cm); vcg::tri::UpdateTopology<CMesh >::FaceFace(cm);
vcg::tri::UpdateTopology<CMeshOcf>::FaceFace(cmof); vcg::tri::UpdateTopology<CMeshOcf>::FaceFace(cmof);
vcg::tri::UpdateTopology<CMeshOcc>::FaceFace(cmoc); // vcg::tri::UpdateTopology<CMeshOcc>::FaceFace(cmoc);
vcg::tri::UpdateFlags<CMesh >::FaceBorderFromFF(cm); vcg::tri::UpdateFlags<CMesh >::FaceBorderFromFF(cm);
vcg::tri::UpdateFlags<CMeshOcf>::FaceBorderFromFF(cmof); vcg::tri::UpdateFlags<CMeshOcf>::FaceBorderFromFF(cmof);
vcg::tri::UpdateFlags<CMeshOcc>::FaceBorderFromFF(cmoc); // vcg::tri::UpdateFlags<CMeshOcc>::FaceBorderFromFF(cmoc);
vcg::tri::UpdateNormals<CMesh >::PerVertexNormalized(cm); vcg::tri::UpdateNormals<CMesh >::PerVertexNormalized(cm);
vcg::tri::UpdateNormals<CMeshOcf>::PerVertexNormalized(cmof); vcg::tri::UpdateNormals<CMeshOcf>::PerVertexNormalized(cmof);
vcg::tri::UpdateNormals<CMeshOcc>::PerVertexNormalized(cmoc); // vcg::tri::UpdateNormals<CMeshOcc>::PerVertexNormalized(cmoc);
printf("Normal of face 0 is %f %f %f\n\n",cm.face[0].N()[0],cm.face[0].N()[1],cm.face[0].N()[2]); printf("Normal of face 0 is %f %f %f\n\n",cm.face[0].N()[0],cm.face[0].N()[1],cm.face[0].N()[2]);
@ -93,7 +93,7 @@ int main(int , char **)
t1=clock(); t1=clock();
Refine(cmof,MidPointButterfly<CMeshOcf>(),0); Refine(cmof,MidPointButterfly<CMeshOcf>(),0);
t2=clock(); t2=clock();
Refine(cmoc,MidPointButterfly<CMeshOcc>(),0); // Refine(cmoc,MidPointButterfly<CMeshOcc>(),0);
t3=clock(); t3=clock();
printf("Mesh is %i %i in Std:%i Ocf:%i Occ:%i\n",cm.vn,cm.fn,t1-t0,t2-t1,t3-t2); printf("Mesh is %i %i in Std:%i Ocf:%i Occ:%i\n",cm.vn,cm.fn,t1-t0,t2-t1,t3-t2);
} }