Move Delaunay propagation function

Signed-off-by: pacien <pacien.trangirard@pacien.net>

2 files changed, 13 insertions, 8 deletions

diff --git a/src/morpher/quadrilateral.c b/src/morpher/quadrilateral.c
index af77f0f..9c73dfa 100644
--- a/src/morpher/quadrilateral.c
+++ b/src/morpher/quadrilateral.c
@@ -61,11 +61,3 @@ bool quadrilateral_is_delaunay(TriangleMap *t1, TriangleMap *t2) {
   return not_in_circumcircle(t1, t2->vertices[(trianglemap_find_common_edge(t2, t1) + 2) % 3].origin) &&
          not_in_circumcircle(t2, t1->vertices[(trianglemap_find_common_edge(t1, t2) + 2) % 3].origin);
 }
-
-void quadrilateral_propagate_delaunay(TriangleMap *start, TriangleMap *neighbor) {
-  assert(start != NULL && neighbor != NULL);
-  if (!quadrilateral_is_delaunay(start, neighbor)) {
-    quadrilateral_flip_diagonal(start, neighbor);
-    trianglemap_foreach_neighbor(neighbor, quadrilateral_propagate_delaunay);
-  }
-}
diff --git a/src/morpher/trianglemap.c b/src/morpher/trianglemap.c
index 01b66c9..6658901 100644
--- a/src/morpher/trianglemap.c
+++ b/src/morpher/trianglemap.c
@@ -1,8 +1,17 @@
 #include "morpher/trianglemap.h"
 #include <stdlib.h>
 #include <assert.h>
+#include "morpher/quadrilateral.h"
 #include "common/mem.h"
 
+static void propagate_delaunay(TriangleMap *start, TriangleMap *neighbor) {
+  assert(start != NULL && neighbor != NULL);
+  if (!quadrilateral_is_delaunay(start, neighbor)) {
+    quadrilateral_flip_diagonal(start, neighbor);
+    trianglemap_foreach_neighbor(neighbor, propagate_delaunay);
+  }
+}
+
 TriangleMap *trianglemap_create(CartesianMapping v1, CartesianMapping v2, CartesianMapping v3) {
   TriangleMap *triangle = malloc_or_die(sizeof(TriangleMap));
   triangle->vertices[0] = v1;
@@ -51,6 +60,10 @@ void trianglemap_foreach_neighbor(TriangleMap *t, void (*f)(TriangleMap *, Trian
   for (cursor = 0; cursor < 3; ++cursor) if (t->neighbors[cursor] != NULL) f(t, t->neighbors[cursor]);
 }
 
+void trianglemap_propagate_delaunay(TriangleMap *t) {
+  trianglemap_foreach_neighbor(t, propagate_delaunay);
+}
+
 TriangleMap *trianglemap_split(TriangleMap *t, CartesianMapping v) {
   assert(trianglemap_to(t, v.origin) == t);