lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-05-03 08:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added base FPS to the FPS overlay when using FG

Browse Source
This commit is contained in:
cdozdil
2026-04-30 00:26:40 +03:00
parent 3473560320
commit b74c88f4f1
1 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/menu/menu_common.cpp
+51 -1
View File
@@ -2145,38 +2145,88 @@ bool MenuCommon::RenderMenu()
// Prepare Line 1
if (config->FpsOverlayType.value_or_default() == FpsOverlay_JustFPS)
{
if (fg != nullptr && fg->IsActive() && !fg->IsPaused())
{
firstLine = StrFmt("%s | FPS: %6.1f/%5.1f %s", api.c_str(), frameRate,
frameRate / (float) (fg->GetInterpolatedFrameCount() + 1), fgText.c_str());
}
else
{
firstLine = StrFmt("%s | FPS: %6.1f %s", api.c_str(), frameRate, fgText.c_str());
}
}
else if (config->FpsOverlayType.value_or_default() == FpsOverlay_Simple)
{
if (currentFeature != nullptr && !currentFeature->IsFrozen())
{
if (fg != nullptr && fg->IsActive() && !fg->IsPaused())
{
firstLine = StrFmt("%s | FPS: %6.1f/%5.1f, %7.2f ms %s | %s -> %s %u.%u.%u", api.c_str(),
frameRate, frameRate / (float) (fg->GetInterpolatedFrameCount() + 1),
frameTime, fgText.c_str(), state.currentInputApiName.c_str(),
currentFeature->Name().c_str(), currentFeature->Version().major,
currentFeature->Version().minor, currentFeature->Version().patch);
}
else
{
firstLine = StrFmt("%s | FPS: %6.1f, %7.2f ms %s | %s -> %s %u.%u.%u", api.c_str(), frameRate,
frameTime, fgText.c_str(), state.currentInputApiName.c_str(),
currentFeature->Name().c_str(), currentFeature->Version().major,
currentFeature->Version().minor, currentFeature->Version().patch);
}
}
else
{
if (fg != nullptr && fg->IsActive() && !fg->IsPaused())
{
firstLine = StrFmt("%s | FPS: %6.1f/%5.1f, %7.2f ms %s", api.c_str(), frameRate,
frameRate / (float) (fg->GetInterpolatedFrameCount() + 1), frameTime,
fgText.c_str());
}
else
{
firstLine =
StrFmt("%s | FPS: %6.1f, %7.2f ms %s", api.c_str(), frameRate, frameTime, fgText.c_str());
}
}
}
else
{
if (currentFeature != nullptr && !currentFeature->IsFrozen())
{
firstLine = StrFmt("%s | FPS: %6.1f, Avg: %6.1f %s | %s -> %s %u.%u.%u", api.c_str(), frameRate,
if (fg != nullptr && fg->IsActive() && !fg->IsPaused())
{
firstLine =
StrFmt("%s | FPS: %6.1f/%5.1f, Avg: %6.1f %s | %s -> %s %u.%u.%u", api.c_str(), frameRate,
frameRate / (float) (fg->GetInterpolatedFrameCount() + 1),
1000.0f / averageFrameTime, fgText.c_str(), state.currentInputApiName.c_str(),
currentFeature->Name().c_str(), currentFeature->Version().major,
currentFeature->Version().minor, currentFeature->Version().patch);
}
else
{
firstLine =
StrFmt("%s | FPS: %6.1f, Avg: %6.1f %s | %s -> %s %u.%u.%u", api.c_str(), frameRate,
1000.0f / averageFrameTime, fgText.c_str(), state.currentInputApiName.c_str(),
currentFeature->Name().c_str(), currentFeature->Version().major,
currentFeature->Version().minor, currentFeature->Version().patch);
}
}
else
{
if (fg != nullptr && fg->IsActive() && !fg->IsPaused())
{
firstLine = StrFmt("%s | FPS: %6.1f/%5.1f, Avg: %6.1f %s", api.c_str(), frameRate,
frameRate / (float) (fg->GetInterpolatedFrameCount() + 1),
1000.0f / averageFrameTime, fgText.c_str());
}
else
{
firstLine = StrFmt("%s | FPS: %6.1f, Avg: %6.1f %s", api.c_str(), frameRate,
1000.0f / averageFrameTime, fgText.c_str());
}
}
}
// Prepare Line 2
if (config->FpsOverlayType.value_or_default() >= FpsOverlay_Detailed)