Add center positioning for caldera primitive (#51)

otto-link · Oct 29, 2023 · 091c56c · 091c56c
1 parent d50621c
commit 091c56c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/external/HighMap b/external/HighMap
diff --git a/include/hesiod/control_node.hpp b/include/hesiod/control_node.hpp
@@ -470,12 +470,13 @@ class Caldera : public Primitive
   void compute();
 
 protected:
-  float radius = 128.f;
-  float sigma_inner = 16.f;
-  float sigma_outer = 32.f;
-  float noise_r_amp = 32.f;
-  float z_bottom = 0.5f;
-  float noise_ratio_z = 0.1f;
+  float             radius = 128.f;
+  float             sigma_inner = 16.f;
+  float             sigma_outer = 32.f;
+  float             noise_r_amp = 32.f;
+  float             z_bottom = 0.5f;
+  float             noise_ratio_z = 0.1f;
+  hmap::Vec2<float> center = {0.5f, 0.5f};
 };
 
 class Clamp : public Unary

diff --git a/src/nodes/control_node/caldera.cpp b/src/nodes/control_node/caldera.cpp
@@ -41,11 +41,12 @@ void Caldera::compute()
                                     p_noise_x,
                                     this->noise_r_amp,
                                     this->noise_ratio_z,
+                                    this->center,
                                     shift,
                                     scale);
              });
 
-  // remap the output
+  this->value_out.smooth_overlap_buffers();
   this->value_out.remap(this->vmin, this->vmax);
 }
 

diff --git a/src/nodes/view_node/view_caldera.cpp b/src/nodes/view_node/view_caldera.cpp
@@ -42,6 +42,12 @@ bool ViewCaldera::render_settings()
   ImGui::SliderFloat("noise_ratio_z", &this->noise_ratio_z, 0.f, 1.f, "%.2f");
   has_changed |= this->trigger_update_after_edit();
 
+  ImGui::SliderFloat("center.x", &this->center.x, -0.5f, 1.5f, "%.2f");
+  has_changed |= this->trigger_update_after_edit();
+
+  ImGui::SliderFloat("center.y", &this->center.y, -0.5f, 1.5f, "%.2f");
+  has_changed |= this->trigger_update_after_edit();
+
   ImGui::Separator();
 
   if (hesiod::gui::slider_vmin_vmax(vmin, vmax))
@@ -62,6 +68,8 @@ void ViewCaldera::serialize_save(cereal::JSONOutputArchive &ar)
   ar(cereal::make_nvp("z_bottom", this->z_bottom));
   ar(cereal::make_nvp("noise_r_amp", this->noise_r_amp));
   ar(cereal::make_nvp("noise_ratio_z", this->noise_ratio_z));
+  ar(cereal::make_nvp("center.x", this->center.x));
+  ar(cereal::make_nvp("cneter.y", this->center.y));
   ar(cereal::make_nvp("vmin", this->vmin));
   ar(cereal::make_nvp("vmax", this->vmax));
 }
@@ -74,6 +82,8 @@ void ViewCaldera::serialize_load(cereal::JSONInputArchive &ar)
   ar(cereal::make_nvp("z_bottom", this->z_bottom));
   ar(cereal::make_nvp("noise_r_amp", this->noise_r_amp));
   ar(cereal::make_nvp("noise_ratio_z", this->noise_ratio_z));
+  ar(cereal::make_nvp("center.x", this->center.x));
+  ar(cereal::make_nvp("cneter.y", this->center.y));
   ar(cereal::make_nvp("vmin", this->vmin));
   ar(cereal::make_nvp("vmax", this->vmax));
 }