Update node transform

Author: otto-link

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

@@ -3,6 +3,7 @@
  * this software. */
 
 #include "highmap/filters.hpp"
+#include "highmap/range.hpp"
 #include "highmap/heightmap.hpp"
 
 #include "attributes.hpp"
@@ -41,25 +42,24 @@ void compute_gamma_correction_node(BaseNode *p_node)
     hmap::Heightmap *p_mask = p_node->get_value_ref<hmap::Heightmap>("mask");
     hmap::Heightmap *p_out = p_node->get_value_ref<hmap::Heightmap>("output");
 
-    *p_out = *p_in;
-
-    float hmin = p_out->min();
-    float hmax = p_out->max();
-
-    p_out->remap(0.f, 1.f, hmin, hmax);
+    float hmin = p_in->min();
+    float hmax = p_in->max();
 
     hmap::transform(
-        {p_out, p_mask},
-        [p_node](std::vector<hmap::Array *> p_arrays)
+        {p_out, p_in, p_mask},
+        [p_node, hmin, hmax](std::vector<hmap::Array *> p_arrays)
         {
           hmap::Array *pa_out = p_arrays[0];
-          hmap::Array *pa_mask = p_arrays[1];
+          hmap::Array *pa_in = p_arrays[1];
+          hmap::Array *pa_mask = p_arrays[2];
 
+          *pa_out = *pa_in;
+
+          hmap::remap(*pa_out, 0.f, 1.f, hmin, hmax);
           hmap::gamma_correction(*pa_out, GET("gamma", FloatAttribute), pa_mask);
+          hmap::remap(*pa_out, hmin, hmax, 0.f, 1.f);
         },
         p_node->get_config_ref()->hmap_transform_mode_cpu);
-
-    p_out->remap(hmin, hmax, 0.f, 1.f);
   }
 
   Q_EMIT p_node->compute_finished(p_node->get_id());

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

@@ -60,45 +60,36 @@ void compute_paraboloid_node(BaseNode *p_node)
   hmap::Heightmap *p_env = p_node->get_value_ref<hmap::Heightmap>("envelope");
   hmap::Heightmap *p_out = p_node->get_value_ref<hmap::Heightmap>("output");
 
-  hmap::fill(*p_out,
-             p_dx,
-             p_dy,
-             [p_node](hmap::Vec2<int>   shape,
-                      hmap::Vec4<float> bbox,
-                      hmap::Array      *p_noise_x,
-                      hmap::Array      *p_noise_y)
-             {
-               return hmap::paraboloid(shape,
-                                       GET("angle", FloatAttribute),
-                                       GET("a", FloatAttribute),
-                                       GET("b", FloatAttribute),
-                                       GET("v0", FloatAttribute),
-                                       GET("reverse_x", BoolAttribute),
-                                       GET("reverse_y", BoolAttribute),
-                                       p_noise_x,
-                                       p_noise_y,
-                                       nullptr,
-                                       GET("center", Vec2FloatAttribute),
-                                       bbox);
-             });
-
-  // add envelope
-  if (p_env)
-  {
-    float hmin = p_out->min();
-    hmap::transform(*p_out,
-                    *p_env,
-                    [&hmin](hmap::Array &a, hmap::Array &b)
-                    {
-                      a -= hmin;
-                      a *= b;
-                    });
-  }
+  hmap::transform(
+      {p_out, p_dx, p_dy},
+      [p_node](std::vector<hmap::Array *> p_arrays,
+               hmap::Vec2<int>            shape,
+               hmap::Vec4<float>          bbox)
+      {
+        hmap::Array *pa_out = p_arrays[0];
+        hmap::Array *pa_dx = p_arrays[1];
+        hmap::Array *pa_dy = p_arrays[2];
+
+        *pa_out = hmap::paraboloid(shape,
+                                   GET("angle", FloatAttribute),
+                                   GET("a", FloatAttribute),
+                                   GET("b", FloatAttribute),
+                                   GET("v0", FloatAttribute),
+                                   GET("reverse_x", BoolAttribute),
+                                   GET("reverse_y", BoolAttribute),
+                                   pa_dx,
+                                   pa_dy,
+                                   nullptr,
+                                   GET("center", Vec2FloatAttribute),
+                                   bbox);
+      },
+      p_node->get_config_ref()->hmap_transform_mode_cpu);
 
   // post-process
+  post_apply_enveloppe(p_node, *p_out, p_env);
+
   post_process_heightmap(p_node,
                          *p_out,
-
                          GET("inverse", BoolAttribute),
                          false, // smooth
                          0,

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

@@ -3,6 +3,7 @@
  * this software. */
 #include "highmap/filters.hpp"
 #include "highmap/operator.hpp"
+#include "highmap/range.hpp"
 
 #include "attributes.hpp"
 
@@ -43,26 +44,30 @@ void compute_recurve_node(BaseNode *p_node)
     hmap::Heightmap *p_mask = p_node->get_value_ref<hmap::Heightmap>("mask");
     hmap::Heightmap *p_out = p_node->get_value_ref<hmap::Heightmap>("output");
 
-    // copy the input heightmap
-    *p_out = *p_in;
-
     if (GET("values", VecFloatAttribute).size() >= 3)
     {
-      float hmin = p_out->min();
-      float hmax = p_out->max();
-
-      p_out->remap(0.f, 1.f, hmin, hmax);
+      float hmin = p_in->min();
+      float hmax = p_in->max();
 
       std::vector<float> t = hmap::linspace(0.f,
                                             1.f,
                                             GET("values", VecFloatAttribute).size());
 
-      hmap::transform(*p_out,
-                      p_mask,
-                      [p_node, t](hmap::Array &x, hmap::Array *p_mask)
-                      { hmap::recurve(x, t, GET("values", VecFloatAttribute), p_mask); });
-
-      p_out->remap(hmin, hmax, 0.f, 1.f);
+      hmap::transform(
+          {p_out, p_in, p_mask},
+          [p_node, t, hmin, hmax](std::vector<hmap::Array *> p_arrays)
+          {
+            hmap::Array *pa_out = p_arrays[0];
+            hmap::Array *pa_in = p_arrays[1];
+            hmap::Array *pa_mask = p_arrays[2];
+
+            *pa_out = *pa_in;
+
+            hmap::remap(*pa_out, 0.f, 1.f, hmin, hmax);
+            hmap::recurve(*pa_out, t, GET("values", VecFloatAttribute), pa_mask);
+            hmap::remap(*pa_out, hmin, hmax, 0.f, 1.f);
+          },
+          p_node->get_config_ref()->hmap_transform_mode_cpu);
     }
     else
     {

external/HighMap

@@ -0,0 +1,7 @@
+#!/bin/bash
+echo "- uncrustify"
+
+for F in `find Hesiod/include/. -type f -iname \*.hpp`; do
+    echo ${F}
+    uncrustify -c scripts/uncrustify_config.cfg --replace ${F} --no-backup -q
+done

scripts/format_doxygen.sh

@@ -5,14 +5,6 @@ echo "- json"
 jq . Hesiod/data/node_documentation.json --indent 4 > tmp.json
 mv tmp.json Hesiod/data/node_documentation.json
 
-echo "- uncrustify"
-
-for F in `find Hesiod/include/. -type f -iname \*.hpp`; do
-    echo ${F}
-    uncrustify -c scripts/uncrustify_config.cfg --replace ${F} --no-backup -q
-done
-
-
 # directories to be formatted (recursive search)
 DIRS="Hesiod/include Hesiod/src Hesiod/app"
 # FORMAT_CMD="clang-format --style=LLVM -i {}"