From 32f59c16aa422608fb95cb576f3142100109e2e5 Mon Sep 17 00:00:00 2001
From: Kuyondo <Kindi@DESKTOP-7D8MM3O>
Date: Mon, 2 Jun 2025 01:10:55 +0800
Subject: [PATCH] move some util to lua

---
 components/CMakeLists.txt      |  1 +
 components/lua/util.lua        | 21 +++++++++++++++++++++
 components/lua/utilpackage.cpp | 12 +++++-------
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 components/lua/util.lua

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index aa6c8763bb..69c7ba462e 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -61,6 +61,7 @@ add_component_dir (lua
     luastate scriptscontainer asyncpackage utilpackage serialization configuration l10n storage utf8
     shapes/box inputactions yamlloader scripttracker luastateptr
     )
+copy_resource_file("lua/util.lua" "${OPENMW_RESOURCES_ROOT}" "resources/lua_libs/util.lua")
 
 add_component_dir (l10n
     messagebundles manager
diff --git a/components/lua/util.lua b/components/lua/util.lua
new file mode 100644
index 0000000000..10b2a46418
--- /dev/null
+++ b/components/lua/util.lua
@@ -0,0 +1,21 @@
+
+local M = {}
+
+function M.remap(value, min, max, newMin, newMax)
+    return newMin + (value - min) * (newMax - newMin) / (max - min)
+end
+
+function M.round(value)
+    return value >= 0 and math.floor(value + 0.5) or math.ceil(value - 0.5)
+end
+
+function M.clamp(value, low, high)
+    return value < low and low or (value > high and high or value)
+end
+
+function M.normalizeAngle(angle)
+    local fullTurns = angle / (2 * math.pi) + 0.5
+    return (fullTurns - math.floor(fullTurns) - 0.5) * (2 * math.pi)
+end
+
+return M
\ No newline at end of file
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 85492ccf06..2b706e1cb8 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -352,16 +352,14 @@ namespace LuaUtil
             return std::make_tuple(angles.z(), angles.y(), angles.x());
         };
 
+        sol::function luaUtilLoader = lua["loadInternalLib"]("util");
+        sol::table utils = luaUtilLoader();
+        for (const auto& [key, value] : utils)
+            util[key.as<std::string>()] = value;
+
         // Utility functions
-        util["clamp"] = [](double value, double from, double to) { return std::clamp(value, from, to); };
-        // NOTE: `util["clamp"] = std::clamp<float>` causes error 'AddressSanitizer: stack-use-after-scope'
-        util["normalizeAngle"] = &Misc::normalizeAngle;
         util["makeReadOnly"] = [](const sol::table& tbl) { return makeReadOnly(tbl, /*strictIndex=*/false); };
         util["makeStrictReadOnly"] = [](const sol::table& tbl) { return makeReadOnly(tbl, /*strictIndex=*/true); };
-        util["remap"] = [](double value, double min, double max, double newMin, double newMax) {
-            return newMin + (value - min) * (newMax - newMin) / (max - min);
-        };
-        util["round"] = [](double value) { return round(value); };
 
         if (lua["bit32"] != sol::nil)
         {