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

Eliminate some magic numbers, and make several functions more consistent with each other.

Browse source
This commit is contained in:
The Dax 2013-09-19 21:18:26 -04:00
parent b717e41909
commit 3eedc9cb6d
2 changed files with 45 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Windows/WndMainWindow.cpp
View file

@ -232,11 +232,10 @@ namespace MainWindow
} }
void SetInternalResolution(int res = -1) { void SetInternalResolution(int res = -1) {
const int MAX_ZOOM = 10; if (res >= 0 && res <= RESOLUTION_MAX)
if (res >= 0 && res <= MAX_ZOOM)
g_Config.iInternalResolution = res; g_Config.iInternalResolution = res;
else { else {
if (++g_Config.iInternalResolution > MAX_ZOOM) if (++g_Config.iInternalResolution > RESOLUTION_MAX)
g_Config.iInternalResolution = 0; g_Config.iInternalResolution = 0;
} }
@ -570,8 +569,13 @@ namespace MainWindow
if(gpu) gpu->ClearCacheNextFrame(); if(gpu) gpu->ClearCacheNextFrame();
} }
void setRenderingMode(int mode) { void setRenderingMode(int mode = -1) {
g_Config.iRenderingMode = mode; if (mode >= FB_NON_BUFFERED_MODE)
g_Config.iRenderingMode = mode;
else {
if (++g_Config.iRenderingMode > FB_READFBOMEMORY_GPU)
g_Config.iRenderingMode = FB_NON_BUFFERED_MODE;
}
I18NCategory *g = GetI18NCategory("Graphics"); I18NCategory *g = GetI18NCategory("Graphics");
@ -600,8 +604,13 @@ namespace MainWindow
g_Config.iFpsLimit = fps; g_Config.iFpsLimit = fps;
} }
void setFrameSkipping(int framesToSkip) { void setFrameSkipping(int framesToSkip = -1) {
g_Config.iFrameSkip = framesToSkip; if (framesToSkip >= FRAMESKIP_OFF)
g_Config.iFrameSkip = framesToSkip;
else {
if (++g_Config.iFrameSkip > FRAMESKIP_MAX)
g_Config.iFrameSkip = FRAMESKIP_OFF;
}
I18NCategory *g = GetI18NCategory("Graphics"); I18NCategory *g = GetI18NCategory("Graphics");
const char *frameskipStr = g->T("Frame Skipping"); const char *frameskipStr = g->T("Frame Skipping");
@ -1128,17 +1137,17 @@ namespace MainWindow
SaveState::SaveSlot(g_Config.iCurrentStateSlot, SaveStateActionFinished); SaveState::SaveSlot(g_Config.iCurrentStateSlot, SaveStateActionFinished);
break; break;
case ID_OPTIONS_SCREENAUTO: SetInternalResolution(0); ResizeDisplay(true); break; case ID_OPTIONS_SCREENAUTO: SetInternalResolution(RESOLUTION_AUTO); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN1X: SetInternalResolution(1); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN1X: SetInternalResolution(RESOLUTION_NATIVE); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN2X: SetInternalResolution(2); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN2X: SetInternalResolution(RESOLUTION_2X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN3X: SetInternalResolution(3); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN3X: SetInternalResolution(RESOLUTION_3X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN4X: SetInternalResolution(4); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN4X: SetInternalResolution(RESOLUTION_4X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN5X: SetInternalResolution(5); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN5X: SetInternalResolution(RESOLUTION_5X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN6X: SetInternalResolution(6); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN6X: SetInternalResolution(RESOLUTION_6X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN7X: SetInternalResolution(7); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN7X: SetInternalResolution(RESOLUTION_7X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN8X: SetInternalResolution(8); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN8X: SetInternalResolution(RESOLUTION_8X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN9X: SetInternalResolution(9); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN9X: SetInternalResolution(RESOLUTION_9X); ResizeDisplay(true); break;
case ID_OPTIONS_SCREEN10X: SetInternalResolution(10); ResizeDisplay(true); break; case ID_OPTIONS_SCREEN10X: SetInternalResolution(RESOLUTION_MAX); ResizeDisplay(true); break;
case ID_OPTIONS_WINDOW1X: SetWindowSize(1); break; case ID_OPTIONS_WINDOW1X: SetWindowSize(1); break;
case ID_OPTIONS_WINDOW2X: SetWindowSize(2); break; case ID_OPTIONS_WINDOW2X: SetWindowSize(2); break;
@ -1180,9 +1189,7 @@ namespace MainWindow
// Dummy option to let the buffered rendering hotkey cycle through all the options. // Dummy option to let the buffered rendering hotkey cycle through all the options.
case ID_OPTIONS_BUFFEREDRENDERINGDUMMY: case ID_OPTIONS_BUFFEREDRENDERINGDUMMY:
g_Config.iRenderingMode = ++g_Config.iRenderingMode > FB_READFBOMEMORY_GPU ? FB_NON_BUFFERED_MODE : g_Config.iRenderingMode; setRenderingMode();
setRenderingMode(g_Config.iRenderingMode);
break; break;
case ID_DEBUG_SHOWDEBUGSTATISTICS: case ID_DEBUG_SHOWDEBUGSTATISTICS:
@ -1212,9 +1219,7 @@ namespace MainWindow
case ID_OPTIONS_FRAMESKIP_8: setFrameSkipping(FRAMESKIP_MAX); break; case ID_OPTIONS_FRAMESKIP_8: setFrameSkipping(FRAMESKIP_MAX); break;
case ID_OPTIONS_FRAMESKIPDUMMY: case ID_OPTIONS_FRAMESKIPDUMMY:
g_Config.iFrameSkip = ++g_Config.iFrameSkip > FRAMESKIP_MAX ? FRAMESKIP_OFF : g_Config.iFrameSkip; setFrameSkipping();
setFrameSkipping(g_Config.iFrameSkip);
break; break;
case ID_FILE_EXIT: case ID_FILE_EXIT:
@ -1559,11 +1564,11 @@ namespace MainWindow
ID_OPTIONS_SCREEN9X, ID_OPTIONS_SCREEN9X,
ID_OPTIONS_SCREEN10X, ID_OPTIONS_SCREEN10X,
}; };
if (g_Config.iInternalResolution < 0) if (g_Config.iInternalResolution < RESOLUTION_AUTO)
g_Config.iInternalResolution = 0; g_Config.iInternalResolution = RESOLUTION_AUTO;
else if(g_Config.iInternalResolution > 10) else if (g_Config.iInternalResolution > RESOLUTION_MAX)
g_Config.iInternalResolution = 5; g_Config.iInternalResolution = RESOLUTION_MAX;
for (int i = 0; i < ARRAY_SIZE(zoomitems); i++) { for (int i = 0; i < ARRAY_SIZE(zoomitems); i++) {
CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iInternalResolution) ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iInternalResolution) ? MF_CHECKED : MF_UNCHECKED));

12
Windows/WndMainWindow.h
View file

@ -28,6 +28,18 @@ namespace MainWindow
FRAMESKIP_8 = 9, FRAMESKIP_8 = 9,
FRAMESKIP_MAX = FRAMESKIP_8, FRAMESKIP_MAX = FRAMESKIP_8,
RESOLUTION_AUTO = 0,
RESOLUTION_NATIVE = 1,
RESOLUTION_2X = 2,
RESOLUTION_3X = 3,
RESOLUTION_4X = 4,
RESOLUTION_5X = 5,
RESOLUTION_6X = 6,
RESOLUTION_7X = 7,
RESOLUTION_8X = 8,
RESOLUTION_9X = 9,
RESOLUTION_MAX = 10,
TEXSCALING_OFF = 1, TEXSCALING_OFF = 1,
TEXSCALING_2X = 2, TEXSCALING_2X = 2,
TEXSCALING_3X = 3, TEXSCALING_3X = 3,