songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x

This commit is contained in:
Mael Rouxel-Labbé 2022-11-28 12:14:39 +01:00
parent 841373df6d aee677f289
commit 3a14b67965
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Linear_cell_complex/benchmark/Linear_cell_complex_2/openmesh_performance.h
View File

@ -22,10 +22,19 @@ public:
mesh.request_face_normals(); mesh.request_face_normals();
} }
private: private:
typedef OpenMesh::TriMesh_ArrayKernelT<OpenMesh::DefaultTraitsDouble> Mesh;
struct MyTraits : public OpenMesh::DefaultTraits
{
typedef OpenMesh::Vec3d Point;
typedef OpenMesh::Vec3d Normal;
};
typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> Mesh;
Mesh mesh; Mesh mesh;
private: private:
void display_info() void display_info()
{ {

15
Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session_OpenMesh.cpp
View File

@ -13,10 +13,17 @@
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
typedef OpenMesh::PolyMesh_ArrayKernelT<OpenMesh::DefaultTraitsDouble> Mesh; struct DoubleTraits : public OpenMesh::DefaultTraits
typedef Mesh::Point Point; {
typedef boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor; typedef OpenMesh::Vec3d Point;
typedef boost::graph_traits<Mesh>::vertex_iterator vertex_iterator; typedef OpenMesh::Vec3d Normal;
};
typedef OpenMesh::PolyMesh_ArrayKernelT<DoubleTraits> Mesh;
typedef Mesh::Point Point;
typedef boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor;
typedef boost::graph_traits<Mesh>::vertex_iterator vertex_iterator;
typedef CGAL::Surface_mesh_deformation<Mesh, CGAL::Default, CGAL::Default, CGAL::ORIGINAL_ARAP> Deform_mesh_arap; typedef CGAL::Surface_mesh_deformation<Mesh, CGAL::Default, CGAL::Default, CGAL::ORIGINAL_ARAP> Deform_mesh_arap;
typedef CGAL::Surface_mesh_deformation<Mesh, CGAL::Default, CGAL::Default, CGAL::SPOKES_AND_RIMS> Deform_mesh_spoke; typedef CGAL::Surface_mesh_deformation<Mesh, CGAL::Default, CGAL::Default, CGAL::SPOKES_AND_RIMS> Deform_mesh_spoke;