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

[jasper/world] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2025-01-11 23:12:44 -06:00
parent 590b2524e5
commit 2b9609e308
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@ WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam
m_sctx.project->fileUpdated.connect(this, &WorldEditorImGui::handleDepUpdate); m_sctx.project->fileUpdated.connect(this, &WorldEditorImGui::handleDepUpdate);
m_loader.resourcesUpdated.connect(&m_view, &WorldEditorView::setupWorld); m_loader.resourcesUpdated.connect(&m_view, &WorldEditorView::setupWorld);
m_loader.tileUpdated.connect(&m_view, &WorldEditorView::setupTile); m_loader.tileUpdated.connect(&m_view, &WorldEditorView::setupTile);
Editor::undoStack()->changeTriggered.connect(this, &WorldEditorImGui::undoStackChanged);
studio::openConfig<WorldEditorConfig>( studio::openConfig<WorldEditorConfig>(
keelCtx(m_sctx), itemPath(), [this](WorldEditorConfig const&config) { keelCtx(m_sctx), itemPath(), [this](WorldEditorConfig const&config) {
m_view.setAnimate(config.animateBg); m_view.setAnimate(config.animateBg);
@ -427,13 +426,6 @@ ox::Error WorldEditorImGui::loadObjectSets() noexcept {
return {}; return {};
} }
ox::Error WorldEditorImGui::undoStackChanged(studio::UndoCommand const*cmd) {
if (dynamic_cast<EditWorldSizeCommand const*>(cmd)) {
OX_RETURN_ERROR(m_loader.loadWorldStatic());
}
return {};
}
bool WorldEditorImGui::tileSelected(ox::Point const&pt) const noexcept { bool WorldEditorImGui::tileSelected(ox::Point const&pt) const noexcept {
return m_selection && m_selection->contains(pt); return m_selection && m_selection->contains(pt);
} }

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

@ -91,8 +91,6 @@ class WorldEditorImGui: public studio::Editor {
ox::Error loadObjectSets() noexcept; ox::Error loadObjectSets() noexcept;
ox::Error undoStackChanged(studio::UndoCommand const*);
[[nodiscard]] [[nodiscard]]
bool tileSelected(ox::Point const&pt) const noexcept; bool tileSelected(ox::Point const&pt) const noexcept;