Normalize fade duration

See #165
This commit is contained in:
Alexander Batalov 2022-10-11 17:58:02 +03:00
parent b23d05f850
commit beb010cd0f
2 changed files with 11 additions and 12 deletions

View File

@ -196,6 +196,8 @@ int _Color2RGB_(int a1)
void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalette, int steps) void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalette, int steps)
{ {
for (int step = 0; step < steps; step++) { for (int step = 0; step < steps; step++) {
sharedFpsLimiter.mark();
unsigned char palette[768]; unsigned char palette[768];
for (int index = 0; index < 768; index++) { for (int index = 0; index < 768; index++) {
@ -210,10 +212,13 @@ void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalett
_setSystemPalette(palette); _setSystemPalette(palette);
renderPresent(); renderPresent();
sharedFpsLimiter.throttle();
} }
sharedFpsLimiter.mark();
_setSystemPalette(newPalette); _setSystemPalette(newPalette);
renderPresent(); renderPresent();
sharedFpsLimiter.throttle();
} }
// 0x4C73D4 // 0x4C73D4

View File

@ -41,20 +41,14 @@ void paletteInit()
colorPaletteSetTransitionCallback(NULL); colorPaletteSetTransitionCallback(NULL);
unsigned int diff = getTicksSince(tick); // Actual fade duration will never be 0 since |colorPaletteFadeBetween| uses
// frame rate throttling.
unsigned int actualFadeDuration = getTicksSince(tick);
// NOTE: Modern CPUs are super fast, so it's possible that less than 10ms // Calculate fade steps needed to perform fading in about 700 ms.
// (the resolution of underlying GetTicks) is needed to fade between two gPaletteFadeSteps = 60 * 700 / actualFadeDuration;
// palettes, which leads to zero diff, which in turn leads to unpredictable
// number of fade steps. To fix that the fallback value is used (46). This
// value is commonly seen when running the game in 1 core VM.
if (diff == 0) {
diff = 46;
}
gPaletteFadeSteps = (int)(60.0 / (diff * (1.0 / 700.0))); debugPrint("\nFade time is %u\nFade steps are %d\n", actualFadeDuration, gPaletteFadeSteps);
debugPrint("\nFade time is %u\nFade steps are %d\n", diff, gPaletteFadeSteps);
} }
// NOTE: Collapsed. // NOTE: Collapsed.