Added cones and field to output of scripts

Author: rjc8237

include/holonomy/holonomy/core/intrinsic_field.h

@@ -15,7 +15,7 @@ class IntrinsicNRosyField
         const std::vector<int>& vtx_reindex,
         const Eigen::MatrixXd& V);
 
-    Scalar min_angle = 1e-3;
+    Scalar min_angle = 0.;
 
 private:
     // Local frames
@@ -59,4 +59,4 @@ class IntrinsicNRosyField
 };
 
 } // namespace Holonomy
-} // namespace Penner
+} // namespace Penner

scripts/holonomy_overlay.py

@@ -25,29 +25,29 @@ def similarity_overlay_one(args, fname):
     output_dir = script_util.get_mesh_output_directory(args['output_dir'], m)
     os.makedirs(output_dir, exist_ok=True)
 
+    # Skip meshes that are already processed
+    try:
+        uv_mesh_path = os.path.join(output_dir, name + '_refined_with_uv.obj')
+        V, F = igl.read_triangle_mesh(uv_mesh_path)
+        if (len(V) > 0):
+            print("Skipping processed mesh")
+            return
+    except:
+        pass
+
     # Get logger
     log_path = os.path.join(output_dir, name+'_convert_to_vf.log')
     logger = script_util.get_logger(log_path)
     logger.info("Converting {} to vf".format(name))
 
     try:
         V, F = igl.read_triangle_mesh(os.path.join(args['input_dir'], fname))
+        Th_hat = np.loadtxt(os.path.join(output_dir, m + '_Th_hat'), dtype=float)
+        rotation_form = np.loadtxt(os.path.join(output_dir, m + '_kappa_hat'), dtype=float)
     except:
         logger.info("Could not open mesh data at {}", args['input_dir'])
         return
 
-    if args['fit_field']:
-        field_params = holonomy.FieldParameters()
-        field_params.min_angle = np.pi
-        rotation_form, Th_hat = holonomy.generate_intrinsic_rotation_form(V, F, field_params)
-    else:
-        try:
-            Th_hat = np.loadtxt(os.path.join(args['input_dir'], name + "_Th_hat"), dtype=float)
-            rotation_form = np.loadtxt(os.path.join(args['input_dir'], name + "_kappa_hat"), dtype=float)
-        except:
-            logger.info("Could not open rotation form")
-            return
-
     # Get final optimized lambdas
     try:
         metric_coords_path = os.path.join(output_dir, name + "_metric_coords")
@@ -95,11 +95,6 @@ def similarity_overlay_one(args, fname):
     refinement_mesh = opt.RefinementMesh(V_o, F_o, uv_o, FT_o, fn_to_f_o, endpoints_o)
     V_r, F_r, uv_r, FT_r, fn_to_f_r, endpoints_r = refinement_mesh.get_VF_mesh()
 
-    # Write combined refined mesh with uv
-    uv_mesh_path = os.path.join(output_dir, name + '_refined_with_uv.obj')
-    logger.info("Saving refined uv mesh at {}".format(uv_mesh_path))
-    opt.write_obj_with_uv(uv_mesh_path, V_r, F_r, uv_r, FT_r)
-
     # Save cut information
     simp_path = os.path.join(output_dir, name + '_is_cut_h')
     logger.info("Saving cut information at {}".format(simp_path))
@@ -137,6 +132,11 @@ def similarity_overlay_one(args, fname):
     logger.info("Saving endpoints at {}".format(endpoints_path))
     np.savetxt(endpoints_path, endpoints_o, fmt='%i')
 
+    # Write combined refined mesh with uv
+    uv_mesh_path = os.path.join(output_dir, name + '_refined_with_uv.obj')
+    logger.info("Saving refined uv mesh at {}".format(uv_mesh_path))
+    opt.write_obj_with_uv(uv_mesh_path, V_r, F_r, uv_r, FT_r)
+
 def similarity_overlay_many(args):
     script_util.run_many(similarity_overlay_one, args)
 

scripts/optimize_angles.py

@@ -35,6 +35,7 @@ def constrain_similarity_one(args, fname):
     except:
         pass
 
+    # get triangle mesh
     try:
         V, F = igl.read_triangle_mesh(os.path.join(args['input_dir'], fname))
         if (len(V) < 4):
@@ -44,7 +45,9 @@ def constrain_similarity_one(args, fname):
         logger.info("Could not open mesh data")
         return
 
+    # get precomputed form, or generate on the fly
     if args['fit_field']:
+        logger.info("Fitting cross field")
         field_params = holonomy.FieldParameters()
         field_params.min_angle = np.pi
         rotation_form, Th_hat = holonomy.generate_intrinsic_rotation_form(V, F, field_params)
@@ -56,6 +59,12 @@ def constrain_similarity_one(args, fname):
             logger.info("Could not open rotation form")
             return
 
+    # save form to output file
+    output_path = os.path.join(output_dir, name + '_Th_hat')
+    np.savetxt(output_path, Th_hat)
+    output_path = os.path.join(output_dir, name + '_kappa_hat')
+    np.savetxt(output_path, rotation_form)
+
     # Generate initial similarity metric
     free_cones = []
     marked_metric_params = holonomy.MarkedMetricParameters()

scripts/statistics.py

@@ -61,12 +61,13 @@ def run_statistics(args):
         m = fname[:dot_index]
         name = m
         models.append(m)
+        mesh_output_dir = script_util.get_mesh_output_directory(args['output_dir'], m)
 
         try:
             # Get mesh
             V, F = igl.read_triangle_mesh(os.path.join(args['input_dir'], fname))
-            Th_hat = np.loadtxt(os.path.join(args['input_dir'], m + "_Th_hat"), dtype=float)
-            rotation_form = np.loadtxt(os.path.join(args['input_dir'], m + "_kappa_hat"), dtype=float)
+            Th_hat = np.loadtxt(os.path.join(mesh_output_dir, m + '_Th_hat'), dtype=float)
+            rotation_form = np.loadtxt(os.path.join(mesh_output_dir, m + '_kappa_hat'), dtype=float)
 
             # Generate metric TODO use constructor
             free_cones = []
@@ -85,7 +86,6 @@ def run_statistics(args):
 
 
             # get final metric coordinates
-            mesh_output_dir = script_util.get_mesh_output_directory(args['output_dir'], m)
             metric_coords_path = os.path.join(mesh_output_dir, name + "_metric_coords")
             logger.info("Loading metric coordinates from {}".format(metric_coords_path))
             reduced_metric_coords = np.loadtxt(metric_coords_path)

src/holonomy/core/intrinsic_field.cpp

@@ -1037,7 +1037,7 @@ VectorX IntrinsicNRosyField::compute_rotation_form(const Mesh<Scalar>& m)
     std::queue<int> cones = {};
     for (int vi = 0; vi < num_vertices; ++vi)
     {
-        if (Th_hat[vi] < min_angle + 1e-6)
+        if (Th_hat[vi] < min_angle - 1e-6)
         {
             cones.push(vi);
         }
@@ -1046,7 +1046,7 @@ VectorX IntrinsicNRosyField::compute_rotation_form(const Mesh<Scalar>& m)
     {
         int vi = cones.front();
         cones.pop();
-        if (Th_hat[vi] > min_angle - 1e-6) continue;
+        if (Th_hat[vi] > min_angle + 1e-6) continue;
         spdlog::info("Fixing {} cone at {} in rotation form", Th_hat[vi], vi);
 
         // find largest cone angle near the cone vertex
@@ -1076,20 +1076,22 @@ VectorX IntrinsicNRosyField::compute_rotation_form(const Mesh<Scalar>& m)
             // modify the rotation form and resulting cone angles
             rotation_form[h_opt] -= (M_PI / 2.);
             rotation_form[m.opp[h_opt]] += M_PI / 2.;
-            rotation_form[m.R[h_opt]] += M_PI / 2.;
-            rotation_form[m.opp[m.R[h_opt]]] -= M_PI / 2.;
+            if (m.type[h_opt] != 0) {
+                rotation_form[m.R[h_opt]] += M_PI / 2.;
+                rotation_form[m.opp[m.R[h_opt]]] -= M_PI / 2.;
+            }
             Th_hat[vi] += M_PI / 2.;
             Th_hat[vj] -= M_PI / 2.;
 
             // check if candidate vertex is now a cone
-            if (Th_hat[vj] < min_angle + 1e-6) 
+            if (Th_hat[vj] < min_angle - 1e-6) 
             {
                 cones.push(vj);
             }
         }
 
         // check if vertex vi is still a cone
-        if (Th_hat[vi] < min_angle + 1e-6) 
+        if (Th_hat[vi] < min_angle - 1e-6) 
         {
             cones.push(vi);
         }
@@ -1191,4 +1193,4 @@ polyscope::show();
 }
 
 } // namespace Holonomy
-} // namespace Penner
+} // namespace Penner

src/holonomy/core/viewer.cpp

@@ -797,6 +797,7 @@ void view_vertex_function(
         spdlog::info("Viewing {} mesh with {} vertices", mesh_handle, num_vertices);
     }
     auto [V_double, F_mesh, F_halfedge] = generate_doubled_mesh(V, m, vtx_reindex);
+    if (num_vertices != vertex_function.size()) return;
 
 #ifdef ENABLE_VISUALIZATION
     spdlog::debug("Initializing mesh");
@@ -860,4 +861,4 @@ void view_independent_vertex_function(
 }
 
 } // namespace Holonomy
-} // namespace Penner
+} // namespace Penner

src/holonomy/holonomy/constraint.cpp

@@ -121,7 +121,7 @@ VectorX compute_vertex_constraint(
 {
     // Use all vertices
     std::vector<int> v_map = marked_metric.v_rep;
-    int n_v = n_v = marked_metric.n_ind_vertices();
+    int n_v = marked_metric.n_ind_vertices();
 
     // Build the constraint
     VectorX constraint = VectorX::Zero(n_v);
@@ -390,4 +390,4 @@ void compute_metric_constraint_with_jacobian(
 }
 
 } // namespace Holonomy
-} // namespace Penner
+} // namespace Penner