From ab0768be68de19326a34e2478238528cfbf41c14 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 10 Aug 2026 21:58:13 +0300
Subject: [PATCH] add new methods to Heightmap

---
 .../lua/usertypes/lua_type_heightmap.cpp      |  6 +++
 src/util/functional_util.hpp                  | 41 ++++++++-----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp b/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
index 9286467d3..df2af6106 100644
--- a/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
+++ b/src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
@@ -264,6 +264,12 @@ static std::unordered_map<std::string, lua_CFunction> methods {
     {"min", lua::wrap<l_binop_func<util::min>>},
     {"max", lua::wrap<l_binop_func<util::max>>},
     {"abs", lua::wrap<l_unaryop_func<util::abs>>},
+    {"floor", lua::wrap<l_unaryop_func<util::floor>>},
+    {"round", lua::wrap<l_unaryop_func<util::round>>},
+    {"ceil", lua::wrap<l_unaryop_func<util::ceil>>},
+    {"sin", lua::wrap<l_unaryop_func<util::sin>>},
+    {"cos", lua::wrap<l_unaryop_func<util::cos>>},
+    {"tan", lua::wrap<l_unaryop_func<util::tan>>},
     {"resize", lua::wrap<l_resize>},
     {"crop", lua::wrap<l_crop>},
     {"at", lua::wrap<l_at>},
diff --git a/src/util/functional_util.hpp b/src/util/functional_util.hpp
index 2672c4fcf..874cc6709 100644
--- a/src/util/functional_util.hpp
+++ b/src/util/functional_util.hpp
@@ -3,31 +3,26 @@
 #include <glm/glm.hpp>
 
 namespace util {
-    template<class T>
-    struct pow {
-        constexpr T operator()(T a, T b) const {
-            return glm::pow(a, b);
-        }
+    template<class T, T (*F)(T, T)>
+    struct binary_op {
+        constexpr T operator()(T a, T b) const { return F(a, b); }
     };
 
-    template<class T>
-    struct min {
-        constexpr T operator()(T a, T b) const {
-            return glm::min(a, b);
-        }
+    template<class T> using pow = binary_op<T, glm::pow>;
+    template<class T> using min = binary_op<T, glm::min>;
+    template<class T> using max = binary_op<T, glm::max>;
+
+
+    template<class T, T (*F)(T)>
+    struct unary_op {
+        constexpr T operator()(T a) const { return F(a); }
     };
 
-    template<class T>
-    struct max {
-        constexpr T operator()(T a, T b) const {
-            return glm::max(a, b);
-        }
-    };
-
-    template<class T>
-    struct abs {
-        constexpr T operator()(T a) const {
-            return glm::abs(a);
-        }
-    };
+    template<typename T> using abs = unary_op<T, glm::abs>;
+    template<typename T> using floor = unary_op<T, glm::floor>;
+    template<typename T> using round = unary_op<T, glm::round>;
+    template<typename T> using ceil = unary_op<T, glm::ceil>;
+    template<typename T> using sin = unary_op<T, glm::sin>;
+    template<typename T> using cos = unary_op<T, glm::cos>;
+    template<typename T> using tan = unary_op<T, glm::tan>;
 }