From 4f68703cfdc3b0979f316a7fc1f60974c7875d3b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 29 Jun 2013 19:57:25 -0700 Subject: [PATCH] Rename "VPS"/"FPS" to "Speed"/"FPES" so it's clear. Still scaled to 60, but could change to 100 instead? "FPES" is "frames per emulated second." Or we could change it instead... --- Core/Reporting.cpp | 1 + UI/EmuScreen.cpp | 6 +++--- UI/MenuScreens.cpp | 47 +++++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 32f22b8d17..28829f88b7 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -216,6 +216,7 @@ namespace Reporting float vps, fps; __DisplayGetAveragedFPS(&vps, &fps); postdata.Add("vps", vps); + postdata.Add("fps", fps); } // TODO: Settings, savestate/savedata status, some measure of speed/fps? diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 8644094ab7..75be762f4c 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -356,11 +356,11 @@ void EmuScreen::render() { char fpsbuf[256]; switch (g_Config.iShowFPSCounter) { case 1: - sprintf(fpsbuf, "VPS: %0.1f", vps); break; + sprintf(fpsbuf, "Speed: %0.1f", vps); break; case 2: - sprintf(fpsbuf, "FPS: %0.1f", fps); break; + sprintf(fpsbuf, "FPES: %0.1f", fps); break; case 3: - sprintf(fpsbuf, "VPS: %0.1f\nFPS: %0.1f", vps, fps); break; + sprintf(fpsbuf, "Speed: %5.1f\nFPES: %0.1f", vps, fps); break; } ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 8, 12, 0xc0000000, ALIGN_TOPRIGHT); ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 10, 10, 0xFF3fFF3f, ALIGN_TOPRIGHT); diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 45b1e3a8fc..79dea2d3fc 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -967,27 +967,32 @@ void GraphicsScreenP3::render() { int columnw = 400; bool ShowCounter = g_Config.iShowFPSCounter > 0; - UICheckBox(GEN_ID, x, y += stride, gs->T("Show VPS/FPS"), ALIGN_TOPLEFT, &ShowCounter); + UICheckBox(GEN_ID, x, y += stride, gs->T("Show speed / frames per emusecond"), ALIGN_TOPLEFT, &ShowCounter); if (ShowCounter) { +#ifdef _WIN32 + const int checkboxH = 32; +#else + const int checkboxH = 48; +#endif + ui_draw2d.DrawTextShadow(UBUNTU24, gs->T("(60.0 is full speed, FPES depends on game)"), x + UI_SPACE + 29, (y += stride) + checkboxH / 2, 0xFFFFFFFF, ALIGN_LEFT | ALIGN_VCENTER); + if (g_Config.iShowFPSCounter <= 0) g_Config.iShowFPSCounter = 1; - char counter[256]; - std::string type; - + const char *type; switch (g_Config.iShowFPSCounter) { - case 1: type = "VPS";break; - case 2: type = "FPS";break; - case 3: type = "Both";break; + case 1: type = gs->T("Display: Speed"); break; + case 2: type = gs->T("Display: FPES"); break; + case 3: type = gs->T("Display: Both"); break; } - sprintf(counter, "%s %s", gs->T("Format :"), type.c_str()); - ui_draw2d.DrawText(UBUNTU24, counter, x + 60, y += stride , 0xFFFFFFFF, ALIGN_LEFT); - HLinear hlinear1(x + 250, y, 20); - if (UIButton(GEN_ID, hlinear1, 80, 0, gs->T("VPS"), ALIGN_LEFT)) + + ui_draw2d.DrawText(UBUNTU24, type, x + 60, y += stride , 0xFFFFFFFF, ALIGN_LEFT); + HLinear hlinear1(x + 260, y, 20); + if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("Speed"), ALIGN_LEFT)) g_Config.iShowFPSCounter = 1; - if (UIButton(GEN_ID, hlinear1, 80, 0, gs->T("FPS"), ALIGN_LEFT)) + if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("FPES"), ALIGN_LEFT)) g_Config.iShowFPSCounter = 2; - if (UIButton(GEN_ID, hlinear1, 90, 0, gs->T("Both"), ALIGN_LEFT)) + if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("Both"), ALIGN_LEFT)) g_Config.iShowFPSCounter = 3; y += 20; @@ -995,22 +1000,22 @@ void GraphicsScreenP3::render() { g_Config.iShowFPSCounter = 0; bool FpsLimit = g_Config.iFpsLimit != 0; - UICheckBox(GEN_ID, x, y += stride, gs->T("FPS Limit"), ALIGN_TOPLEFT, &FpsLimit); + UICheckBox(GEN_ID, x, y += stride, gs->T("Toggled Speed Limit"), ALIGN_TOPLEFT, &FpsLimit); if (FpsLimit) { if (g_Config.iFpsLimit == 0) g_Config.iFpsLimit = 60; char showFps[256]; - sprintf(showFps, "%s %d", gs->T("FPS :"), g_Config.iFpsLimit); + sprintf(showFps, "%s %d", gs->T("Speed :"), g_Config.iFpsLimit); ui_draw2d.DrawText(UBUNTU24, showFps, x + 60, y += stride , 0xFFFFFFFF, ALIGN_LEFT); - HLinear hlinear1(x + 250, y, 20); - if (UIButton(GEN_ID, hlinear1, 80, 0, gs->T("Auto"), ALIGN_LEFT)) + HLinear hlinear1(x + 260, y, 20); + if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("Auto"), ALIGN_LEFT)) g_Config.iFpsLimit = 60; - if (UIButton(GEN_ID, hlinear1, 40, 0, gs->T("-1"), ALIGN_LEFT)) - if(g_Config.iFpsLimit > 30) + if (UIButton(GEN_ID, hlinear1, 50, 0, gs->T("-1"), ALIGN_LEFT)) + if(g_Config.iFpsLimit > 10) g_Config.iFpsLimit -= 1; - if (UIButton(GEN_ID, hlinear1, 40, 0, gs->T("+1"), ALIGN_LEFT)) - if(g_Config.iFrameSkip != 120) + if (UIButton(GEN_ID, hlinear1, 50, 0, gs->T("+1"), ALIGN_LEFT)) + if(g_Config.iFrameSkip < 240) g_Config.iFpsLimit += 1; y += 20;