From c10421aa6b41bf2f36829a591a1d135413b1f743 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Mon, 4 Dec 2006 11:10:02 +0000 Subject: [PATCH] put back Occ-related lines. Types Occ working --- .../sample/trimesh_optional/trimesh_optional.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/sample/trimesh_optional/trimesh_optional.cpp b/apps/sample/trimesh_optional/trimesh_optional.cpp index 30acf2e9..05e473b3 100644 --- a/apps/sample/trimesh_optional/trimesh_optional.cpp +++ b/apps/sample/trimesh_optional/trimesh_optional.cpp @@ -50,12 +50,12 @@ int main(int , char **) { CMesh cm; CMeshOcf cmof; -// CMeshOcc cmoc; + CMeshOcc cmoc; tri::Tetrahedron(cm); tri::Tetrahedron(cmof); -// tri::Tetrahedron(cmoc); + tri::Tetrahedron(cmoc); 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. /// normals are not normalized -// cmoc.face.EnableAttribute(); + cmoc.face.EnableAttribute(); cmof.face.EnableFFAdjacency(); printf("Size of CFace %3i\n",sizeof(CFace)); 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::FaceFace(cm); vcg::tri::UpdateTopology::FaceFace(cmof); -// vcg::tri::UpdateTopology::FaceFace(cmoc); + vcg::tri::UpdateTopology::FaceFace(cmoc); vcg::tri::UpdateFlags::FaceBorderFromFF(cm); vcg::tri::UpdateFlags::FaceBorderFromFF(cmof); - // vcg::tri::UpdateFlags::FaceBorderFromFF(cmoc); + vcg::tri::UpdateFlags::FaceBorderFromFF(cmoc); vcg::tri::UpdateNormals::PerVertexNormalized(cm); vcg::tri::UpdateNormals::PerVertexNormalized(cmof); -// vcg::tri::UpdateNormals::PerVertexNormalized(cmoc); + vcg::tri::UpdateNormals::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]); @@ -93,7 +93,7 @@ int main(int , char **) t1=clock(); Refine(cmof,MidPointButterfly(),0); t2=clock(); -// Refine(cmoc,MidPointButterfly(),0); + Refine(cmoc,MidPointButterfly(),0); 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); }