From 7e0f38ef0f957252d766516daa01dd9f63d86a01 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 25 Aug 2024 15:40:14 -0400 Subject: [PATCH] housekeeping --- docs/contributing.md | 4 ++-- src/app/editor/dungeon/dungeon_editor.cc | 2 +- src/app/editor/message/message_editor.h | 3 --- src/app/editor/music/music_editor.h | 7 ------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/docs/contributing.md b/docs/contributing.md index 3dd8202d..4531e184 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -56,9 +56,9 @@ yaze includes an emulator subsystem that allows developers to test their modific ### 4. Editor Management -The `MasterEditor` class manages the core functionalities of YAZE, including rendering the UI, handling user input, and managing multiple editors. While this class is central to yaze's operations, it has many responsibilities. You can help by: +The `EditorManager` class manages the core functionalities of YAZE, including rendering the UI, handling user input, and managing multiple editors. While this class is central to yaze's operations, it has many responsibilities. You can help by: -- Refactoring `MasterEditor` to delegate responsibilities to specialized managers (e.g., `MenuManager`, `TabManager`, `StatusManager`). +- Refactoring `EditorManager` to delegate responsibilities to specialized managers (e.g., `MenuManager`, `TabManager`, `StatusManager`). - Optimizing the rendering and update loop to improve performance, especially when handling large textures or complex editors. - Implementing new features that streamline the editing process, such as better keyboard shortcuts, command palette integration, or project management tools. diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc index 2c387936..338093c9 100644 --- a/src/app/editor/dungeon/dungeon_editor.cc +++ b/src/app/editor/dungeon/dungeon_editor.cc @@ -320,7 +320,7 @@ void DungeonEditor::DrawRoomSelector() { for (const auto each_room_name : zelda3::dungeon::kRoomNames) { rom()->resource_label()->SelectableLabelWithNameEdit( current_room_id_ == i, "Dungeon Room Names", - core::UppercaseHexByte(i), zelda3::dungeon::kRoomNames[i].data()); + core::UppercaseHexByte(i), each_room_name.data()); if (ImGui::IsItemClicked()) { // TODO: Jump to tab if room is already open current_room_id_ = i; diff --git a/src/app/editor/message/message_editor.h b/src/app/editor/message/message_editor.h index cc1b6aa7..ab210f72 100644 --- a/src/app/editor/message/message_editor.h +++ b/src/app/editor/message/message_editor.h @@ -111,14 +111,11 @@ class MessageEditor : public Editor, public SharedRom { private: bool skip_next = false; - bool from_form = false; bool data_loaded_ = false; int text_line_ = 0; int text_position_ = 0; int shown_lines_ = 0; - int selected_tile = 0; - int current_message_id_ = 0; uint8_t width_array[100]; diff --git a/src/app/editor/music/music_editor.h b/src/app/editor/music/music_editor.h index fa51c4fb..693e7b8a 100644 --- a/src/app/editor/music/music_editor.h +++ b/src/app/editor/music/music_editor.h @@ -82,13 +82,6 @@ class MusicEditor : public SharedRom, public Editor { ImGuiTableFlags music_editor_flags_ = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable; - - ImGuiTableFlags channel_table_flags_ = - ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | - ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | - ImGuiTableFlags_SortMulti | ImGuiTableFlags_RowBg | - ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | - ImGuiTableFlags_NoBordersInBody | ImGuiTableFlags_ScrollY; }; } // namespace editor