Hartmut/pixwerx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:seichter/pixwerx

Browse source
This commit is contained in:
Hartmut Seichter 2019-01-16 15:43:03 +01:00
commit 53b86a9608
11 changed files with 205 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/scripting/src/script_system.cpp
View file

@ -11,6 +11,7 @@
namespace pw {
#if defined(__clang)
struct window_lua : public window {
// overridable function
sol::function lua_update;
@ -23,19 +24,21 @@ struct window_lua : public window {
_on_update = [this](window&){this->lua_update();};
}
};
#endif
void script_system::load(sol::table &ns)
{
ns.new_usertype<window>("window",
// sol::constructors<window_lua(sol::this_state)>(),
// "on_update",&window_lua::lua_update,
"update",&window::update,
"title",sol::writeonly_property(&window::set_title),
"size",sol::property(&window::size,&window::set_size),
"position",sol::property(&window::position,&window::set_position),
"fullscreen",sol::property(&window::fullscreen,&window::set_fullscreen)
);
"update",&window::update,
"title",sol::writeonly_property(&window::set_title),
"size",sol::property(&window::size,&window::set_size),
"position",sol::property(&window::position,&window::set_position),
"fullscreen",sol::property(&window::fullscreen,&window::set_fullscreen)
);
ns.new_usertype<input>("input",
"new", sol::no_constructor,