MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Graphics: Setting 'fixedFramerate' to -1 disables frame limit

Browse source 
Can be useful for benchmarking
This commit is contained in:
Jonas Kulla 2014-05-05 09:21:20 +02:00
parent 627ff66e7a
commit c6a3c5aa59
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/graphics.cpp
View file

@ -253,6 +253,8 @@ struct FPSLimiter
/* Ticks per nanosecond */ /* Ticks per nanosecond */
const double tickFreqNS; const double tickFreqNS;
bool disabled;
/* Data for frame timing adjustment */ /* Data for frame timing adjustment */
struct struct
{ {
@ -269,7 +271,8 @@ struct FPSLimiter
: lastTickCount(SDL_GetPerformanceCounter()), : lastTickCount(SDL_GetPerformanceCounter()),
tickFreq(SDL_GetPerformanceFrequency()), tickFreq(SDL_GetPerformanceFrequency()),
tickFreqMS(tickFreq / 1000), tickFreqMS(tickFreq / 1000),
tickFreqNS(tickFreq / 1000000000) tickFreqNS(tickFreq / 1000000000),
disabled(false)
{ {
setDesiredFPS(desiredFPS); setDesiredFPS(desiredFPS);
@ -285,6 +288,9 @@ struct FPSLimiter
void delay() void delay()
{ {
if (disabled)
return;
int64_t tickDelta = SDL_GetPerformanceCounter() - lastTickCount; int64_t tickDelta = SDL_GetPerformanceCounter() - lastTickCount;
int64_t toDelay = tpf - tickDelta; int64_t toDelay = tpf - tickDelta;
@ -323,6 +329,9 @@ struct FPSLimiter
* to catch up */ * to catch up */
bool frameSkipRequired() const bool frameSkipRequired() const
{ {
if (disabled)
return false;
return adj.idealDiff > tpf; return adj.idealDiff > tpf;
} }
@ -516,6 +525,8 @@ Graphics::Graphics(RGSSThreadData *data)
if (data->config.fixedFramerate > 0) if (data->config.fixedFramerate > 0)
p->fpsLimiter.setDesiredFPS(data->config.fixedFramerate); p->fpsLimiter.setDesiredFPS(data->config.fixedFramerate);
else if (data->config.fixedFramerate < 0)
p->fpsLimiter.disabled = true;
} }
Graphics::~Graphics() Graphics::~Graphics()