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

Adjust frame profiler graph to be more readable.

Browse source
This commit is contained in:
Unknown W. Brackets 2015-05-27 19:45:33 -07:00
parent 4d4d188a94
commit 41d54cbcbc
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
UI/DevScreens.cpp
View file

@ -788,19 +788,19 @@ static const uint32_t nice_colors[] = {
0xFFFF40, 0xFFFF40,
0x40FFFF, 0x40FFFF,
0xFF40FF, 0xFF70FF,
0xc0c0c0, 0xc0c0c0,
0x8040c0, 0xb040c0,
0x990099, 0x184099,
0xCC3333, 0xCC3333,
0xFF99CC, 0xFF99CC,
0x3399CC, 0x3399CC,
0x003366,
0x990000, 0x990000,
0x33FFFF, 0x003366,
0xF8F8F8, 0xF8F8F8,
0x33FFFF,
}; };
void DrawProfile(UIContext &ui) { void DrawProfile(UIContext &ui) {
@ -808,7 +808,7 @@ void DrawProfile(UIContext &ui) {
int numCategories = Profiler_GetNumCategories(); int numCategories = Profiler_GetNumCategories();
int historyLength = Profiler_GetHistoryLength(); int historyLength = Profiler_GetHistoryLength();
float legendWidth = 100.0f; float legendWidth = 80.0f;
for (int i = 0; i < numCategories; i++) { for (int i = 0; i < numCategories; i++) {
const char *name = Profiler_GetCategoryName(i); const char *name = Profiler_GetCategoryName(i);
float w = 0.0f, h = 0.0f; float w = 0.0f, h = 0.0f;
@ -817,11 +817,13 @@ void DrawProfile(UIContext &ui) {
legendWidth = w; legendWidth = w;
} }
} }
legendWidth += 20.0f;
float legendStartY = ui.GetBounds().centerY(); float rowH = 30.0f;
float legendHeight = rowH * numCategories;
float legendStartY = legendHeight > ui.GetBounds().centerY() ? ui.GetBounds().y2() - legendHeight : ui.GetBounds().centerY();
float legendStartX = ui.GetBounds().x2() - std::min(legendWidth, 200.0f); float legendStartX = ui.GetBounds().x2() - std::min(legendWidth, 200.0f);
float rowH = 30;
const uint32_t opacity = 140 << 24; const uint32_t opacity = 140 << 24;
for (int i = 0; i < numCategories; i++) { for (int i = 0; i < numCategories; i++) {
@ -833,7 +835,7 @@ void DrawProfile(UIContext &ui) {
ui.DrawTextShadow(name, legendStartX + rowH + 2, y, 0xFFFFFFFF, ALIGN_VBASELINE); ui.DrawTextShadow(name, legendStartX + rowH + 2, y, 0xFFFFFFFF, ALIGN_VBASELINE);
} }
float graphWidth = ui.GetBounds().x2() - 120; float graphWidth = ui.GetBounds().x2() - legendWidth - 20.0f;
float graphHeight = ui.GetBounds().h * 0.8f; float graphHeight = ui.GetBounds().h * 0.8f;
std::vector<float> history; std::vector<float> history;
@ -878,12 +880,14 @@ void DrawProfile(UIContext &ui) {
if (area) if (area)
col = opacity | (col & 0xFFFFFF); col = opacity | (col & 0xFFFFFF);
UI::Drawable color(col); UI::Drawable color(col);
UI::Drawable outline(opacity | 0xFFFFFF);
if (area) { if (area) {
for (int n = 0; n < historyLength; n++) { for (int n = 0; n < historyLength; n++) {
float val = history[n]; float val = history[n];
float valY1 = ui.GetBounds().y2() - 10 - (val + total[n]) * scale; float valY1 = ui.GetBounds().y2() - 10 - (val + total[n]) * scale;
float valY2 = ui.GetBounds().y2() - 10 - total[n] * scale; float valY2 = ui.GetBounds().y2() - 10 - total[n] * scale;
ui.FillRect(outline, Bounds(x, valY1, dx, valY2 - valY1 + 0.5f));
ui.FillRect(color, Bounds(x, valY1, dx, valY2 - valY1)); ui.FillRect(color, Bounds(x, valY1, dx, valY2 - valY1));
x += dx; x += dx;
total[n] += val; total[n] += val;