Add remove geometric loops option for PathFractalize node

Author: otto-link

Hesiod/src/model/nodes/nodes_function/path_fractalize.cpp

@@ -14,46 +14,99 @@ using namespace attr;
 namespace hesiod
 {
 
+// -----------------------------------------------------------------------------
+// Ports & Attributes
+// -----------------------------------------------------------------------------
+
+constexpr const char *P_INPUT = "input";
+constexpr const char *P_OUTPUT = "output";
+
+constexpr const char *A_ITERATIONS = "iterations";
+constexpr const char *A_SEED = "seed";
+constexpr const char *A_SIGMA = "sigma";
+constexpr const char *A_ORIENTATION = "orientation";
+constexpr const char *A_PERSISTENCE = "persistence";
+constexpr const char *A_REMOVE_LOOPS = "remove_loops";
+
+// -----------------------------------------------------------------------------
+// Setup
+// -----------------------------------------------------------------------------
+
 void setup_path_fractalize_node(BaseNode &node)
 {
   Logger::log()->trace("setup node {}", node.get_label());
 
   // port(s)
-  node.add_port<hmap::Path>(gnode::PortType::IN, "input");
-  node.add_port<hmap::Path>(gnode::PortType::OUT, "output");
+  node.add_port<hmap::Path>(gnode::PortType::IN, P_INPUT);
+  node.add_port<hmap::Path>(gnode::PortType::OUT, P_OUTPUT);
 
   // attribute(s)
-  node.add_attr<IntAttribute>("iterations", "iterations", 4, 1, 10);
-  node.add_attr<SeedAttribute>("seed", "Seed");
-  node.add_attr<FloatAttribute>("sigma", "sigma", 0.3f, 0.f, 1.f);
-  node.add_attr<IntAttribute>("orientation", "orientation", 0, 0, 1);
-  node.add_attr<FloatAttribute>("persistence", "Persistence", 1.f, 0.01f, 4.f);
+  node.add_attr<IntAttribute>(A_ITERATIONS, "Iterations", 4, 1, 10);
+  node.add_attr<SeedAttribute>(A_SEED, "Random Seed");
+  node.add_attr<FloatAttribute>(A_SIGMA, "Sigma", 0.3f, 0.f, 1.f);
+  node.add_attr<IntAttribute>(A_ORIENTATION, "Orientation", 0, 0, 1);
+  node.add_attr<FloatAttribute>(A_PERSISTENCE, "Persistence", 1.f, 0.01f, 4.f);
+  node.add_attr<BoolAttribute>(A_REMOVE_LOOPS, "Remove Geometric Loops", false);
 
   // attribute(s) order
-  node.set_attr_ordered_key(
-      {"iterations", "seed", "sigma", "orientation", "persistence"});
+  node.set_attr_ordered_key({"_GROUPBOX_BEGIN_Fractal Parameters",
+                             A_ITERATIONS,
+                             A_SEED,
+                             A_SIGMA,
+                             A_ORIENTATION,
+                             A_PERSISTENCE,
+                             A_REMOVE_LOOPS,
+                             "_GROUPBOX_END_"});
 }
 
+// -----------------------------------------------------------------------------
+// Compute
+// -----------------------------------------------------------------------------
+
 void compute_path_fractalize_node(BaseNode &node)
 {
   Logger::log()->trace("computing node [{}]/[{}]", node.get_label(), node.get_id());
 
-  hmap::Path *p_in = node.get_value_ref<hmap::Path>("input");
+  hmap::Path *p_in = node.get_value_ref<hmap::Path>(P_INPUT);
+  hmap::Path *p_out = node.get_value_ref<hmap::Path>(P_OUTPUT);
+
+  if (!p_in || p_in->get_npoints() < 2)
+    return;
 
-  if (p_in)
+  // --- Parameters wrapper
+
+  const auto params = [&node]()
   {
-    hmap::Path *p_out = node.get_value_ref<hmap::Path>("output");
-
-    // copy the input heightmap
-    *p_out = *p_in;
-
-    if (p_in->get_npoints() > 1)
-      p_out->fractalize(node.get_attr<IntAttribute>("iterations"),
-                        node.get_attr<SeedAttribute>("seed"),
-                        node.get_attr<FloatAttribute>("sigma"),
-                        node.get_attr<IntAttribute>("orientation"),
-                        node.get_attr<FloatAttribute>("persistence"));
-  }
+    struct P
+    {
+      int   iterations;
+      uint  seed;
+      float sigma;
+      int   orientation;
+      float persistence;
+      bool  remove_loops;
+    };
+
+    return P{.iterations = node.get_attr<IntAttribute>(A_ITERATIONS),
+             .seed = node.get_attr<SeedAttribute>(A_SEED),
+             .sigma = node.get_attr<FloatAttribute>(A_SIGMA),
+             .orientation = node.get_attr<IntAttribute>(A_ORIENTATION),
+             .persistence = node.get_attr<FloatAttribute>(A_PERSISTENCE),
+             .remove_loops = node.get_attr<BoolAttribute>(A_REMOVE_LOOPS)};
+  }();
+
+  // --- Apply fractalize
+
+  *p_out = *p_in;
+
+  p_out->fractalize(params.iterations,
+                    params.seed,
+                    params.sigma,
+                    params.orientation,
+                    params.persistence);
+
+  if (params.remove_loops)
+    *p_out = hmap::remove_geometric_loops(*p_out);
 }
 
 } // namespace hesiod