drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 5d1f680a..124c7029

Browse Source 
124c7029 [olympic/studio] Change Studio modules to pass StudioContext instead of turbine::Context

git-subtree-dir: deps/nostalgia
git-subtree-split: 124c7029bda328e9ddc208b00e53a2e6452f2ede
This commit is contained in:
Gary Talent
2024-01-20 15:41:04 -06:00
parent 6640e00ad9
commit ae1f8ce11a
13 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/olympic/studio/modlib/include/studio/module.hpp
View File

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

4
src/olympic/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(studio::StudioContext&) const {
return {};
}
ox::Vector<ox::UPtr<ItemMaker>> Module::itemMakers(turbine::Context&) const {
ox::Vector<ox::UPtr<ItemMaker>> Module::itemMakers(studio::StudioContext&) const {
return {};
}