From aee677f2897f22684f4cfb36c54f65484fa51414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Mon, 28 Nov 2022 12:13:50 +0100 Subject: [PATCH] Revert "Use OpenMesh::DefaultTraitsDouble directly instead of custom traits" This reverts commit 16da969e88cf9ca926de63c40a1d21fea550d5f3. So that it does not bump OpenMesh required version --- .../Linear_cell_complex_2/openmesh_performance.h | 11 ++++++++++- .../Cactus_deformation_session_OpenMesh.cpp | 15 +++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/openmesh_performance.h b/Linear_cell_complex/benchmark/Linear_cell_complex_2/openmesh_performance.h index afdb700c75b..71ff72ea813 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/openmesh_performance.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/openmesh_performance.h @@ -22,10 +22,19 @@ public: mesh.request_face_normals(); } + private: - typedef OpenMesh::TriMesh_ArrayKernelT Mesh; + + struct MyTraits : public OpenMesh::DefaultTraits + { + typedef OpenMesh::Vec3d Point; + typedef OpenMesh::Vec3d Normal; + }; + + typedef OpenMesh::TriMesh_ArrayKernelT Mesh; Mesh mesh; + private: void display_info() { diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session_OpenMesh.cpp b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session_OpenMesh.cpp index 06817a78b71..fe1aded57c0 100644 --- a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session_OpenMesh.cpp +++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session_OpenMesh.cpp @@ -13,10 +13,17 @@ #include -typedef OpenMesh::PolyMesh_ArrayKernelT Mesh; -typedef Mesh::Point Point; -typedef boost::graph_traits::vertex_descriptor vertex_descriptor; -typedef boost::graph_traits::vertex_iterator vertex_iterator; +struct DoubleTraits : public OpenMesh::DefaultTraits +{ + typedef OpenMesh::Vec3d Point; + typedef OpenMesh::Vec3d Normal; +}; + + +typedef OpenMesh::PolyMesh_ArrayKernelT Mesh; +typedef Mesh::Point Point; +typedef boost::graph_traits::vertex_descriptor vertex_descriptor; +typedef boost::graph_traits::vertex_iterator vertex_iterator; typedef CGAL::Surface_mesh_deformation Deform_mesh_arap; typedef CGAL::Surface_mesh_deformation Deform_mesh_spoke;