upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 10:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

WFL/Lua: Add lerp and clamp functions

Browse Source
This commit is contained in:
Celtic Minstrel 2021-07-19 13:42:36 -04:00 committed by Celtic Minstrel
parent 3de79c15fb
commit 5f450542f5
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/lua/core/mathx.lua
View File

@ -95,4 +95,12 @@ function mathx.shuffle(t, random_func)
end
end
function mathx.lerp(lo, hi, alpha)
return lo + alpha * (hi - lo)
end
function mathx.clamp(val, lo, hi)
return math.min(hi, math.max(lo, val))
end
wesnoth.random = wesnoth.deprecate_api('wesnoth.random', 'mathx.random', 1, nil, mathx.random)

21
src/formula/function.cpp
View File

@ -688,6 +688,25 @@ DEFINE_WFL_FUNCTION(wave, 1, 1)
return variant(static_cast<int>(std::sin(angle) * 1000.0));
}
DEFINE_WFL_FUNCTION(lerp, 3, 3)
{
const double lo = args()[0]->evaluate(variables, add_debug_info(fdb, 0, "lerp:lo")).as_decimal() / 1000.0;
const double hi = args()[1]->evaluate(variables, add_debug_info(fdb, 1, "lerp:hi")).as_decimal() / 1000.0;;
const double alpha = args()[2]->evaluate(variables, add_debug_info(fdb, 2, "lerp:alpha")).as_decimal() / 1000.0;;
return variant(static_cast<int>((lo + alpha * (hi - lo)) * 1000.0), variant::DECIMAL_VARIANT);
}
DEFINE_WFL_FUNCTION(clamp, 3, 3)
{
const variant val = args()[0]->evaluate(variables, add_debug_info(fdb, 0, "clamp:value"));
const variant lo = args()[1]->evaluate(variables, add_debug_info(fdb, 1, "clamp:lo"));
const variant hi = args()[2]->evaluate(variables, add_debug_info(fdb, 2, "clamp:hi"));
if(val.is_int() && lo.is_int() && hi.is_int()) {
return variant(std::clamp<int>(val.as_int(), lo.as_int(), hi.as_int()));
}
return variant(static_cast<int>(std::clamp<int>(val.as_decimal(), lo.as_decimal(), hi.as_decimal())), variant::DECIMAL_VARIANT);
}
namespace
{
class variant_comparator : public formula_callable
@ -1541,6 +1560,8 @@ std::shared_ptr<function_symbol_table> function_symbol_table::get_builtins()
DECLARE_WFL_FUNCTION(pi);
DECLARE_WFL_FUNCTION(hypot);
DECLARE_WFL_FUNCTION(type);
DECLARE_WFL_FUNCTION(lerp);
DECLARE_WFL_FUNCTION(clamp);
}
return std::shared_ptr<function_symbol_table>(&functions_table, [](function_symbol_table*) {});