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

[jasper/world/studio] Cleanup, give WorldEditor an acceptsClipboardPayload function
Some checks failed
Build / build (push) Failing after 2m38s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-05-28 21:12:38 -05:00
parent 8a1e60e571
commit 46c3e4e0de
5 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.hpp
View File

@ -37,6 +37,4 @@ class ModifyTilesCommand: public studio::UndoCommand {
void swap() noexcept;
};
using TileUpdate = ModifyTilesCommand::Mod;
}

4
src/jasper/modules/world/src/studio/worldeditor/tileclipboard.cpp
View File

@ -6,7 +6,9 @@
namespace jasper::world {
TileClipboard::TileClipboard(ox::Size selSz) noexcept: m_selSz(selSz) {}
TileClipboard::TileClipboard(ox::UUID assetId, ox::Size selSz) noexcept:
m_assetId(assetId), m_selSz(selSz) {
}
ox::Size TileClipboard::selectionSize() const noexcept {
return m_selSz;

11
src/jasper/modules/world/src/studio/worldeditor/tileclipboard.hpp
View File

@ -15,13 +15,13 @@ class TileClipboard : public turbine::ClipboardObject<TileClipboard> {
static constexpr auto TypeName = "net.drinkingtea.jasper.world.studio.TileClipboard";
static constexpr auto TypeVersion = 1;
protected:
ox::UUID m_assetId;
ox::Size m_selSz;
ox::Vector<ModifyTilesCommand::Mod> m_tileMods;
public:
explicit TileClipboard(ox::Size selSz) noexcept;
TileClipboard(ox::UUID assetId, ox::Size selSz) noexcept;
[[nodiscard]]
ox::Size selectionSize() const noexcept;
@ -30,6 +30,13 @@ class TileClipboard : public turbine::ClipboardObject<TileClipboard> {
[[nodiscard]]
ox::SpanView<ModifyTilesCommand::Mod> tiles() const noexcept;
constexpr ox::UUID const&assetId() const noexcept {
return m_assetId;
}
};
oxModelBegin(TileClipboard)
oxModelEnd()
}

37
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp
View File

@ -81,8 +81,8 @@ constexpr bool inside(auto const val, int const min, int const max) noexcept {
WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringView path):
Editor(path),
m_sctx(sctx),
m_doc(makeValid(*readObj<WorldDoc>(keelCtx(m_sctx.tctx), path).unwrapThrow())),
m_objCache(buildObjCache(keelCtx(m_sctx.tctx), m_doc).unwrapThrow()),
m_doc(makeValid(*readObj<WorldDoc>(keelCtx(m_sctx), path).unwrapThrow())),
m_objCache(buildObjCache(keelCtx(m_sctx), m_doc).unwrapThrow()),
m_worldStatic(loadWorldStatic(m_objCache, m_doc)),
m_view(m_sctx.tctx, m_worldStatic) {
oxThrowError(loadObjectSets());
@ -116,7 +116,8 @@ void WorldEditorImGui::onActivated() noexcept {
void WorldEditorImGui::copy() noexcept {
if (m_selection) {
auto mods = ox::make_unique<TileClipboard>(m_selection->size());
auto const assetId = this->assetId().unwrapThrow();
auto mods = ox::make_unique<TileClipboard>(assetId, m_selection->size());
studio::iterateSelection(*m_selection, [this, &mods](int32_t x, int32_t y) {
auto &t = tile(m_doc, m_activeLayer, x, y);
x -= m_selection->a.x;
@ -177,6 +178,14 @@ void WorldEditorImGui::paste() {
}
}
bool WorldEditorImGui::acceptsClipboardPayload() const noexcept {
auto const [cb, noCb] = getClipboardObject<TileClipboard>(m_sctx.tctx);
if (noCb) {
return false;
}
return cb && cb->assetId() == assetId().or_value({});
}
ox::Error WorldEditorImGui::saveItem() noexcept {
return m_sctx.project->writeObj(itemPath(), m_doc, ox::ClawFormat::Organic);
}
@ -192,7 +201,7 @@ void WorldEditorImGui::drawObjSetSelector() noexcept {
}
ig::ListBox("Object Sets", [this](size_t i) -> ox::CStringView {
auto const&uuidUrl = m_doc.objSets[i].path;
auto [setName, err] = uuidUrlToPath(keelCtx(m_sctx.tctx), uuidUrl);
auto [setName, err] = uuidUrlToPath(keelCtx(m_sctx), uuidUrl);
if (err) {
setName = uuidUrl;
}
@ -204,7 +213,7 @@ void WorldEditorImGui::drawObjSelector() noexcept {
ig::IDStackItem const idStackItem("ObjSelector");
for (auto const&[uuidUrl, setId, set] : m_objSets) {
constexpr auto flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick;
auto [setName, err] = uuidUrlToPath(keelCtx(m_sctx.tctx), uuidUrl);
auto [setName, err] = uuidUrlToPath(keelCtx(m_sctx), uuidUrl);
if (err) {
setName = uuidUrl;
}
@ -370,7 +379,7 @@ ox::Error WorldEditorImGui::handleDrop(float fbPaneScale) noexcept {
}
ox::Error WorldEditorImGui::addObjSet(ox::StringView path) noexcept {
oxRequire(uuid, keel::pathToUuid(keelCtx(m_sctx.tctx), path));
oxRequire(uuid, getUuid(keelCtx(m_sctx), path));
std::ignore = pushCommand<AddObjectSet>(m_doc, uuid);
return {};
}
@ -380,9 +389,9 @@ void WorldEditorImGui::rmObjSet() noexcept {
}
ox::Error WorldEditorImGui::handleDepUpdate(ox::StringView, ox::UUID const&uuid) noexcept {
auto &kctx = keelCtx(m_sctx.tctx);
auto &kctx = keelCtx(m_sctx);
auto const objSetMatches = [&uuid, &kctx](ObjectSetEntry const&set) {
auto const [setUuid, err] = keel::getUuid(kctx, set.path);
auto const [setUuid, err] = getUuid(kctx, set.path);
return !err && setUuid == uuid;
};
auto const depMatches = [&uuid](ox::SmallMap<ox::UUID, bool>::Pair const&set) {
@ -391,7 +400,7 @@ ox::Error WorldEditorImGui::handleDepUpdate(ox::StringView, ox::UUID const&uuid)
auto const depUpdated = ox::any_of(m_doc.objSets.begin(), m_doc.objSets.end(), objSetMatches)
|| ox::any_of(m_dependencies.pairs().begin(), m_dependencies.pairs().end(), depMatches);
if (depUpdated) {
oxReturnError(buildObjCache(keelCtx(m_sctx.tctx), m_doc).moveTo(m_objCache));
oxReturnError(buildObjCache(keelCtx(m_sctx), m_doc).moveTo(m_objCache));
oxReturnError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic));
oxReturnError(loadObjectSets());
}
@ -401,7 +410,7 @@ ox::Error WorldEditorImGui::handleDepUpdate(ox::StringView, ox::UUID const&uuid)
ox::Error WorldEditorImGui::loadObjectSets() noexcept {
m_objSets.clear();
m_dependencies.clear();
auto &kctx = keelCtx(m_sctx.tctx);
auto &kctx = keelCtx(m_sctx);
for (auto const&set : m_doc.objSets) {
oxRequireM(os, readObj<WorldObjectSet>(kctx, set.path));
oxLogError(addDependency(os->tilesheet));
@ -434,9 +443,13 @@ void WorldEditorImGui::clearSelection() noexcept {
m_view.clearSelection();
}
ox::Result<ox::UUID> WorldEditorImGui::assetId() const noexcept {
return getUuid(keelCtx(m_sctx), itemPath());
}
ox::Error WorldEditorImGui::addDependency(ox::FileAddress const&fileAddr) noexcept {
auto &kctx = keelCtx(m_sctx.tctx);
oxRequire(uuid, keel::getUuid(kctx, fileAddr));
auto &kctx = keelCtx(m_sctx);
oxRequire(uuid, getUuid(kctx, fileAddr));
m_dependencies[uuid] = true;
return {};
}

4
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp
View File

@ -64,6 +64,8 @@ class WorldEditorImGui: public studio::Editor {
void paste() override;
bool acceptsClipboardPayload() const noexcept override;
ox::Error saveItem() noexcept final;
private:
@ -99,6 +101,8 @@ class WorldEditorImGui: public studio::Editor {
void clearSelection() noexcept;
ox::Result<ox::UUID> assetId() const noexcept;
ox::Error addDependency(ox::FileAddress const&fileAddr) noexcept;
};