diff options
| -rw-r--r-- | source/core/StarLua.hpp | 3 | ||||
| -rw-r--r-- | source/game/scripting/StarRootLuaBindings.cpp | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/core/StarLua.hpp b/source/core/StarLua.hpp index 57afb98..fa777c2 100644 --- a/source/core/StarLua.hpp +++ b/source/core/StarLua.hpp @@ -1050,6 +1050,9 @@ struct LuaContainerConverter { template <typename T, typename Allocator> struct LuaConverter<List<T, Allocator>> : LuaContainerConverter<List<T, Allocator>> {}; +template <typename T, typename Allocator, typename Equals> +struct LuaConverter<HashSet<T, Allocator, Equals>> : LuaContainerConverter<HashSet<T, Allocator, Equals>> {}; + template <typename T, size_t MaxSize> struct LuaConverter<StaticList<T, MaxSize>> : LuaContainerConverter<StaticList<T, MaxSize>> {}; diff --git a/source/game/scripting/StarRootLuaBindings.cpp b/source/game/scripting/StarRootLuaBindings.cpp index c45ef46..e9b78bc 100644 --- a/source/game/scripting/StarRootLuaBindings.cpp +++ b/source/game/scripting/StarRootLuaBindings.cpp @@ -66,13 +66,12 @@ LuaCallbacks LuaBindings::makeRootCallbacks() { callbacks.registerCallbackWithSignature<Maybe<String>, String, Maybe<String>>("materialMiningSound", bind(RootCallbacks::materialMiningSound, root, _1, _2)); callbacks.registerCallbackWithSignature<Maybe<String>, String, Maybe<String>>("materialFootstepSound", bind(RootCallbacks::materialFootstepSound, root, _1, _2)); - callbacks.registerCallback("assetsByExtension", [root](LuaEngine& engine, String const& extension) -> LuaTable { - auto& extensions = root->assets()->scanExtension(extension); - auto table = engine.createTable(extensions.size(), 0); - size_t i = 0; - for (auto& file : extensions) - table.set(++i, file); - return table; + callbacks.registerCallback("assetsByExtension", [root](LuaEngine& engine, String const& extension) -> CaseInsensitiveStringSet { + return root->assets()->scanExtension(extension); + }); + + callbacks.registerCallback("assetsScan", [root](LuaEngine& engine, Maybe<String> const& a, Maybe<String> const& b) -> StringList { + return b ? root->assets()->scan(a.value(), *b) : root->assets()->scan(a.value()); }); callbacks.registerCallback("assetOrigin", [root](String const& path) -> Maybe<String> { |