Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve scrolling in high FPS situations #3410

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Improve scrolling in high FPS situations #3410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions src/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,24 +1092,27 @@ static void handleCameraScrolling()

// Apparently there's stutter if using deltaRealTime, so we have our very own delta time here, just for us.
timeDiff = wzGetTicks() - scrollRefTime;
scrollRefTime += timeDiff;
timeDiff = std::min<unsigned>(timeDiff, 500); // Since we're using our own time variable, which isn't updated when dragging a box, clamp the time here so releasing the box doesn't scroll to the edge of the map suddenly.
if (timeDiff >= 8) // throttle max update rate to avoid really jerky scrolling
{
scrollRefTime += timeDiff;
timeDiff = std::min<unsigned>(timeDiff, 500); // Since we're using our own time variable, which isn't updated when dragging a box, clamp the time here so releasing the box doesn't scroll to the edge of the map suddenly.

scrollStepLeftRight = 0;
scrollStepUpDown = 0;
calcScroll(&scrollStepLeftRight, &scrollSpeedLeftRight, scaled_accel, 2 * scaled_accel, scrollDirLeftRight * scaled_max_scroll_speed, (float)timeDiff / GAME_TICKS_PER_SEC);
calcScroll(&scrollStepUpDown, &scrollSpeedUpDown, scaled_accel, 2 * scaled_accel, scrollDirUpDown * scaled_max_scroll_speed, (float)timeDiff / GAME_TICKS_PER_SEC);
scrollStepLeftRight = 0;
scrollStepUpDown = 0;
calcScroll(&scrollStepLeftRight, &scrollSpeedLeftRight, scaled_accel, 2 * scaled_accel, scrollDirLeftRight * scaled_max_scroll_speed, (float)timeDiff / GAME_TICKS_PER_SEC);
calcScroll(&scrollStepUpDown, &scrollSpeedUpDown, scaled_accel, 2 * scaled_accel, scrollDirUpDown * scaled_max_scroll_speed, (float)timeDiff / GAME_TICKS_PER_SEC);

/* Get x component of movement */
xDif = (int) (cos(-playerPos.r.y * (M_PI / 32768)) * scrollStepLeftRight + sin(-playerPos.r.y * (M_PI / 32768)) * scrollStepUpDown);
/* Get y component of movement */
yDif = (int) (sin(-playerPos.r.y * (M_PI / 32768)) * scrollStepLeftRight - cos(-playerPos.r.y * (M_PI / 32768)) * scrollStepUpDown);
/* Get x component of movement */
xDif = (int) (cos(-playerPos.r.y * (M_PI / 32768)) * scrollStepLeftRight + sin(-playerPos.r.y * (M_PI / 32768)) * scrollStepUpDown);
/* Get y component of movement */
yDif = (int) (sin(-playerPos.r.y * (M_PI / 32768)) * scrollStepLeftRight - cos(-playerPos.r.y * (M_PI / 32768)) * scrollStepUpDown);

/* Adjust player's position by these components */
playerPos.p.x += xDif;
playerPos.p.z += yDif;
/* Adjust player's position by these components */
playerPos.p.x += xDif;
playerPos.p.z += yDif;

CheckScrollLimits();
CheckScrollLimits();
}

// Reset scroll directions
scrollDirLeftRight = 0;
Expand Down
Loading