mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-23 06:10:03 -06:00
Merge pull request #285 from abcdjdj/limit_fps
Add option to limit framerate from UI
This commit is contained in:
@ -46,6 +46,8 @@ int ScreenLayout;
|
|||||||
int ScreenSizing;
|
int ScreenSizing;
|
||||||
int ScreenFilter;
|
int ScreenFilter;
|
||||||
|
|
||||||
|
int LimitFPS;
|
||||||
|
|
||||||
int DirectBoot;
|
int DirectBoot;
|
||||||
|
|
||||||
int Threaded3D;
|
int Threaded3D;
|
||||||
@ -114,6 +116,8 @@ ConfigEntry ConfigFile[] =
|
|||||||
{"ScreenSizing", 0, &ScreenSizing, 0, NULL, 0},
|
{"ScreenSizing", 0, &ScreenSizing, 0, NULL, 0},
|
||||||
{"ScreenFilter", 0, &ScreenFilter, 1, NULL, 0},
|
{"ScreenFilter", 0, &ScreenFilter, 1, NULL, 0},
|
||||||
|
|
||||||
|
{"LimitFPS", 0, &LimitFPS, 1, NULL, 0},
|
||||||
|
|
||||||
{"DirectBoot", 0, &DirectBoot, 1, NULL, 0},
|
{"DirectBoot", 0, &DirectBoot, 1, NULL, 0},
|
||||||
|
|
||||||
{"Threaded3D", 0, &Threaded3D, 1, NULL, 0},
|
{"Threaded3D", 0, &Threaded3D, 1, NULL, 0},
|
||||||
|
@ -51,6 +51,8 @@ extern int ScreenLayout;
|
|||||||
extern int ScreenSizing;
|
extern int ScreenSizing;
|
||||||
extern int ScreenFilter;
|
extern int ScreenFilter;
|
||||||
|
|
||||||
|
extern int LimitFPS;
|
||||||
|
|
||||||
extern int DirectBoot;
|
extern int DirectBoot;
|
||||||
|
|
||||||
extern int Threaded3D;
|
extern int Threaded3D;
|
||||||
|
@ -404,7 +404,6 @@ int EmuThreadFunc(void* burp)
|
|||||||
u32 lasttick = starttick;
|
u32 lasttick = starttick;
|
||||||
u32 lastmeasuretick = lasttick;
|
u32 lastmeasuretick = lasttick;
|
||||||
u32 fpslimitcount = 0;
|
u32 fpslimitcount = 0;
|
||||||
bool limitfps = true;
|
|
||||||
char melontitle[100];
|
char melontitle[100];
|
||||||
|
|
||||||
while (EmuRunning != 0)
|
while (EmuRunning != 0)
|
||||||
@ -516,7 +515,7 @@ int EmuThreadFunc(void* burp)
|
|||||||
lasttick = curtick;
|
lasttick = curtick;
|
||||||
|
|
||||||
u32 wantedtick = starttick + (u32)((float)fpslimitcount * framerate);
|
u32 wantedtick = starttick + (u32)((float)fpslimitcount * framerate);
|
||||||
if (curtick < wantedtick && limitfps)
|
if (curtick < wantedtick && Config::LimitFPS)
|
||||||
{
|
{
|
||||||
SDL_Delay(wantedtick - curtick);
|
SDL_Delay(wantedtick - curtick);
|
||||||
}
|
}
|
||||||
@ -1533,6 +1532,12 @@ void OnSetScreenFiltering(uiMenuItem* item, uiWindow* window, void* blarg)
|
|||||||
else Config::ScreenFilter = 0;
|
else Config::ScreenFilter = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OnSetLimitFPS(uiMenuItem* item, uiWindow* window, void* blarg)
|
||||||
|
{
|
||||||
|
int chk = uiMenuItemChecked(item);
|
||||||
|
if (chk != 0) Config::LimitFPS = true;
|
||||||
|
else Config::LimitFPS = false;
|
||||||
|
}
|
||||||
|
|
||||||
void ApplyNewSettings()
|
void ApplyNewSettings()
|
||||||
{
|
{
|
||||||
@ -1765,6 +1770,10 @@ int main(int argc, char** argv)
|
|||||||
uiMenuItemOnClicked(menuitem, OnSetScreenFiltering, NULL);
|
uiMenuItemOnClicked(menuitem, OnSetScreenFiltering, NULL);
|
||||||
uiMenuItemSetChecked(menuitem, Config::ScreenFilter==1);
|
uiMenuItemSetChecked(menuitem, Config::ScreenFilter==1);
|
||||||
|
|
||||||
|
menuitem = uiMenuAppendCheckItem(menu, "Limit framerate");
|
||||||
|
uiMenuItemOnClicked(menuitem, OnSetLimitFPS, NULL);
|
||||||
|
uiMenuItemSetChecked(menuitem, Config::LimitFPS==1);
|
||||||
|
|
||||||
|
|
||||||
int w = Config::WindowWidth;
|
int w = Config::WindowWidth;
|
||||||
int h = Config::WindowHeight;
|
int h = Config::WindowHeight;
|
||||||
|
Reference in New Issue
Block a user