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

[nostalgia,olympic] Cleanup CMake

Browse Source
This commit is contained in:
Gary Talent
2023-12-23 12:23:47 -06:00
parent 978f2f9c4f
commit 2dba592a42
15 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/olympic/studio/modlib/include/studio/itemmaker.hpp
View File

@ -30,8 +30,8 @@ class ItemMaker {
template<typename T>
class ItemMakerT: public ItemMaker {
private:
T const item;
ox::ClawFormat const fmt;
T const m_item;
ox::ClawFormat const m_fmt;
public:
constexpr ItemMakerT(
ox::StringView pDisplayName,
@ -39,7 +39,7 @@ class ItemMakerT: public ItemMaker {
ox::StringView fileExt,
ox::ClawFormat pFmt = ox::ClawFormat::Metal) noexcept:
ItemMaker(pDisplayName, pParentDir, fileExt),
fmt(pFmt) {
m_fmt(pFmt) {
}
constexpr ItemMakerT(
ox::StringView pDisplayName,
@ -48,8 +48,8 @@ class ItemMakerT: public ItemMaker {
T pItem,
ox::ClawFormat pFmt) noexcept:
ItemMaker(pDisplayName, pParentDir, fileExt),
item(pItem),
fmt(pFmt) {
m_item(pItem),
m_fmt(pFmt) {
}
constexpr ItemMakerT(
ox::StringView pDisplayName,
@ -58,14 +58,14 @@ class ItemMakerT: public ItemMaker {
T &&pItem,
ox::ClawFormat pFmt) noexcept:
ItemMaker(pDisplayName, pParentDir, fileExt),
item(std::move(pItem)),
fmt(pFmt) {
m_item(std::move(pItem)),
m_fmt(pFmt) {
}
ox::Error write(turbine::Context &ctx, ox::CRStringView pName) const noexcept override {
auto const path = ox::sfmt("/{}/{}.{}", parentDir, pName, fileExt);
auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
keel::createUuidMapping(keelCtx(ctx), path, ox::UUID::generate().unwrap());
return sctx->project->writeObj(path, item, fmt);
return sctx->project->writeObj(path, m_item, m_fmt);
}
};