Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #653 from unknownbrackets/fps

Browse source 
Put FPS on the right side to prevent overlap
This commit is contained in:
Henrik Rydgård 2013-02-11 00:55:10 -08:00
commit b33c94ab93
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/HLE/sceDisplay.cpp
View file

@ -242,9 +242,9 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
float zoom = 0.3f; /// g_Config.iWindowZoom;
float soff = 0.3f;
PPGeBegin();
PPGeDrawText(stats, soff, soff, 0, zoom, 0xCC000000);
PPGeDrawText(stats, -soff, -soff, 0, zoom, 0xCC000000);
PPGeDrawText(stats, 0, 0, 0, zoom, 0xFFFFFFFF);
PPGeDrawText(stats, 478.0f + soff, soff, PPGE_ALIGN_RIGHT, zoom, 0xCC000000);
PPGeDrawText(stats, 478.0f + -soff, -soff, PPGE_ALIGN_RIGHT, zoom, 0xCC000000);
PPGeDrawText(stats, 478.0f + 0.0f, 0, PPGE_ALIGN_RIGHT, zoom, 0xFFFFFFFF);
PPGeEnd();
}
}

5
Core/Util/PPGeDraw.cpp
View file

@ -249,16 +249,17 @@ static void PPGeMeasureText(const char *text, float scale, float *w, float *h) {
float maxw = 0;
int lines = 1;
while ((cval = *text++) != '\0') {
if (cval < 32) continue;
if (cval > 127) continue;
if (cval == '\n') {
if (wacc > maxw) maxw = wacc;
wacc = 0;
lines++;
}
if (cval < 32) continue;
if (cval > 127) continue;
AtlasChar c = atlasfont.chars[cval - 32];
wacc += c.wx * scale;
}
if (wacc > maxw) maxw = wacc;
if (w) *w = maxw;
if (h) *h = atlasfont.height * scale * lines;
}