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

Clamp camera zoom

Browse source
This commit is contained in:
Jupeyy 2020-09-07 00:19:38 +02:00
parent ebe5b51230
commit bfd24d7dd8
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,9 +36,19 @@ void CCamera::ScaleZoom(float Factor)
ChangeZoom(CurrentTarget * Factor);
}
float CCamera::MaxZoomLevel()
{
return (Graphics()->IsTileBufferingEnabled()? 60 : 30);
}
float CCamera::MinZoomLevel()
{
return 0.01f;
}
void CCamera::ChangeZoom(float Target)
{
if(Target >= (Graphics()->IsTileBufferingEnabled()? 60 : 30))
if(Target > MaxZoomLevel() || Target < MinZoomLevel())
{
return;
}
@ -75,6 +85,7 @@ void CCamera::OnRender()
{
m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time));
}
m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel());
}
if(!(m_pClient->m_Snap.m_SpecInfo.m_Active || GameClient()->m_GameInfo.m_AllowZoom || Client()->State() == IClient::STATE_DEMOPLAYBACK))

2
src/game/client/components/camera.h
View file

@ -28,6 +28,8 @@ class CCamera : public CComponent
void ChangeZoom(float Target);
float ZoomProgress(float CurrentTime) const;
float MinZoomLevel();
float MaxZoomLevel();
public:
vec2 m_Center;
bool m_ZoomSet;