Add alpha input for ColorizeSolid (#524)

Author: otto-link

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

@@ -14,32 +14,64 @@ using namespace attr;
 namespace hesiod
 {
 
+// -----------------------------------------------------------------------------
+// Ports & Attributes
+// -----------------------------------------------------------------------------
+
+constexpr const char *P_ALPHA = "alpha";
+constexpr const char *P_TEXTURE = "texture";
+
+constexpr const char *A_COLOR = "color";
+constexpr const char *A_ALPHA = "alpha";
+
+// -----------------------------------------------------------------------------
+// Setup
+// -----------------------------------------------------------------------------
+
 void setup_colorize_solid_node(BaseNode &node)
 {
   Logger::log()->trace("setup node {}", node.get_label());
 
   // port(s)
-  node.add_port<hmap::VirtualTexture>(gnode::PortType::OUT, "texture", CONFIG_TEX(node));
+  node.add_port<hmap::VirtualArray>(gnode::PortType::IN, P_ALPHA);
+  node.add_port<hmap::VirtualTexture>(gnode::PortType::OUT, P_TEXTURE, CONFIG_TEX(node));
 
   // attribute(s)
-  node.add_attr<ColorAttribute>("color", "color", 0.5f, 0.5f, 0.5f, 1.f);
-  node.add_attr<FloatAttribute>("alpha", "alpha", 1.f, 0.f, 1.f);
+  node.add_attr<ColorAttribute>(A_COLOR, "Solid Color", 0.f, 1.f, 0.f, 1.f);
+  node.add_attr<FloatAttribute>(A_ALPHA, "Transparency", 1.f, 0.f, 1.f);
 
   // attribute(s) order
-  node.set_attr_ordered_key({"color", "alpha"});
+  node.set_attr_ordered_key({A_COLOR, A_ALPHA});
 }
 
+// -----------------------------------------------------------------------------
+// Compute
+// -----------------------------------------------------------------------------
+
 void compute_colorize_solid_node(BaseNode &node)
 {
   Logger::log()->trace("computing node [{}]/[{}]", node.get_label(), node.get_id());
 
-  hmap::VirtualTexture *p_tex = node.get_value_ref<hmap::VirtualTexture>("texture");
-  std::vector<float>    col3 = node.get_attr<ColorAttribute>("color");
+  auto *p_alpha = node.get_value_ref<hmap::VirtualArray>(P_ALPHA);
+  auto *p_texture = node.get_value_ref<hmap::VirtualTexture>(P_TEXTURE);
+
+  const std::vector<float> color = node.get_attr<ColorAttribute>(A_COLOR);
+  const float              alpha = node.get_attr<FloatAttribute>(A_ALPHA);
 
   for (int nch = 0; nch < 4; ++nch)
   {
-    float v = nch < 3 ? col3[nch] : node.get_attr<FloatAttribute>("alpha");
-    p_tex->fill(nch, v, node.cfg().cm_cpu);
+    if (nch < 3)
+    {
+      p_texture->fill(nch, color[nch], node.cfg().cm_cpu);
+    }
+    else
+    {
+      // use alpha input port if available
+      if (p_alpha)
+        hmap::copy_data(*p_alpha, p_texture->channel(nch), node.cfg().cm_cpu);
+      else
+        p_texture->fill(nch, alpha, node.cfg().cm_cpu);
+    }
   }
 }
 

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

@@ -2,14 +2,11 @@
  * Public License. The full license is in the file LICENSE, distributed with
  * this software. */
 #include "highmap/hydrology.hpp"
-#include "highmap/primitives.hpp"
-#include "highmap/range.hpp"
 
 #include "attributes.hpp"
 
 #include "hesiod/logger.hpp"
 #include "hesiod/model/nodes/base_node.hpp"
-#include "hesiod/model/nodes/post_process.hpp"
 
 using namespace attr;
 

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

@@ -2,14 +2,12 @@
  * Public License. The full license is in the file LICENSE, distributed with
  * this software. */
 #include "highmap/hydrology.hpp"
-#include "highmap/primitives.hpp"
 #include "highmap/range.hpp"
 
 #include "attributes.hpp"
 
 #include "hesiod/logger.hpp"
 #include "hesiod/model/nodes/base_node.hpp"
-#include "hesiod/model/nodes/post_process.hpp"
 
 using namespace attr;