thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix frame rate (#530)

Browse source
This commit is contained in:
PeachyPeach 2024-11-28 01:54:15 +01:00 • committed by GitHub
parent a47bc97011
commit b2137ca2ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pc/pc_main.c
View file

@ -90,7 +90,8 @@ f32 gRenderingDelta = 0;
#define FRAMERATE 30 #define FRAMERATE 30
static const f64 sFrameTime = (1.0 / ((double)FRAMERATE)); static const f64 sFrameTime = (1.0 / ((double)FRAMERATE));
static f64 sFrameTargetTime = 0; static f64 sFrameTargetTime = 0;
static f64 sFrameTimeStart; static f64 sFrameTimeStart = 0;
static f64 sFrameLastClock = 0;
bool gGameInited = false; bool gGameInited = false;
bool gGfxInited = false; bool gGfxInited = false;
@ -179,17 +180,21 @@ static inline void patch_interpolations(f32 delta) {
void produce_interpolation_frames_and_delay(void) { void produce_interpolation_frames_and_delay(void) {
u64 frames = 0; u64 frames = 0;
f64 curTime = clock_elapsed_f64(); f64 curTime = clock_elapsed_f64();
f64 timeStart = curTime;
gRenderingInterpolated = true; gRenderingInterpolated = true;
// sanity check target time to deal with hangs and such // sanity check target time to deal with hangs and such
if (fabs(sFrameTargetTime - curTime) > 1) { sFrameTargetTime = curTime - 0.01f; } if (curTime >= sFrameTargetTime) { sFrameTargetTime = curTime - 0.01; }
// Account for the actual start of the frame and the time elapsed during the game logic
f64 targetDelta = ((sFrameTargetTime - curTime + (sFrameLastClock - sFrameTimeStart)) * FRAMERATE) / (f64) configFrameLimit;
// interpolate and render // interpolate and render
while ((curTime = clock_elapsed_f64()) < sFrameTargetTime) { while ((curTime = clock_elapsed_f64()) < sFrameTargetTime) {
f32 delta = ((!configUncappedFramerate && configFrameLimit == FRAMERATE) f32 delta = ((!configUncappedFramerate && configFrameLimit == FRAMERATE)
? 1.0f ? 1.0f
: MAX(MIN((curTime - sFrameTimeStart) / (sFrameTargetTime - sFrameTimeStart), 1.0f), 0.0f) : MAX(MIN((curTime - timeStart) / (sFrameTargetTime - timeStart), 1.0f), 0.0f)
); );
gRenderingDelta = delta; gRenderingDelta = delta;
@ -203,11 +208,10 @@ void produce_interpolation_frames_and_delay(void) {
if (configUncappedFramerate) { continue; } if (configUncappedFramerate) { continue; }
// Delay if our framerate is capped. // Delay if our framerate is capped.
f64 targetDelta = 1.0 / (f64) configFrameLimit;
f64 now = clock_elapsed_f64(); f64 now = clock_elapsed_f64();
f64 actualDelta = now - curTime; f64 actualDelta = now - curTime;
if (actualDelta >= targetDelta) { continue; } if (actualDelta >= targetDelta) { continue; }
f64 delay = ((targetDelta - actualDelta) * 1000.0) - 1.0; f64 delay = (targetDelta - actualDelta) * 1000.0;
if (delay > 0.0f) { if (delay > 0.0f) {
WAPI.delay((u32)delay); WAPI.delay((u32)delay);
} }
@ -228,6 +232,7 @@ void produce_interpolation_frames_and_delay(void) {
} }
sFrameTimeStart = sFrameTargetTime; sFrameTimeStart = sFrameTargetTime;
sFrameLastClock = clock_elapsed_f64();
sFrameTargetTime += sFrameTime; sFrameTargetTime += sFrameTime;
gRenderingInterpolated = false; gRenderingInterpolated = false;
} }