mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 19:36:40 +00:00
Code Issues Releases Wiki Activity

Enable openmw.input in menu scripts

Browse source
This commit is contained in:
Petr Mikheev 2023-10-31 10:22:58 +01:00
parent 1dd7a15255
commit 889ddc10d6
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwlua/inputbindings.cpp
View file

@ -24,6 +24,12 @@ namespace MWLua
sol::table initInputPackage(const Context& context) sol::table initInputPackage(const Context& context)
{ {
{
sol::state_view& lua = context.mLua->sol();
if (lua["openmw_input"] != sol::nil)
return lua["openmw_input"];
}
sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent"); sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) { keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) {
if (e.sym > 0 && e.sym <= 255) if (e.sym > 0 && e.sym <= 255)
@ -291,7 +297,9 @@ namespace MWLua
{ "Tab", SDL_SCANCODE_TAB }, { "Tab", SDL_SCANCODE_TAB },
})); }));
return LuaUtil::makeReadOnly(api); sol::state_view& lua = context.mLua->sol();
lua["openmw_input"] = LuaUtil::makeReadOnly(api);
return lua["openmw_input"];
} }
} }

10
apps/openmw/mwlua/luabindings.cpp
View file

@ -76,13 +76,11 @@ namespace MWLua
std::map<std::string, sol::object> initMenuPackages(const Context& context) std::map<std::string, sol::object> initMenuPackages(const Context& context)
{ {
return { return {
{ "openmw.core", initCorePackageForMenuScripts(context) }, // { "openmw.core", initCorePackageForMenuScripts(context) },
{ "openmw.ambient", initAmbientPackage(context) }, // { "openmw.ambient", initAmbientPackage(context) },
{ "openmw.ui", initUserInterfacePackage(context) }, // { "openmw.ui", initUserInterfacePackage(context) },
{ "openmw.menu", initMenuPackage(context) }, { "openmw.menu", initMenuPackage(context) },
// TODO: Maybe add: { "openmw.input", initInputPackage(context) },
// { "openmw.input", initInputPackage(context) },
// { "openmw.postprocessing", initPostprocessingPackage(context) },
}; };
} }
} }

1
files/data/scripts/omw/console/menu.lua
View file

@ -50,6 +50,7 @@ local env = {
ambient = require('openmw.ambient'), ambient = require('openmw.ambient'),
async = require('openmw.async'), async = require('openmw.async'),
ui = require('openmw.ui'), ui = require('openmw.ui'),
input = require('openmw.input'),
aux_util = require('openmw_aux.util'), aux_util = require('openmw_aux.util'),
view = require('openmw_aux.util').deepToString, view = require('openmw_aux.util').deepToString,
print = printToConsole, print = printToConsole,