diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 72243009..4deab963 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ set( app/editor/sprite_editor.cc app/editor/modules/music_editor.cc app/editor/modules/palette_editor.cc - app/editor/modules/assembly_editor.cc + app/editor/code/assembly_editor.cc app/editor/modules/tile16_editor.cc app/editor/modules/gfx_group_editor.cc app/editor/context/gfx_context.cc diff --git a/src/app/editor/modules/assembly_editor.cc b/src/app/editor/code/assembly_editor.cc similarity index 100% rename from src/app/editor/modules/assembly_editor.cc rename to src/app/editor/code/assembly_editor.cc diff --git a/src/app/editor/modules/assembly_editor.h b/src/app/editor/code/assembly_editor.h similarity index 100% rename from src/app/editor/modules/assembly_editor.h rename to src/app/editor/code/assembly_editor.h diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index d6e21602..b55c8e9b 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -15,7 +15,7 @@ #include "app/core/platform/file_dialog.h" #include "app/editor/dungeon_editor.h" #include "app/editor/graphics_editor.h" -#include "app/editor/modules/assembly_editor.h" +#include "app/editor/code/assembly_editor.h" #include "app/editor/modules/music_editor.h" #include "app/editor/modules/palette_editor.h" #include "app/editor/overworld_editor.h" @@ -214,6 +214,11 @@ absl::Status MasterEditor::Update() { music_editor_.Update(); ImGui::EndTabItem(); } + + // if (ImGui::TabItemButton("+", kDungeonTabFlags)) { + + // } + END_TAB_BAR() ImGui::End(); diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index 052c5d5d..d7f016c6 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -15,7 +15,7 @@ #include "app/editor/context/gfx_context.h" #include "app/editor/dungeon_editor.h" #include "app/editor/graphics_editor.h" -#include "app/editor/modules/assembly_editor.h" +#include "app/editor/code/assembly_editor.h" #include "app/editor/modules/music_editor.h" #include "app/editor/modules/palette_editor.h" #include "app/editor/overworld_editor.h" diff --git a/src/app/editor/modules/music_editor.cc b/src/app/editor/modules/music_editor.cc index c6749256..8aaa8bd8 100644 --- a/src/app/editor/modules/music_editor.cc +++ b/src/app/editor/modules/music_editor.cc @@ -3,7 +3,7 @@ #include #include "absl/strings/str_format.h" -#include "app/editor/modules/assembly_editor.h" +#include "app/editor/code/assembly_editor.h" #include "app/gui/canvas.h" #include "app/gui/icons.h" #include "app/gui/input.h" diff --git a/src/app/editor/modules/music_editor.h b/src/app/editor/modules/music_editor.h index 849a584f..ad1087f7 100644 --- a/src/app/editor/modules/music_editor.h +++ b/src/app/editor/modules/music_editor.h @@ -4,7 +4,7 @@ #include #include "absl/strings/str_format.h" -#include "app/editor/modules/assembly_editor.h" +#include "app/editor/code/assembly_editor.h" #include "app/gui/canvas.h" #include "app/gui/icons.h" #include "app/gui/input.h"