drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia,studio] Cleanup

Browse Source
This commit is contained in:
Gary Talent
2023-12-03 19:59:27 -06:00
parent 5717d67462
commit d23b69ce17
24 changed files with 68 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/studio/applib/src/studioapp.cpp
View File

@@ -260,10 +260,10 @@ void StudioUI::loadEditorMaker(const studio::EditorMaker &editorMaker) noexcept
}
void StudioUI::loadModule(const studio::Module *mod) noexcept {
for (const auto &editorMaker : mod->editors(m_ctx)) {
for (const auto &editorMaker : mod->editors(*m_ctx)) {
loadEditorMaker(editorMaker);
}
for (auto &im : mod->itemMakers(m_ctx)) {
for (auto &im : mod->itemMakers(*m_ctx)) {
m_newMenu.addItemMaker(std::move(im));
}
}

8
src/studio/modlib/include/studio/module.hpp
View File

@@ -27,18 +27,18 @@ class Module {
public:
virtual ~Module() noexcept = default;
virtual ox::Vector<EditorMaker> editors(turbine::Context *ctx) const;
virtual ox::Vector<EditorMaker> editors(turbine::Context &ctx) const;
virtual ox::Vector<ox::UniquePtr<ItemMaker>> itemMakers(turbine::Context*) const;
virtual ox::Vector<ox::UPtr<ItemMaker>> itemMakers(turbine::Context&) const;
};
template<typename Editor>
[[nodiscard]]
studio::EditorMaker editorMaker(turbine::Context *ctx, ox::CRStringView ext) noexcept {
studio::EditorMaker editorMaker(turbine::Context &ctx, ox::CRStringView ext) noexcept {
return {
{ox::String(ext)},
[ctx](ox::CRStringView path) -> ox::Result<studio::BaseEditor*> {
[&ctx](ox::CRStringView path) -> ox::Result<studio::BaseEditor*> {
return ox::makeCatch<Editor>(ctx, ox::String(path));
}
};

4
src/studio/modlib/src/module.cpp
View File

@@ -6,11 +6,11 @@
namespace studio {
ox::Vector<EditorMaker> Module::editors(turbine::Context*) const {
ox::Vector<EditorMaker> Module::editors(turbine::Context&) const {
return {};
}
ox::Vector<ox::UniquePtr<ItemMaker>> Module::itemMakers(turbine::Context*) const {
ox::Vector<ox::UPtr<ItemMaker>> Module::itemMakers(turbine::Context&) const {
return {};
}