Merge branch 'MihailRis:main' into main

This commit is contained in:
Astazium 2026-09-03 19:58:23 +03:00 • committed by GitHub
commit acb1f084f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 69 additions and 47 deletions

View file

@ -91,6 +91,12 @@ static int l_get_mouse_delta(lua::State* L) {
return lua::pushvec2(L, engine->getInput().getCursor().delta);
}
static int l_get_mouse_scroll(lua::State* L) {
if (engine->isHeadless())
return 0;
return lua::pushinteger(L, engine->getInput().getScroll());
}
static int l_get_bindings(lua::State* L) {
if (engine->isHeadless())
return 0;
@ -181,6 +187,7 @@ const luaL_Reg inputlib[] = {
{"add_callback", lua::wrap<l_add_callback>},
{"get_mouse_pos", lua::wrap<l_get_mouse_pos>},
{"get_mouse_delta", lua::wrap<l_get_mouse_delta>},
{"get_mouse_scroll", lua::wrap<l_get_mouse_scroll>},
{"get_bindings", lua::wrap<l_get_bindings>},
{"get_binding_text", lua::wrap<l_get_binding_text>},
{"is_active", lua::wrap<l_is_active>},

View file

@ -323,7 +323,7 @@ namespace lua {
if (found == usertypeNames.end()) {
log_error(
"usertype is not registred: " + std::string(typeid(T).name())
"usertype is not registered: " + std::string(typeid(T).name())
);
} else if (getglobal(L, found->second)) {
setmetatable(L);