From 4d8c74412ccb6a1a9dc22bfd80286c0a8b2ca939 Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:08:58 +0000 Subject: [PATCH] Update embedded resources --- UnleashedRecomp/CMakeLists.txt | 3 ++- UnleashedRecomp/ui/achievement_menu.cpp | 22 +++++++++++----------- UnleashedRecomp/ui/message_window.cpp | 10 +++++----- UnleashedRecompResources | 2 +- thirdparty/PowerRecomp | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index d0c0be9a..02b8aa9f 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -314,6 +314,7 @@ set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources") set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res") BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/achievements_menu/trophy.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/achievements_menu/trophy.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_trophy") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fade.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fade.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_select_fade") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fill.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fill.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_select_fill") BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon") BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon_night") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/pause.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/pause.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_pause") diff --git a/UnleashedRecomp/ui/achievement_menu.cpp b/UnleashedRecomp/ui/achievement_menu.cpp index 7a8aca53..52f70af1 100644 --- a/UnleashedRecomp/ui/achievement_menu.cpp +++ b/UnleashedRecomp/ui/achievement_menu.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include constexpr double HEADER_CONTAINER_INTRO_MOTION_START = 0; constexpr double HEADER_CONTAINER_INTRO_MOTION_END = 15; @@ -115,15 +115,15 @@ static void DrawSelectionContainer(ImVec2 min, ImVec2 max) auto commonWidth = Scale(11); auto commonHeight = Scale(24); - auto tl = PIXELS_TO_UV_COORDS(128, 128, 41, 0, 11, 24); - auto tc = PIXELS_TO_UV_COORDS(128, 128, 52, 0, 8, 24); - auto tr = PIXELS_TO_UV_COORDS(128, 128, 60, 0, 11, 24); - auto cl = PIXELS_TO_UV_COORDS(128, 128, 41, 24, 11, 2); - auto cc = PIXELS_TO_UV_COORDS(128, 128, 52, 24, 8, 2); - auto cr = PIXELS_TO_UV_COORDS(128, 128, 60, 24, 11, 2); - auto bl = PIXELS_TO_UV_COORDS(128, 128, 41, 26, 11, 24); - auto bc = PIXELS_TO_UV_COORDS(128, 128, 52, 26, 8, 24); - auto br = PIXELS_TO_UV_COORDS(128, 128, 60, 26, 11, 24); + auto tl = PIXELS_TO_UV_COORDS(64, 64, 0, 0, 11, 24); + auto tc = PIXELS_TO_UV_COORDS(64, 64, 11, 0, 8, 24); + auto tr = PIXELS_TO_UV_COORDS(64, 64, 19, 0, 11, 24); + auto cl = PIXELS_TO_UV_COORDS(64, 64, 0, 24, 11, 2); + auto cc = PIXELS_TO_UV_COORDS(64, 64, 11, 24, 8, 2); + auto cr = PIXELS_TO_UV_COORDS(64, 64, 19, 24, 11, 2); + auto bl = PIXELS_TO_UV_COORDS(64, 64, 0, 26, 11, 24); + auto bc = PIXELS_TO_UV_COORDS(64, 64, 11, 26, 8, 24); + auto br = PIXELS_TO_UV_COORDS(64, 64, 19, 26, 11, 24); drawList->AddImage(g_upSelectionCursor.get(), min, { min.x + commonWidth, min.y + commonHeight }, GET_UV_COORDS(tl), colour); drawList->AddImage(g_upSelectionCursor.get(), { min.x + commonWidth, min.y }, { max.x - commonWidth, min.y + commonHeight }, GET_UV_COORDS(tc), colour); @@ -656,7 +656,7 @@ void AchievementMenu::Init() g_fntNewRodinUB = io.Fonts->AddFontFromFileTTF("FOT-NewRodinPro-UB.otf", 20.0f * FONT_SCALE); g_upTrophyIcon = LoadTexture(g_trophy, sizeof(g_trophy)); - g_upSelectionCursor = LoadTexture(g_pause, sizeof(g_pause)); + g_upSelectionCursor = LoadTexture(g_select_fill, sizeof(g_select_fill)); } void AchievementMenu::Draw() diff --git a/UnleashedRecomp/ui/message_window.cpp b/UnleashedRecomp/ui/message_window.cpp index c82a044b..9e3639b5 100644 --- a/UnleashedRecomp/ui/message_window.cpp +++ b/UnleashedRecomp/ui/message_window.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include constexpr double OVERLAY_CONTAINER_COMMON_MOTION_START = 0; constexpr double OVERLAY_CONTAINER_COMMON_MOTION_END = 11; @@ -139,9 +139,9 @@ void DrawButton(int rowIndex, float yOffset, float width, float height, std::str auto colour = IM_COL32(255, 255, 255, 255 * alpha); auto width = Scale(11); - auto left = PIXELS_TO_UV_COORDS(128, 128, 0, 0, 11, 50); - auto centre = PIXELS_TO_UV_COORDS(128, 128, 11, 0, 8, 50); - auto right = PIXELS_TO_UV_COORDS(128, 128, 19, 0, 11, 50); + auto left = PIXELS_TO_UV_COORDS(64, 64, 0, 0, 11, 50); + auto centre = PIXELS_TO_UV_COORDS(64, 64, 11, 0, 8, 50); + auto right = PIXELS_TO_UV_COORDS(64, 64, 19, 0, 11, 50); drawList->AddImage(g_upSelectionCursor.get(), min, { min.x + width, max.y }, GET_UV_COORDS(left), colour); drawList->AddImage(g_upSelectionCursor.get(), { min.x + width, min.y }, { max.x - width, max.y }, GET_UV_COORDS(centre), colour); @@ -176,7 +176,7 @@ void MessageWindow::Init() g_fntSeurat = io.Fonts->AddFontFromFileTTF("FOT-SeuratPro-M.otf", 28.0f * FONT_SCALE); - g_upSelectionCursor = LoadTexture(g_pause, sizeof(g_pause)); + g_upSelectionCursor = LoadTexture(g_select_fade, sizeof(g_select_fade)); } void MessageWindow::Draw() diff --git a/UnleashedRecompResources b/UnleashedRecompResources index 48e641b5..e8dc5618 160000 --- a/UnleashedRecompResources +++ b/UnleashedRecompResources @@ -1 +1 @@ -Subproject commit 48e641b58a09c9ecfcf72c60d97bb1079deb5ea4 +Subproject commit e8dc561807e68b65ce55e32292912c356f3e56c8 diff --git a/thirdparty/PowerRecomp b/thirdparty/PowerRecomp index 675b482e..ea3e60cb 160000 --- a/thirdparty/PowerRecomp +++ b/thirdparty/PowerRecomp @@ -1 +1 @@ -Subproject commit 675b482ec4852b873590fb999d24b426bade2b3a +Subproject commit ea3e60cb0d618ec8d24cc745d72b1ac39cc722cc