thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 05:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

achievements_menu: improve animation accuracy

Browse source
This commit is contained in:
Hyper 2024-11-30 23:14:13 +00:00
parent 279c64c0e0
commit e04c36a0d0
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UnleashedRecomp/patches/ui/CHudPause_patches.cpp
View file

@ -8,7 +8,7 @@
float g_achievementMenuIntroTime = 0.0f; float g_achievementMenuIntroTime = 0.0f;
constexpr float g_achievementMenuIntroThreshold = 3.0f; constexpr float g_achievementMenuIntroThreshold = 3.0f;
float g_achievementMenuOutroTime = 0.0f; float g_achievementMenuOutroTime = 0.0f;
constexpr float g_achievementMenuOutroThreshold = 0.53f; constexpr float g_achievementMenuOutroThreshold = 0.42f;
bool g_isAchievementMenuOutro = false; bool g_isAchievementMenuOutro = false;
void CHudPauseAddOptionsItemMidAsmHook(PPCRegister& pThis) void CHudPauseAddOptionsItemMidAsmHook(PPCRegister& pThis)

28
UnleashedRecomp/ui/achievement_menu.cpp
View file

@ -9,8 +9,14 @@
#include <app.h> #include <app.h>
#include <exports.h> #include <exports.h>
constexpr double HEADER_CONTAINER_COMMON_MOTION_START = 0; constexpr double HEADER_CONTAINER_INTRO_MOTION_START = 0;
constexpr double HEADER_CONTAINER_COMMON_MOTION_END = 16; constexpr double HEADER_CONTAINER_INTRO_MOTION_END = 15;
constexpr double HEADER_CONTAINER_OUTRO_MOTION_START = 0;
constexpr double HEADER_CONTAINER_OUTRO_MOTION_END = 40;
constexpr double HEADER_CONTAINER_INTRO_FADE_START = 5;
constexpr double HEADER_CONTAINER_INTRO_FADE_END = 14;
constexpr double HEADER_CONTAINER_OUTRO_FADE_START = 0;
constexpr double HEADER_CONTAINER_OUTRO_FADE_END = 7;
constexpr double CONTENT_CONTAINER_COMMON_MOTION_START = 11; constexpr double CONTENT_CONTAINER_COMMON_MOTION_START = 11;
constexpr double CONTENT_CONTAINER_COMMON_MOTION_END = 12; constexpr double CONTENT_CONTAINER_COMMON_MOTION_END = 12;
@ -110,19 +116,25 @@ static void DrawHeaderContainer(const char* text)
auto cornerRadius = 23; auto cornerRadius = 23;
auto textMarginX = Scale(16) + (Scale(cornerRadius) / 2); auto textMarginX = Scale(16) + (Scale(cornerRadius) / 2);
auto motion = ComputeMotion(g_appearTime, HEADER_CONTAINER_COMMON_MOTION_START, HEADER_CONTAINER_COMMON_MOTION_END); auto containerMotion = g_isClosing
? ComputeMotion(g_appearTime, HEADER_CONTAINER_OUTRO_MOTION_START, HEADER_CONTAINER_OUTRO_MOTION_END)
: ComputeMotion(g_appearTime, HEADER_CONTAINER_INTRO_MOTION_START, HEADER_CONTAINER_INTRO_MOTION_END);
auto colourMotion = g_isClosing
? ComputeMotion(g_appearTime, HEADER_CONTAINER_OUTRO_FADE_START, HEADER_CONTAINER_OUTRO_FADE_END)
: ComputeMotion(g_appearTime, HEADER_CONTAINER_INTRO_FADE_START, HEADER_CONTAINER_INTRO_FADE_END);
// Slide animation. // Slide animation.
auto containerMarginX = g_isClosing auto containerMarginX = g_isClosing
? Hermite(256, 156, motion) ? Hermite(256, 156, containerMotion)
: Hermite(156, 256, motion); : Hermite(156, 256, containerMotion);
// Transparency fade animation. // Transparency fade animation.
auto alpha = g_isClosing auto alpha = g_isClosing
? Hermite(1, 0, motion) ? Lerp(1, 0, colourMotion)
: Hermite(0, 1, motion); : Lerp(0, 1, colourMotion);
ImVec2 min = { Scale(containerMarginX), Scale(138)}; ImVec2 min = { Scale(containerMarginX), Scale(138) };
ImVec2 max = { min.x + textMarginX * 2 + textSize.x, Scale(185) }; ImVec2 max = { min.x + textMarginX * 2 + textSize.x, Scale(185) };
DrawContainer(min, max, IM_COL32(140, 142, 140, 201), IM_COL32(66, 65, 66, 234), alpha, cornerRadius); DrawContainer(min, max, IM_COL32(140, 142, 140, 201), IM_COL32(66, 65, 66, 234), alpha, cornerRadius);