From e72440564065e473ad1aa8e67fc235b0e6e15d52 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 14 Jul 2024 21:11:25 -0400 Subject: [PATCH] move screen editor to editor/graphics --- src/CMakeLists.txt | 10 +++++----- src/app/editor/{ => graphics}/screen_editor.cc | 2 -- src/app/editor/{ => graphics}/screen_editor.h | 0 src/app/editor/master_editor.cc | 2 +- src/app/editor/master_editor.h | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) rename src/app/editor/{ => graphics}/screen_editor.cc (99%) rename src/app/editor/{ => graphics}/screen_editor.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed86fa64..8e5bdb9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,16 +8,16 @@ set( set( YAZE_APP_EDITOR_SRC app/editor/dungeon_editor.cc - app/editor/graphics_editor.cc app/editor/master_editor.cc app/editor/overworld_editor.cc - app/editor/screen_editor.cc app/editor/sprite/sprite_editor.cc app/editor/music/music_editor.cc - app/editor/modules/palette_editor.cc app/editor/code/assembly_editor.cc - app/editor/modules/tile16_editor.cc - app/editor/modules/gfx_group_editor.cc + app/editor/graphics/screen_editor.cc + app/editor/graphics/graphics_editor.cc + app/editor/graphics/palette_editor.cc + app/editor/graphics/tile16_editor.cc + app/editor/graphics/gfx_group_editor.cc app/editor/context/gfx_context.cc ) diff --git a/src/app/editor/screen_editor.cc b/src/app/editor/graphics/screen_editor.cc similarity index 99% rename from src/app/editor/screen_editor.cc rename to src/app/editor/graphics/screen_editor.cc index 74dbca34..0da6a1bb 100644 --- a/src/app/editor/screen_editor.cc +++ b/src/app/editor/graphics/screen_editor.cc @@ -25,8 +25,6 @@ namespace yaze { namespace app { namespace editor { - - absl::Status ScreenEditor::Update() { TAB_BAR("##TabBar") TAB_ITEM("Dungeon Maps") diff --git a/src/app/editor/screen_editor.h b/src/app/editor/graphics/screen_editor.h similarity index 100% rename from src/app/editor/screen_editor.h rename to src/app/editor/graphics/screen_editor.h diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index 587b0d10..97c8fbcc 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -18,9 +18,9 @@ #include "app/editor/dungeon_editor.h" #include "app/editor/graphics/graphics_editor.h" #include "app/editor/graphics/palette_editor.h" +#include "app/editor/graphics/screen_editor.h" #include "app/editor/music/music_editor.h" #include "app/editor/overworld_editor.h" -#include "app/editor/screen_editor.h" #include "app/editor/sprite/sprite_editor.h" #include "app/emu/emulator.h" #include "app/gfx/snes_palette.h" diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index 6e10bb7c..c56385ff 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -20,7 +20,7 @@ #include "app/editor/graphics/palette_editor.h" #include "app/editor/music/music_editor.h" #include "app/editor/overworld_editor.h" -#include "app/editor/screen_editor.h" +#include "app/editor/graphics/screen_editor.h" #include "app/editor/sprite/sprite_editor.h" #include "app/emu/emulator.h" #include "app/gfx/snes_palette.h"