From 716f5b5ac67e068dd36c51c8703035f7b6f684db Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Fri, 17 Jan 2025 19:59:07 -0500 Subject: [PATCH] Add slot_map and begin ui context --- .gitmodules | 3 +++ CMakeLists.txt | 2 ++ lib/slot_map | 1 + src/ui/core/ui_context.cpp | 3 +++ src/ui/core/ui_context.hpp | 8 ++++++++ 5 files changed, 17 insertions(+) create mode 160000 lib/slot_map create mode 100644 src/ui/core/ui_context.cpp create mode 100644 src/ui/core/ui_context.hpp diff --git a/.gitmodules b/.gitmodules index 55acbb5..61832bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "Zelda64RecompSyms"] path = Zelda64RecompSyms url = https://github.com/Zelda64Recomp/Zelda64RecompSyms +[submodule "lib/slot_map"] + path = lib/slot_map + url = https://github.com/SergeyMakeev/slot_map diff --git a/CMakeLists.txt b/CMakeLists.txt index f64429a..3a77cb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,6 +172,7 @@ set (SOURCES ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_details_panel.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_menu.cpp ${CMAKE_SOURCE_DIR}/src/ui/util/hsv.cpp + ${CMAKE_SOURCE_DIR}/src/ui/core/ui_context.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementConfigGroup.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementConfigOption.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementDescription.cpp @@ -218,6 +219,7 @@ target_include_directories(Zelda64Recompiled PRIVATE ${CMAKE_SOURCE_DIR}/lib/rt64/src/render ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include + ${CMAKE_SOURCE_DIR}/lib/slot_map/slot_map ${CMAKE_BINARY_DIR}/shaders ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/lib/slot_map b/lib/slot_map new file mode 160000 index 0000000..b8ac8eb --- /dev/null +++ b/lib/slot_map @@ -0,0 +1 @@ +Subproject commit b8ac8ebd89aa1cd18f20ce6e4ad1cac716f1933f diff --git a/src/ui/core/ui_context.cpp b/src/ui/core/ui_context.cpp new file mode 100644 index 0000000..c470d77 --- /dev/null +++ b/src/ui/core/ui_context.cpp @@ -0,0 +1,3 @@ +#include "slot_map.h" + +#include "ui_context.hpp" diff --git a/src/ui/core/ui_context.hpp b/src/ui/core/ui_context.hpp new file mode 100644 index 0000000..876d8c4 --- /dev/null +++ b/src/ui/core/ui_context.hpp @@ -0,0 +1,8 @@ +#pragma once + +#include "../elements/ui_element.h" + +namespace recompui { + +} // namespace recompui +