src/curvature.cpp

@@ -1,6 +1,5 @@
 #include "curvature.h"
 #include "util.h"
-#include <OpenMesh/Core/Utils/PropertyManager.hh>
 
 
 void Courbures::normales_locales() {
@@ -22,36 +21,43 @@ void Courbures::normales_locales() {
 }
 
 
-void Courbures::get_two_neighborhood(std::vector<MyMesh::VertexHandle> &out,
+std::vector<MyMesh::VertexHandle> Courbures::get_two_neighborhood(const MyMesh::VertexHandle vh) {
-									 const MyMesh::VertexHandle vh) {
+    OpenMesh::VPropHandleT<bool> vprop_flag;
-	auto flag_prop =
+    _mesh.add_property(vprop_flag, "vprop_flag");
-		OpenMesh::getOrMakeProperty<VertexHandle, bool>(_mesh, "vprop_flag");
-	flag_prop.set_range(_mesh.vertices_begin(), _mesh.vertices_end(), false);
 
-	// Parcours du 1-anneau
+    // Initialisation
-	flag_prop[vh] = true;
+    for (VertexHandle vh : _mesh.vertices()) {
+        _mesh.property(vprop_flag, vh) = false;
+    }
+    // Circulateur sur le premier cercle
+    std::vector<MyMesh::VertexHandle> neigh, neigh2;
+
+	_mesh.property(vprop_flag, vh) = true;
     for(VertexHandle vv : _mesh.vv_range(vh)) {
-        out.push_back(vv); // ajout du point à la liste
+        neigh.push_back(vv); // ajout du point à la liste
-        flag_prop[vv] = true;
+        _mesh.property(vprop_flag, vv) = true;
     }
 
-    // Parcours du 1-anneau de chaque sommet du 1-anneau
+    // Parcours du premier cercle et ajout du second cercle par circulateurs
-	size_t old_size = out.size();
+    for (size_t i = 0; i < neigh.size(); i++) {
-    for (size_t i = 0; i < old_size; i++) {
+        MyMesh::VertexHandle vh = neigh.at(i) ;
-        for (VertexHandle vv : _mesh.vv_range(out[i])) {
+        for (VertexHandle vv : _mesh.vv_range(vh)) {
-            if (!flag_prop[vv]) {
+            if (!_mesh.property(vprop_flag, vv)) {
-				out.push_back(vv);
+				neigh2.push_back(vv);
-				flag_prop[vv] = true;
+			}
-			}
+            _mesh.property(vprop_flag, vv) = true;
         }
     }
+
+    // Concaténation des deux cercles
+    neigh.insert(neigh.end(), neigh2.begin(), neigh2.end());
+    _mesh.remove_property(vprop_flag);
+    return neigh;
 }
 
 
 QuadPatch Courbures::fit_quad(MyMesh::VertexHandle vh) {
-    static std::vector<MyMesh::VertexHandle> neigh;
+    std::vector<MyMesh::VertexHandle> neigh = get_two_neighborhood(vh);
-	neigh.clear();
-	get_two_neighborhood(neigh, vh);
     if (neigh.size() < 5) throw "Quad fitting: not enough neighbors";
 
     // Calcul de la matrice de changement de base

src/curvature.h

@@ -18,8 +18,7 @@ public:
 
     void set_fixed_colors() ;
     void normales_locales() ;
-    void get_two_neighborhood(std::vector<MyMesh::VertexHandle> &out,
+    std::vector<MyMesh::VertexHandle> get_two_neighborhood(MyMesh::VertexHandle vh);
-							  MyMesh::VertexHandle vh);
     QuadPatch fit_quad(MyMesh::VertexHandle vh);
     void compute_KH() ;
     void set_K_colors() ;

src/mesh_viewer.cpp

@@ -103,7 +103,7 @@ void MeshViewer::removeMesh(const MyMesh &mesh) {
 
 
 void MeshViewer::mousePressEvent(QMouseEvent *e) {
-	if (e->button() == Qt::MiddleButton) {
+	if (e->button() == Qt::LeftButton) {
 		mouse_pos = e->pos();
 	}
 }
@@ -116,7 +116,7 @@ void MeshViewer::mouseReleaseEvent(QMouseEvent *e) {
 
 
 void MeshViewer::mouseMoveEvent(QMouseEvent *e) {
-	if (e->buttons() & Qt::MiddleButton) {
+	if (e->buttons() & Qt::LeftButton) {
 		QPoint delta = e->pos() - mouse_pos;
 		rot = rot_start;
 		rot.rotate(delta.x() / 5., 0, 1, 0);

src/quad_patch_tesselator.cpp

@@ -2,7 +2,6 @@
 
 
 MyMesh tesselate_quad_patch(QuadPatch q, MyMesh mesh, VertexHandle vh) {
-	const size_t patch_divs = 8;
 	MyMesh patch;
 	Eigen::Vector3d point
 		(mesh.point(vh)[0], mesh.point(vh)[1], mesh.point(vh)[2]);
@@ -18,10 +17,10 @@ MyMesh tesselate_quad_patch(QuadPatch q, MyMesh mesh, VertexHandle vh) {
 		ymin = std::min(ymin, point[1]);
 		ymax = std::max(ymax, point[1]);
 	}
-	double xstep = (xmax-xmin)/static_cast<double>(patch_divs);
+	double xstep = (xmax-xmin)/64.;
-	double ystep = (ymax-ymin)/static_cast<double>(patch_divs);
+	double ystep = (ymax-ymin)/64.;
-	for (size_t y = 0; y < patch_divs; y++) {
+	for (size_t y = 0; y < 64; y++) {
-		for (size_t x = 0; x < patch_divs; x++) {
+		for (size_t x = 0; x < 64; x++) {
 			double dx = xmin + x * xstep;
 			double dy = ymin + y * ystep;
 			Eigen::Vector3d point(dx, dy, -q(dx, dy));
@@ -32,14 +31,14 @@ MyMesh tesselate_quad_patch(QuadPatch q, MyMesh mesh, VertexHandle vh) {
 	for (VertexHandle vhi : patch.vertices()) {
 		patch.set_color(vhi, MyMesh::Color(0, 1, .2));
 		size_t i = vhi.idx();
-		size_t x = i % patch_divs;
+		size_t x = i % 64;
-		size_t y = i / patch_divs;
+		size_t y = i / 64;
-		if (x == patch_divs - 1 || y == patch_divs - 1) continue;
+		if (x == 63 || y == 63) continue;
-		patch.add_face(vhi, patch.vertex_handle(i + patch_divs),
+		patch.add_face(vhi, patch.vertex_handle(i + 64),
 					   patch.vertex_handle(i + 1));
 		patch.add_face(patch.vertex_handle(i + 1),
-					   patch.vertex_handle(i + patch_divs),
+					   patch.vertex_handle(i + 64),
-					   patch.vertex_handle(i + patch_divs + 1));
+					   patch.vertex_handle(i + 65));
 	}
 	return patch;
 }