ImGuiManager: Add CompactFontRange()

This commit is contained in:
Stenzek 2024-08-25 23:39:14 +10:00
parent e8b787fb57
commit a7f3d7b02d
No known key found for this signature in database
3 changed files with 150 additions and 0 deletions

View File

@ -49,6 +49,7 @@
#include <ctime> #include <ctime>
#include <functional> #include <functional>
#include <string> #include <string>
#include <unordered_set>
#include <vector> #include <vector>
Log_SetChannel(Achievements); Log_SetChannel(Achievements);
@ -138,6 +139,7 @@ static void BeginChangeDisc();
static void UpdateGameSummary(); static void UpdateGameSummary();
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_filename); static void DownloadImage(std::string url, std::string cache_filename);
static void UpdateGlyphRanges();
static bool CreateClient(rc_client_t** client, std::unique_ptr<HTTPDownloader>* http); static bool CreateClient(rc_client_t** client, std::unique_ptr<HTTPDownloader>* http);
static void DestroyClient(rc_client_t** client, std::unique_ptr<HTTPDownloader>* http); static void DestroyClient(rc_client_t** client, std::unique_ptr<HTTPDownloader>* http);
@ -356,6 +358,101 @@ void Achievements::DownloadImage(std::string url, std::string cache_filename)
s_http_downloader->CreateRequest(std::move(url), std::move(callback)); s_http_downloader->CreateRequest(std::move(url), std::move(callback));
} }
void Achievements::UpdateGlyphRanges()
{
// To avoid rasterizing all emoji fonts, we get the set of used glyphs in the emoji range for all strings in the
// current game's achievement data.
using CodepointSet = std::unordered_set<ImGuiManager::WCharType>;
CodepointSet codepoints;
static constexpr auto add_string = [](const std::string_view str, CodepointSet& codepoints) {
char32_t codepoint;
for (size_t offset = 0; offset < str.length();)
{
offset += StringUtil::DecodeUTF8(str, offset, &codepoint);
// Basic Latin + Latin Supplement always included.
if (codepoint != StringUtil::UNICODE_REPLACEMENT_CHARACTER && codepoint >= 0x2000)
codepoints.insert(static_cast<ImGuiManager::WCharType>(codepoint));
}
};
if (rc_client_has_rich_presence(s_client))
{
std::vector<const char*> rp_strings;
for (;;)
{
rp_strings.resize(std::max<size_t>(rp_strings.size() * 2, 512));
size_t count;
const int err = rc_client_get_rich_presence_strings(s_client, rp_strings.data(), rp_strings.size(), &count);
if (err == RC_INSUFFICIENT_BUFFER)
continue;
else if (err != RC_OK)
rp_strings.clear();
else
rp_strings.resize(count);
break;
}
for (const char* str : rp_strings)
add_string(str, codepoints);
}
if (rc_client_has_achievements(s_client))
{
rc_client_achievement_list_t* const achievements =
rc_client_create_achievement_list(s_client, RC_CLIENT_ACHIEVEMENT_CATEGORY_CORE_AND_UNOFFICIAL, 0);
if (achievements)
{
for (u32 i = 0; i < achievements->num_buckets; i++)
{
const rc_client_achievement_bucket_t& bucket = achievements->buckets[i];
for (u32 j = 0; j < bucket.num_achievements; j++)
{
const rc_client_achievement_t* achievement = bucket.achievements[j];
if (achievement->title)
add_string(achievement->title, codepoints);
if (achievement->description)
add_string(achievement->description, codepoints);
}
}
rc_client_destroy_achievement_list(achievements);
}
}
if (rc_client_has_leaderboards(s_client))
{
rc_client_leaderboard_list_t* const leaderboards =
rc_client_create_leaderboard_list(s_client, RC_CLIENT_LEADERBOARD_LIST_GROUPING_NONE);
if (leaderboards)
{
for (u32 i = 0; i < leaderboards->num_buckets; i++)
{
const rc_client_leaderboard_bucket_t& bucket = leaderboards->buckets[i];
for (u32 j = 0; j < bucket.num_leaderboards; j++)
{
const rc_client_leaderboard_t* leaderboard = bucket.leaderboards[j];
if (leaderboard->title)
add_string(leaderboard->title, codepoints);
if (leaderboard->description)
add_string(leaderboard->description, codepoints);
}
}
rc_client_destroy_leaderboard_list(leaderboards);
}
}
std::vector<ImGuiManager::WCharType> sorted_codepoints;
sorted_codepoints.reserve(codepoints.size());
sorted_codepoints.insert(sorted_codepoints.begin(), codepoints.begin(), codepoints.end());
std::sort(sorted_codepoints.begin(), sorted_codepoints.end());
// Compact codepoints to ranges.
ImGuiManager::SetEmojiFontRange(ImGuiManager::CompactFontRange(sorted_codepoints));
}
bool Achievements::IsActive() bool Achievements::IsActive()
{ {
#ifdef ENABLE_RAINTEGRATION #ifdef ENABLE_RAINTEGRATION
@ -583,6 +680,7 @@ bool Achievements::Shutdown(bool allow_cancel)
ClearGameInfo(); ClearGameInfo();
ClearGameHash(); ClearGameHash();
DisableHardcoreMode(); DisableHardcoreMode();
UpdateGlyphRanges();
if (s_load_game_request) if (s_load_game_request)
{ {
@ -906,6 +1004,7 @@ void Achievements::BeginLoadGame()
} }
DisableHardcoreMode(); DisableHardcoreMode();
UpdateGlyphRanges();
return; return;
} }
@ -934,6 +1033,7 @@ void Achievements::BeginChangeDisc()
ClearGameInfo(); ClearGameInfo();
DisableHardcoreMode(); DisableHardcoreMode();
UpdateGlyphRanges();
return; return;
} }
@ -953,7 +1053,10 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
// Unknown game. // Unknown game.
INFO_LOG("Unknown game '{}', disabling achievements.", s_game_hash); INFO_LOG("Unknown game '{}', disabling achievements.", s_game_hash);
if (was_disc_change) if (was_disc_change)
{
ClearGameInfo(); ClearGameInfo();
UpdateGlyphRanges();
}
DisableHardcoreMode(); DisableHardcoreMode();
return; return;
@ -968,7 +1071,10 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
{ {
ReportFmtError("Loading game failed: {}", error_message); ReportFmtError("Loading game failed: {}", error_message);
if (was_disc_change) if (was_disc_change)
{
ClearGameInfo(); ClearGameInfo();
UpdateGlyphRanges();
}
DisableHardcoreMode(); DisableHardcoreMode();
return; return;
@ -986,7 +1092,10 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
{ {
ReportError("rc_client_get_game_info() returned NULL"); ReportError("rc_client_get_game_info() returned NULL");
if (was_disc_change) if (was_disc_change)
{
ClearGameInfo(); ClearGameInfo();
UpdateGlyphRanges();
}
DisableHardcoreMode(); DisableHardcoreMode();
return; return;
@ -1012,6 +1121,9 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
s_has_leaderboards = has_leaderboards; s_has_leaderboards = has_leaderboards;
s_has_rich_presence = rc_client_has_rich_presence(client); s_has_rich_presence = rc_client_has_rich_presence(client);
// update ranges before initializing fsui
UpdateGlyphRanges();
// ensure fullscreen UI is ready for notifications // ensure fullscreen UI is ready for notifications
if (display_summary) if (display_summary)
FullscreenUI::Initialize(); FullscreenUI::Initialize();
@ -1850,7 +1962,10 @@ void Achievements::Logout()
const auto lock = GetLock(); const auto lock = GetLock();
if (HasActiveGame()) if (HasActiveGame())
{
ClearGameInfo(); ClearGameInfo();
UpdateGlyphRanges();
}
INFO_LOG("Logging out..."); INFO_LOG("Logging out...");
rc_client_logout(s_client); rc_client_logout(s_client);

View File

@ -159,6 +159,38 @@ void ImGuiManager::SetEmojiFontRange(std::vector<WCharType> range)
ReloadFontDataIfActive(); ReloadFontDataIfActive();
} }
std::vector<ImGuiManager::WCharType> ImGuiManager::CompactFontRange(std::span<const WCharType> range)
{
std::vector<ImWchar> ret;
for (auto it = range.begin(); it != range.end();)
{
auto next_it = it;
++next_it;
// Combine sequential ranges.
const ImWchar start_codepoint = *it;
ImWchar end_codepoint = start_codepoint;
while (next_it != range.end())
{
const ImWchar next_codepoint = *next_it;
if (next_codepoint != (end_codepoint + 1))
break;
// Yep, include it.
end_codepoint = next_codepoint;
++next_it;
}
ret.push_back(start_codepoint);
ret.push_back(end_codepoint);
it = next_it;
}
return ret;
}
void ImGuiManager::SetGlobalScale(float global_scale) void ImGuiManager::SetGlobalScale(float global_scale)
{ {
if (s_global_prescale == global_scale) if (s_global_prescale == global_scale)

View File

@ -26,6 +26,9 @@ void SetFontPathAndRange(std::string path, std::vector<WCharType> range);
/// Should NOT be terminated with zeros, unlike the font range above. /// Should NOT be terminated with zeros, unlike the font range above.
void SetEmojiFontRange(std::vector<WCharType> range); void SetEmojiFontRange(std::vector<WCharType> range);
/// Returns a compacted font range, with adjacent glyphs merged into one pair.
std::vector<WCharType> CompactFontRange(std::span<const WCharType> range);
/// Changes the global scale. /// Changes the global scale.
void SetGlobalScale(float global_scale); void SetGlobalScale(float global_scale);