From 2b9609e308525e811fb163190597bae40a3f2161 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 11 Jan 2025 23:12:44 -0600 Subject: [PATCH] [jasper/world] Cleanup --- .../world/src/studio/worldeditor/worldeditor-imgui.cpp | 8 -------- .../world/src/studio/worldeditor/worldeditor-imgui.hpp | 2 -- 2 files changed, 10 deletions(-) diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index e6d6021..b1619af 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -83,7 +83,6 @@ WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam m_sctx.project->fileUpdated.connect(this, &WorldEditorImGui::handleDepUpdate); m_loader.resourcesUpdated.connect(&m_view, &WorldEditorView::setupWorld); m_loader.tileUpdated.connect(&m_view, &WorldEditorView::setupTile); - Editor::undoStack()->changeTriggered.connect(this, &WorldEditorImGui::undoStackChanged); studio::openConfig( keelCtx(m_sctx), itemPath(), [this](WorldEditorConfig const&config) { m_view.setAnimate(config.animateBg); @@ -427,13 +426,6 @@ ox::Error WorldEditorImGui::loadObjectSets() noexcept { return {}; } -ox::Error WorldEditorImGui::undoStackChanged(studio::UndoCommand const*cmd) { - if (dynamic_cast(cmd)) { - OX_RETURN_ERROR(m_loader.loadWorldStatic()); - } - return {}; -} - bool WorldEditorImGui::tileSelected(ox::Point const&pt) const noexcept { return m_selection && m_selection->contains(pt); } diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp index 75c719c..cdeb30e 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp @@ -91,8 +91,6 @@ class WorldEditorImGui: public studio::Editor { ox::Error loadObjectSets() noexcept; - ox::Error undoStackChanged(studio::UndoCommand const*); - [[nodiscard]] bool tileSelected(ox::Point const&pt) const noexcept;