Added none colormap option

geometryprocessing · Aug 30, 2024 · ebd220b · ebd220b
1 parent 201db0b
commit ebd220b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/py/optimize_impl/energies.py b/py/optimize_impl/energies.py
@@ -250,6 +250,8 @@ def get_vertex_energy(
     uv_embed[:,:2] = uv[:,:2]
 
     # Get energy
+    if (colormap == 'none'):
+        energy = 0.25 * np.ones(len(v))
     if (colormap == 'scale_factors'):
         energy = best_fit_conformal_vf(v, f, uv_embed, fuv)
     if (colormap == 'sym_dirichlet'):
@@ -293,6 +295,8 @@ def get_face_energy(
         energy = arap_vf(v, f, uv_embed, fuv)
     if (colormap == 'quadratic_sym_dirichlet'):
         energy = quadratic_sym_dirichlet_vf(v, f, uv_embed, fuv)
+    if (colormap == 'none'):
+        energy = 0.25 * np.ones(len(f))
 
     # Optionally use face weighting
     if (use_face_weight):

diff --git a/scripts/optimization_scripts/pipeline.py b/scripts/optimization_scripts/pipeline.py
@@ -1,6 +1,6 @@
 import os, sys
 script_dir = os.path.dirname(__file__)
-module_dir = os.path.join(script_dir, '..', 'py')
+module_dir = os.path.join(script_dir, '..', '..', 'py')
 sys.path.append(module_dir)
 
 import numpy as np
@@ -100,4 +100,4 @@
             args = script_util.overwrite_args(args_default, args_spec)
 
             # Run method
-            method_func(args)
+            method_func(args)