diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2020-05-09 09:40:59 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2020-05-09 09:40:59 -0400 |
| commit | f461087223a80cd06619517e355690654f406d63 (patch) | |
| tree | a5f5d573bec36f63284438c72157699f3a8fed98 /src/script.cpp | |
| parent | 1c52ee2e02bc3c09e7cac3b20c81c910b7151144 (diff) | |
| parent | 3fb5e6b1eca24e536f8ab1130a7e4bd9c418fa41 (diff) | |
Merge branch 'audio'
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/script.cpp b/src/script.cpp index 0f940d3..9fae1c9 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -75,6 +75,7 @@ void ScriptSystem::doFile(void) /******************** * SCRIPT PARSING * ********************/ +#include <components/Audio.hpp> #include <components/EventListener.hpp> #include <components/Position.hpp> #include <components/Player.hpp> @@ -121,6 +122,10 @@ void ScriptSystem::scriptExport(void) sol::constructors<Physics(void), Physics()>(), "standing", &Physics::standing); + lua.new_usertype<Audio>("Audio", + sol::constructors<Audio(std::string)>(), + "file", &Audio::fileName); + lua.new_usertype<World>("World", sol::constructors<World(sol::object), World(void)>(), "Generate", &World::generate, @@ -168,6 +173,11 @@ sol::table ScriptSystem::spawn(sol::object param) e.assign<Name>(Name().FromLua(tab["Name"])).get(); } + if (tab["Audio"] != nullptr) { + (*toRet)["Audio"] = + e.assign<Audio>(Audio().FromLua(tab["Audio"])).get(); + } + if (tab["Render"] != nullptr) { if (!e.has_component<Position>()) // Position must exist for render (*toRet)["Position"] = e.assign<Position>().get(); |