Moved vf corner methods to general utility and added seams to seamless viewer

Author: rjc8237

include/feature/feature/core/common.h

@@ -13,7 +13,6 @@ using Holonomy::DualLoop;
 using Holonomy::MarkedPennerConeMetric;
 using Holonomy::NewtonParameters;
 using Holonomy::MarkedMetricParameters;
-typedef std::array<int, 2> VertexEdge;
 
 /**
  * @brief Compute the square of a scalar.

include/feature/feature/core/io.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "feature/core/common.h"
+#include "util/vf_corners.h"
 
 namespace Penner {
 namespace Feature {

include/feature/feature/feature/error.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "feature/core/common.h"
-#include "feature/core/vf_corners.h"
+#include "util/vf_corners.h"
 
 namespace Penner {
 namespace Feature {

include/feature/feature/feature/features.h

@@ -4,6 +4,7 @@
 #include "feature/core/common.h"
 
 #include "feature/util/union_find.h"
+#include "util/vf_corners.h"
 #include "holonomy/holonomy/marked_penner_cone_metric.h"
 
 namespace Penner {

include/feature/feature/interface.h

@@ -4,7 +4,7 @@
 #include "feature/dirichlet/dirichlet_penner_cone_metric.h"
 #include "feature/feature/features.h"
 #include "holonomy/field/intrinsic_field.h"
-#include "feature/core/vf_corners.h"
+#include "util/vf_corners.h"
 #include "holonomy/interface.h"
 
 namespace Penner {

include/feature/feature/core/vf_corners.h include/util/util/vf_corners.hinclude/feature/feature/core/vf_corners.h renamed to include/util/util/vf_corners.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "feature/core/common.h"
+#include "util/common.h"
 
 namespace Penner {
-namespace Feature {
+
+typedef std::array<int, 2> VertexEdge;
 
 /**
  * @brief Representation of an edge as the two opposite face corners
@@ -242,19 +243,6 @@ Eigen::MatrixXd transfer_halfedge_function_to_corner(
     const Eigen::MatrixXi& F,
     const VectorX& halfedge_func);
 
-/**
- * @brief Find the seams of the parameterization of a closed mesh.
- * 
- * TODO: Extend to open meshes
- * 
- * @param F: mesh faces
- * @param FT: mesh layout faces
- * @return |F|x3 mask of corners opposite seam edges
- */
-Eigen::MatrixXi find_seams(
-    const Eigen::MatrixXi& F,
-    const Eigen::MatrixXi& FT);
-
 /**
  * @brief Given a mask of corners opposite edges, generate the corresponding edge geometry.
  * 
@@ -270,5 +258,4 @@ generate_edges(
     const Eigen::MatrixXi& F,
     const Eigen::MatrixXi& F_is_edge);
 
-} // namespace Feature
 } // namespace Penner

include/util/util/vf_mesh.h

@@ -146,4 +146,19 @@ std::tuple<Eigen::MatrixXd, Eigen::MatrixXi> reindex_mesh(
     const Eigen::MatrixXi& F,
     const std::vector<int>& vtx_reindex);
 
+/**
+ * @brief Find the seams of the parameterization of a closed mesh.
+ * 
+ * TODO: Extend to open meshes
+ * 
+ * @param F: mesh faces
+ * @param FT: mesh layout faces
+ * @return |F|x3 mask of corners opposite seam edges
+ */
+Eigen::MatrixXi find_seams(
+    const Eigen::MatrixXi& F,
+    const Eigen::MatrixXi& FT);
+
+
+
 } // namespace Penner

src/feature/CMakeLists.txt

@@ -6,7 +6,6 @@ set(FeatureCoreSrc
   core/union_meshes.cpp
   core/quads.cpp
   core/viewer.cpp
-  core/vf_corners.cpp
 )
 
 set(DirichletSrc

src/feature/core/io.cpp

@@ -1,6 +1,7 @@
 #include "feature/core/io.h"
 
-#include "feature/core/vf_corners.h"
+#include "util/vf_corners.h"
+#include "util/vf_mesh.h"
 
 #include <igl/remove_unreferenced.h>
 

src/feature/core/viewer.cpp

@@ -1,6 +1,6 @@
 #include "feature/core/viewer.h"
 
-#include "feature/core/vf_corners.h"
+#include "util/vf_corners.h"
 #include "feature/feature/error.h"
 #include "feature/feature/features.h"
 #include "feature/feature/gluing.h"