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

Squashed 'deps/nostalgia/' changes from 2016f6e6..830f8fe3

Browse Source 
830f8fe3 [studio,nostalgia/core/studio] Give default Palette created studio a default page

git-subtree-dir: deps/nostalgia
git-subtree-split: 830f8fe3e4aad93f045e56cc4cdce851b5de0b70
This commit is contained in:
Gary Talent 2025-01-20 02:15:45 -06:00
parent 8e0b6ffbab
commit 38777cfac8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nostalgia/modules/core/src/studio/studiomodule.cpp
View File

@ -21,8 +21,11 @@ static class: public studio::Module {
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final { ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
ox::Vector<ox::UniquePtr<studio::ItemMaker>> out; ox::Vector<ox::UniquePtr<studio::ItemMaker>> out;
out.emplace_back(ox::make<studio::ItemMakerT<core::TileSheet>>("Tile Sheet", "TileSheets", FileExt_ng)); out.emplace_back(ox::make<studio::ItemMakerT<TileSheet>>("Tile Sheet", "TileSheets", FileExt_ng));
out.emplace_back(ox::make<studio::ItemMakerT<core::Palette>>("Palette", "Palettes", FileExt_npal)); out.emplace_back(ox::make<studio::ItemMakerT<Palette>>("Palette", "Palettes", FileExt_npal, Palette{
.colorNames = {},
.pages = {{"Page 1", ox::Vector<PaletteColorV1>{}}},
}, ox::ClawFormat::Organic));
return out; return out;
} }
} const mod; } const mod;

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

@ -218,7 +218,7 @@ class ItemMakerT final: public ItemMaker {
std::move(pParentDir), std::move(pParentDir),
std::move(fileExt)), std::move(fileExt)),
m_fmt{pFmt} { m_fmt{pFmt} {
installTemplate(ox::make_unique<ItemTemplateT<T>>(std::move(pItem))); installTemplate(ox::make_unique<ItemTemplateT<T>>("Default", std::move(pItem)));
} }
constexpr ItemMakerT( constexpr ItemMakerT(
@ -232,7 +232,7 @@ class ItemMakerT final: public ItemMaker {
std::move(pParentDir), std::move(pParentDir),
std::move(fileExt)), std::move(fileExt)),
m_fmt{pFmt} { m_fmt{pFmt} {
installTemplate(ox::make_unique<ItemTemplateT<T>>(std::move(pItem))); installTemplate(ox::make_unique<ItemTemplateT<T>>("Default", std::move(pItem)));
} }
ox::StringView typeName() const noexcept override { ox::StringView typeName() const noexcept override {