Skip to content

Smooth zoom (no slowdown at close scales) #147

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

Open
SputerSnoot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Smooth zoom (no slowdown at close scales) #147

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type Config* = object

const defaultConfig* = Config(
min_scale: 0.01,
scroll_speed: 1.5,
scroll_speed: 1.0,
drag_friction: 6.0,
scale_friction: 4.0,
)
Expand Down
5 changes: 3 additions & 2 deletions src/navigation.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ proc world*(camera: Camera, v: Vec2f): Vec2f =
v / camera.scale

proc update*(camera: var Camera, config: Config, dt: float, mouse: Mouse, image: PXImage, windowSize: Vec2f) =
if abs(camera.deltaScale) > 0.5:
if abs(camera.deltaScale) > 0.01:
let p0 = (camera.scalePivot - (windowSize * 0.5)) / camera.scale
camera.scale = max(camera.scale + camera.delta_scale * dt, config.min_scale)
camera.scale *= 1.0 + camera.delta_scale * dt * config.scroll_speed
camera.scale = max(camera.scale, config.min_scale)
let p1 = (camera.scalePivot - (windowSize * 0.5)) / camera.scale
camera.position += p0 - p1

Expand Down