Make remapping optional for base elevation node (#50)

otto-link · Oct 26, 2023 · 7f7834c · 7f7834c
1 parent 76179ac
commit 7f7834c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/include/hesiod/control_node.hpp b/include/hesiod/control_node.hpp
@@ -333,6 +333,7 @@ class BaseElevation : public Primitive
                                             {0.f, 0.f, 0.f},
                                             {0.f, 0.f, 0.f}};
   float                           width_factor = 1.f;
+  bool                            remap = false;
 };
 
 class BezierPath : public gnode::Node

diff --git a/src/main.cpp b/src/main.cpp
@@ -51,10 +51,10 @@ int main()
 
   tree.add_view_node("FbmPerlin");
   // tree.add_view_node("ZeroedEdges");
-  tree.add_view_node("Plateau");
+  // tree.add_view_node("Plateau");
   // tree.add_view_node("Path");
   // tree.add_view_node("PathToHeightmap");
-  tree.new_link("FbmPerlin##0", "output", "Plateau##1", "input");
+  // tree.new_link("FbmPerlin##0", "output", "Plateau##1", "input");
   // tree.new_link("Path##1", "output", "PathToHeightmap##2", "path");
 
   // hmap::Cloud cloud = hmap::Cloud(5, 2);

diff --git a/src/nodes/control_node/base_elevation.cpp b/src/nodes/control_node/base_elevation.cpp
@@ -44,7 +44,8 @@ void BaseElevation::compute()
              });
 
   // remap the output
-  this->value_out.remap(this->vmin, this->vmax);
+  if (this->remap)
+    this->value_out.remap(this->vmin, this->vmax);
 }
 
 } // namespace hesiod::cnode
diff --git a/src/nodes/view_node/view_base_elevation.cpp b/src/nodes/view_node/view_base_elevation.cpp
@@ -38,13 +38,15 @@ bool ViewBaseElevation::render_settings()
     has_changed = true;
   }
 
-  ImGui::Separator();
+  ImGui::Checkbox("remap", &this->remap);
+  has_changed |= this->trigger_update_after_edit();
 
-  if (hesiod::gui::slider_vmin_vmax(vmin, vmax))
-  {
-    this->force_update();
-    has_changed = true;
-  }
+  if (this->remap)
+    if (hesiod::gui::slider_vmin_vmax(vmin, vmax))
+    {
+      this->force_update();
+      has_changed = true;
+    }
 
   has_changed |= this->render_settings_footer();
 
@@ -55,12 +57,18 @@ void ViewBaseElevation::serialize_save(cereal::JSONOutputArchive &ar)
 {
   ar(cereal::make_nvp("values", this->values));
   ar(cereal::make_nvp("width_factor", this->width_factor));
+  ar(cereal::make_nvp("remap", this->remap));
+  ar(cereal::make_nvp("vmin", this->vmin));
+  ar(cereal::make_nvp("vmax", this->vmax));
 }
 
 void ViewBaseElevation::serialize_load(cereal::JSONInputArchive &ar)
 {
   ar(cereal::make_nvp("values", this->values));
   ar(cereal::make_nvp("width_factor", this->width_factor));
+  ar(cereal::make_nvp("remap", this->remap));
+  ar(cereal::make_nvp("vmin", this->vmin));
+  ar(cereal::make_nvp("vmax", this->vmax));
 }
 
 } // namespace hesiod::vnode