edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6162

Browse source 
6162: Fix smooth zooming overshooting the target zoom level r=Chairn a=Robyt3

Ensure that the zoom level with smooth zooming does not exceed the target zoom level.

Closes #3747.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2022-12-18 20:47:40 +00:00 committed by GitHub
parent 3e458f8c10 32ce5be301
commit 293af0ef8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/client/components/camera.cpp
View file

@ -81,7 +81,13 @@ void CCamera::OnRender()
} }
else else
{ {
const float OldLevel = m_Zoom;
m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time)); m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time));
if((OldLevel < m_ZoomSmoothingTarget && m_Zoom > m_ZoomSmoothingTarget) || (OldLevel > m_ZoomSmoothingTarget && m_Zoom < m_ZoomSmoothingTarget))
{
m_Zoom = m_ZoomSmoothingTarget;
m_Zooming = false;
}
} }
m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel()); m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel());
} }

5
src/game/editor/editor.cpp
View file

@ -6138,6 +6138,11 @@ void CEditor::UpdateZoom()
else else
{ {
m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time)); m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time));
if((OldLevel < m_ZoomSmoothingTarget && m_Zoom > m_ZoomSmoothingTarget) || (OldLevel > m_ZoomSmoothingTarget && m_Zoom < m_ZoomSmoothingTarget))
{
m_Zoom = m_ZoomSmoothingTarget;
m_Zooming = false;
}
} }
m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel()); m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel());
if(g_Config.m_EdZoomTarget) if(g_Config.m_EdZoomTarget)