diff --git a/src/app/editor/context/gfx_context.cc b/src/app/editor/context/gfx_context.cc index 8c8665e1..e544f860 100644 --- a/src/app/editor/context/gfx_context.cc +++ b/src/app/editor/context/gfx_context.cc @@ -5,7 +5,7 @@ #include #include "app/editor/utils/editor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/dungeon_editor.h b/src/app/editor/dungeon_editor.h index 557df494..dced6663 100644 --- a/src/app/editor/dungeon_editor.h +++ b/src/app/editor/dungeon_editor.h @@ -5,8 +5,8 @@ #include "app/core/common.h" #include "app/core/labeling.h" -#include "app/editor/modules/gfx_group_editor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/gfx_group_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gui/canvas.h" #include "app/gui/icons.h" diff --git a/src/app/editor/modules/gfx_group_editor.cc b/src/app/editor/graphics/gfx_group_editor.cc similarity index 99% rename from src/app/editor/modules/gfx_group_editor.cc rename to src/app/editor/graphics/gfx_group_editor.cc index 7301bb0e..b559d2db 100644 --- a/src/app/editor/modules/gfx_group_editor.cc +++ b/src/app/editor/graphics/gfx_group_editor.cc @@ -6,7 +6,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" diff --git a/src/app/editor/modules/gfx_group_editor.h b/src/app/editor/graphics/gfx_group_editor.h similarity index 100% rename from src/app/editor/modules/gfx_group_editor.h rename to src/app/editor/graphics/gfx_group_editor.h diff --git a/src/app/editor/graphics_editor.cc b/src/app/editor/graphics/graphics_editor.cc similarity index 99% rename from src/app/editor/graphics_editor.cc rename to src/app/editor/graphics/graphics_editor.cc index b7be0814..141b4498 100644 --- a/src/app/editor/graphics_editor.cc +++ b/src/app/editor/graphics/graphics_editor.cc @@ -8,7 +8,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "app/core/platform/clipboard.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/compression.h" #include "app/gfx/scad_format.h" diff --git a/src/app/editor/graphics_editor.h b/src/app/editor/graphics/graphics_editor.h similarity index 99% rename from src/app/editor/graphics_editor.h rename to src/app/editor/graphics/graphics_editor.h index d4824ac7..136f9231 100644 --- a/src/app/editor/graphics_editor.h +++ b/src/app/editor/graphics/graphics_editor.h @@ -8,7 +8,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/modules/palette_editor.cc b/src/app/editor/graphics/palette_editor.cc similarity index 100% rename from src/app/editor/modules/palette_editor.cc rename to src/app/editor/graphics/palette_editor.cc diff --git a/src/app/editor/modules/palette_editor.h b/src/app/editor/graphics/palette_editor.h similarity index 95% rename from src/app/editor/modules/palette_editor.h rename to src/app/editor/graphics/palette_editor.h index e9ff7e54..d25a2634 100644 --- a/src/app/editor/modules/palette_editor.h +++ b/src/app/editor/graphics/palette_editor.h @@ -4,7 +4,7 @@ #include #include "absl/status/status.h" -#include "app/editor/modules/gfx_group_editor.h" +#include "app/editor/graphics/gfx_group_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/snes_palette.h" #include "app/gui/canvas.h" diff --git a/src/app/editor/modules/tile16_editor.cc b/src/app/editor/graphics/tile16_editor.cc similarity index 99% rename from src/app/editor/modules/tile16_editor.cc rename to src/app/editor/graphics/tile16_editor.cc index cfc73d9d..716667f5 100644 --- a/src/app/editor/modules/tile16_editor.cc +++ b/src/app/editor/graphics/tile16_editor.cc @@ -6,7 +6,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" diff --git a/src/app/editor/modules/tile16_editor.h b/src/app/editor/graphics/tile16_editor.h similarity index 98% rename from src/app/editor/modules/tile16_editor.h rename to src/app/editor/graphics/tile16_editor.h index b370ce0e..c55bd3f7 100644 --- a/src/app/editor/modules/tile16_editor.h +++ b/src/app/editor/graphics/tile16_editor.h @@ -8,7 +8,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "app/editor/context/gfx_context.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index fefc362e..587b0d10 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -16,8 +16,8 @@ #include "app/core/platform/file_dialog.h" #include "app/editor/code/assembly_editor.h" #include "app/editor/dungeon_editor.h" -#include "app/editor/graphics_editor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/graphics_editor.h" +#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" diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index 2df323d6..6e10bb7c 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -16,8 +16,8 @@ #include "app/editor/code/assembly_editor.h" #include "app/editor/context/gfx_context.h" #include "app/editor/dungeon_editor.h" -#include "app/editor/graphics_editor.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/graphics_editor.h" +#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" diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc index d60acaae..2e5b5267 100644 --- a/src/app/editor/overworld_editor.cc +++ b/src/app/editor/overworld_editor.cc @@ -12,7 +12,7 @@ #include "app/core/common.h" #include "app/core/constants.h" #include "app/core/platform/clipboard.h" -#include "app/editor/modules/palette_editor.h" +#include "app/editor/graphics/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h index 8081e333..d282e7c3 100644 --- a/src/app/editor/overworld_editor.h +++ b/src/app/editor/overworld_editor.h @@ -14,9 +14,9 @@ #include "app/core/common.h" #include "app/editor/context/entrance_context.h" #include "app/editor/context/gfx_context.h" -#include "app/editor/modules/gfx_group_editor.h" -#include "app/editor/modules/palette_editor.h" -#include "app/editor/modules/tile16_editor.h" +#include "app/editor/graphics/gfx_group_editor.h" +#include "app/editor/graphics/palette_editor.h" +#include "app/editor/graphics/tile16_editor.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h"