github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Achievements: Use new badge_url/badge_locked_url fields

Browse Source
This commit is contained in:
Stenzek 2025-04-10 21:24:08 +10:00
parent 4708a8fda4
commit 6165b504b8
No known key found for this signature in database
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/achievements.cpp
View File

@ -150,7 +150,7 @@ static void BeginLoadGame();
static void UpdateGameSummary(bool update_progress_database, bool force_update_progress_database); static void UpdateGameSummary(bool update_progress_database, bool force_update_progress_database);
static std::string GetLocalImagePath(const std::string_view image_name, int type); static std::string GetLocalImagePath(const std::string_view image_name, int type);
static void DownloadImage(std::string url, std::string cache_path); static void DownloadImage(std::string url, std::string cache_path);
static const std::string& GetCachedAchievementBadgePath(const rc_client_achievement_t* achievement, int state); static const std::string& GetCachedAchievementBadgePath(const rc_client_achievement_t* achievement, bool locked);
static void UpdateGlyphRanges(); static void UpdateGlyphRanges();
static TinyString DecryptLoginToken(std::string_view encrypted_token, std::string_view username); static TinyString DecryptLoginToken(std::string_view encrypted_token, std::string_view username);
@ -274,7 +274,7 @@ struct State
rc_client_async_handle_t* load_game_request = nullptr; rc_client_async_handle_t* load_game_request = nullptr;
rc_client_achievement_list_t* achievement_list = nullptr; rc_client_achievement_list_t* achievement_list = nullptr;
std::vector<std::tuple<const void*, int, std::string>> achievement_badge_paths; std::vector<std::tuple<const void*, std::string, bool>> achievement_badge_paths;
std::optional<PauseMenuAchievementInfo> most_recent_unlock = {}; std::optional<PauseMenuAchievementInfo> most_recent_unlock = {};
std::optional<PauseMenuAchievementInfo> achievement_nearest_completion = {}; std::optional<PauseMenuAchievementInfo> achievement_nearest_completion = {};
@ -1095,7 +1095,7 @@ void Achievements::UpdateRecentUnlockAndAlmostThere()
info->title = achievement->title; info->title = achievement->title;
info->description = achievement->description; info->description = achievement->description;
info->badge_path = GetAchievementBadgePath(achievement, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, true); info->badge_path = GetAchievementBadgePath(achievement, false);
}; };
cache_info(most_recent_unlock, s_state.most_recent_unlock); cache_info(most_recent_unlock, s_state.most_recent_unlock);
@ -1506,7 +1506,7 @@ void Achievements::HandleUnlockEvent(const rc_client_event_t* event)
else else
title = cheevo->title; title = cheevo->title;
std::string badge_path = GetAchievementBadgePath(cheevo, cheevo->state); std::string badge_path = GetAchievementBadgePath(cheevo, false);
GPUThread::RunOnThread([id = cheevo->id, duration = g_settings.achievements_notification_duration, GPUThread::RunOnThread([id = cheevo->id, duration = g_settings.achievements_notification_duration,
title = std::move(title), description = std::string(cheevo->description), title = std::move(title), description = std::string(cheevo->description),
@ -1711,9 +1711,9 @@ void Achievements::HandleAchievementChallengeIndicatorShowEvent(const rc_client_
return; return;
} }
s_state.active_challenge_indicators.push_back(AchievementChallengeIndicator{ s_state.active_challenge_indicators.push_back(
.achievement = event->achievement, AchievementChallengeIndicator{.achievement = event->achievement,
.badge_path = GetAchievementBadgePath(event->achievement, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED), .badge_path = GetAchievementBadgePath(event->achievement, false),
.opacity = 0.0f, .opacity = 0.0f,
.active = true}); .active = true});
@ -1741,8 +1741,7 @@ void Achievements::HandleAchievementProgressIndicatorShowEvent(const rc_client_e
s_state.active_progress_indicator.emplace(); s_state.active_progress_indicator.emplace();
s_state.active_progress_indicator->achievement = event->achievement; s_state.active_progress_indicator->achievement = event->achievement;
s_state.active_progress_indicator->badge_path = s_state.active_progress_indicator->badge_path = GetAchievementBadgePath(event->achievement, false);
GetAchievementBadgePath(event->achievement, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED);
s_state.active_progress_indicator->opacity = 0.0f; s_state.active_progress_indicator->opacity = 0.0f;
s_state.active_progress_indicator->active = true; s_state.active_progress_indicator->active = true;
} }
@ -1959,35 +1958,33 @@ bool Achievements::DoState(StateWrapper& sw)
} }
} }
std::string Achievements::GetAchievementBadgePath(const rc_client_achievement_t* achievement, int state, std::string Achievements::GetAchievementBadgePath(const rc_client_achievement_t* achievement, bool locked,
bool download_if_missing) bool download_if_missing)
{ {
const std::string path = GetLocalImagePath(achievement->badge_name, (state == RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED) ? const std::string path =
RC_IMAGE_TYPE_ACHIEVEMENT : GetLocalImagePath(achievement->badge_name, locked ? RC_IMAGE_TYPE_ACHIEVEMENT_LOCKED : RC_IMAGE_TYPE_ACHIEVEMENT);
RC_IMAGE_TYPE_ACHIEVEMENT_LOCKED);
if (download_if_missing && !path.empty() && !FileSystem::FileExists(path.c_str())) if (download_if_missing && !path.empty() && !FileSystem::FileExists(path.c_str()))
{ {
char buf[URL_BUFFER_SIZE]; const std::string_view url = locked ? achievement->badge_locked_url : achievement->badge_url;
const int res = rc_client_achievement_get_image_url(achievement, state, buf, std::size(buf)); if (url.empty())
if (res == RC_OK) ReportFmtError("Acheivement {} with badge name {} has no badge URL", achievement->id, achievement->badge_name);
DownloadImage(buf, path);
else else
ReportRCError(res, "rc_client_achievement_get_image_url() for {} failed", achievement->title); DownloadImage(std::string(url), path);
} }
return path; return path;
} }
const std::string& Achievements::GetCachedAchievementBadgePath(const rc_client_achievement_t* achievement, int state) const std::string& Achievements::GetCachedAchievementBadgePath(const rc_client_achievement_t* achievement, bool locked)
{ {
for (const auto& [l_cheevo, l_state, l_path] : s_state.achievement_badge_paths) for (const auto& [l_cheevo, l_path, l_state] : s_state.achievement_badge_paths)
{ {
if (l_cheevo == achievement && l_state == state) if (l_cheevo == achievement && l_state == locked)
return l_path; return l_path;
} }
std::string path = GetAchievementBadgePath(achievement, state); std::string path = GetAchievementBadgePath(achievement, locked);
return std::get<2>(s_state.achievement_badge_paths.emplace_back(achievement, state, std::move(path))); return std::get<1>(s_state.achievement_badge_paths.emplace_back(achievement, std::move(path), locked));
} }
std::string Achievements::GetLeaderboardUserBadgePath(const rc_client_leaderboard_entry_t* entry) std::string Achievements::GetLeaderboardUserBadgePath(const rc_client_leaderboard_entry_t* entry)
@ -2964,7 +2961,8 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)
if (!visible) if (!visible)
return; return;
const std::string& badge_path = GetCachedAchievementBadgePath(cheevo, cheevo->state); const std::string& badge_path =
GetCachedAchievementBadgePath(cheevo, cheevo->state != RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED);
const ImVec2 image_size( const ImVec2 image_size(
LayoutScale(ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT, ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT)); LayoutScale(ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT, ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT));

2
src/core/achievements_private.h
View File

@ -14,7 +14,7 @@ rc_client_t* GetClient();
const rc_client_user_game_summary_t& GetGameSummary(); const rc_client_user_game_summary_t& GetGameSummary();
std::string GetAchievementBadgePath(const rc_client_achievement_t* achievement, int state, std::string GetAchievementBadgePath(const rc_client_achievement_t* achievement, bool locked,
bool download_if_missing = true); bool download_if_missing = true);
std::string GetLeaderboardUserBadgePath(const rc_client_leaderboard_entry_t* entry); std::string GetLeaderboardUserBadgePath(const rc_client_leaderboard_entry_t* entry);