From b08dd34a08ffc06dc3857a542da1830a1b7cf3b2 Mon Sep 17 00:00:00 2001 From: Justin Scofield Date: Mon, 20 Jun 2022 13:12:00 -0400 Subject: [PATCH] created gui directory and namespace --- src/CMakeLists.txt | 6 +++--- src/application/Core/controller.h | 4 ++-- src/application/Editor/editor.cc | 2 +- src/application/Editor/editor.h | 4 ++-- src/application/Editor/overworld_editor.h | 5 +++-- src/{application/Graphics => gui}/icons.h | 0 src/{application/Core => gui}/input.cc | 2 +- src/{application/Core => gui}/input.h | 2 +- src/{application/Graphics => gui}/style.cc | 8 ++------ src/{application/Graphics => gui}/style.h | 8 ++------ 10 files changed, 17 insertions(+), 24 deletions(-) rename src/{application/Graphics => gui}/icons.h (100%) rename src/{application/Core => gui}/input.cc (97%) rename src/{application/Core => gui}/input.h (95%) rename src/{application/Graphics => gui}/style.cc (95%) rename src/{application/Graphics => gui}/style.h (57%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee1cfe33..4b73268a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,16 +32,15 @@ add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES}) add_executable( yaze yaze.cc + gui/input.cc + gui/style.cc application/Core/controller.cc - application/Core/input.cc application/Data/rom.cc application/Data/OW/overworld.cc application/Data/OW/overworld_map.cc application/Graphics/bitmap.cc application/Graphics/tile.cc application/Graphics/palette.cc - application/Graphics/style.cc - application/Graphics/scene.cc application/Editor/editor.cc application/Editor/overworld_editor.cc # GUI libraries @@ -65,6 +64,7 @@ add_executable( target_include_directories( yaze PUBLIC + / Library/ application/ "C:/msys64/mingw64/include/libpng16" diff --git a/src/application/Core/controller.h b/src/application/Core/controller.h index 7ed4e2f2..f48e29fa 100644 --- a/src/application/Core/controller.h +++ b/src/application/Core/controller.h @@ -9,8 +9,8 @@ #include #include "Editor/editor.h" -#include "Graphics/icons.h" -#include "Graphics/style.h" +#include "gui/icons.h" +#include "gui/style.h" int main(int argc, char **argv); diff --git a/src/application/Editor/editor.cc b/src/application/Editor/editor.cc index 9ec2c519..4b38b8d6 100644 --- a/src/application/Editor/editor.cc +++ b/src/application/Editor/editor.cc @@ -7,7 +7,7 @@ #include #include "Core/constants.h" -#include "Core/input.h" +#include "gui/input.h" #include "Data/rom.h" #include "Editor/overworld_editor.h" #include "Graphics/icons.h" diff --git a/src/application/Editor/editor.h b/src/application/Editor/editor.h index 9beb5c78..db09edc3 100644 --- a/src/application/Editor/editor.h +++ b/src/application/Editor/editor.h @@ -8,11 +8,11 @@ #include #include "Core/constants.h" -#include "Core/input.h" #include "Data/rom.h" #include "Editor/overworld_editor.h" -#include "Graphics/icons.h" #include "Graphics/tile.h" +#include "gui/icons.h" +#include "gui/input.h" namespace yaze { namespace application { diff --git a/src/application/Editor/overworld_editor.h b/src/application/Editor/overworld_editor.h index bb5a3498..d387f6cc 100644 --- a/src/application/Editor/overworld_editor.h +++ b/src/application/Editor/overworld_editor.h @@ -4,9 +4,10 @@ #include #include "Data/OW/overworld.h" -#include "Graphics/icons.h" #include "Graphics/palette.h" #include "Graphics/tile.h" +#include "gui/icons.h" + namespace yaze { namespace application { @@ -16,7 +17,7 @@ static constexpr unsigned int k4BPP = 4; class OverworldEditor { public: - void SetupROM(Data::ROM & rom); + void SetupROM(Data::ROM &rom); void Update(); private: diff --git a/src/application/Graphics/icons.h b/src/gui/icons.h similarity index 100% rename from src/application/Graphics/icons.h rename to src/gui/icons.h diff --git a/src/application/Core/input.cc b/src/gui/input.cc similarity index 97% rename from src/application/Core/input.cc rename to src/gui/input.cc index e4dba475..2596d423 100644 --- a/src/application/Core/input.cc +++ b/src/gui/input.cc @@ -4,7 +4,7 @@ #include namespace yaze { -namespace Gui { +namespace gui { const int kStepOneHex = 0x01; const int kStepFastHex = 0x0F; diff --git a/src/application/Core/input.h b/src/gui/input.h similarity index 95% rename from src/application/Core/input.h rename to src/gui/input.h index 0c5313cc..356f3816 100644 --- a/src/application/Core/input.h +++ b/src/gui/input.h @@ -8,7 +8,7 @@ #include namespace yaze { -namespace Gui { +namespace gui { IMGUI_API bool InputHex(const char* label, int* data); IMGUI_API bool InputHexShort(const char* label, int* data); diff --git a/src/application/Graphics/style.cc b/src/gui/style.cc similarity index 95% rename from src/application/Graphics/style.cc rename to src/gui/style.cc index 0ac2b50a..edea040f 100644 --- a/src/application/Graphics/style.cc +++ b/src/gui/style.cc @@ -4,9 +4,7 @@ #include "imgui/imgui_internal.h" namespace yaze { -namespace application { -namespace Core { -namespace Style { +namespace gui { void ColorsYaze() { ImGuiStyle *style = &ImGui::GetStyle(); @@ -107,7 +105,5 @@ void ColorsYaze() { colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f); } -} // namespace Style -} // namespace Core -} // namespace application +} // namespace gui } // namespace yaze \ No newline at end of file diff --git a/src/application/Graphics/style.h b/src/gui/style.h similarity index 57% rename from src/application/Graphics/style.h rename to src/gui/style.h index 6a3fca1f..2a56a196 100644 --- a/src/application/Graphics/style.h +++ b/src/gui/style.h @@ -5,15 +5,11 @@ #include namespace yaze { -namespace application { -namespace Core { -namespace Style { +namespace gui { void ColorsYaze(); -} // namespace Style -} // namespace Core -} // namespace application +} // namespace gui } // namespace yaze #endif \ No newline at end of file