carve fixes

Author: vjeranc

external/Carve/src/include/carve/mesh_impl.hpp

@@ -639,15 +639,16 @@ inline int Mesh<3>::orientationAtVertex(edge_t* e_base) {
   vertex_t::vector_t v_base = e->v1()->v;
   std::vector<vertex_t::vector_t> v_edge;
 
-  if (v_edge.size() < 3) {
-    return 0;
-  }
 
   do {
     v_edge.push_back(e->v2()->v);
     e = e->rev->next;
   } while (e != e_base);
 
+  if (v_edge.size() < 3) {
+    return 0;
+  }
+
   const size_t N = v_edge.size();
 
   for (size_t i = 0; i < N; ++i) {

external/Carve/src/include/carve/mesh_simplify.hpp

@@ -896,8 +896,8 @@ class MeshSimplifier {
       edge_t* removed = edge->mergeFaces();
       if (removed == nullptr) {
         coplanar_face_edges.erase(edge);
-        ++n_merge;
       } else {
+        ++n_merge;
         edge_t* e = removed;
         do {
           edge_t* n = e->next;
@@ -1082,15 +1082,17 @@ class MeshSimplifier {
       face_t* face = mesh->faces[i];
       edge_t* start = face->edge;
       edge_t* edge = start;
+      size_t edgesBeforeRemoval = face->n_edges;
       do {
         if (edge->next == edge->rev || edge->prev == edge->rev) {
           edge = edge->removeEdge();
-          ++n_removed;
+          if (face->n_edges == 0) { break; }
           start = edge->prev;
         } else {
           edge = edge->next;
         }
       } while (edge != start);
+      n_removed += edgesBeforeRemoval - face->n_edges;
     }
     return n_removed;
   }
@@ -1183,6 +1185,7 @@ class MeshSimplifier {
       n_removed += mergeCoplanarFaces(meshset->meshes[i], min_normal_angle);
       removeRemnantFaces(meshset->meshes[i]);
       cleanFaceEdges(meshset->meshes[i]);
+      removeRemnantFaces(meshset->meshes[i]);
       meshset->meshes[i]->cacheEdges();
     }
     return n_removed;