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

Merge pull request #8336 from gerdoe-jr/set_view_relative

Browse source 
Add `set_view_relative` (Closes #8335)
This commit is contained in:
heinrich5991 2024-05-09 07:52:04 +00:00 committed by GitHub
parent 3887eea18d 4f0d8a5a1f
commit c0a6bb9c88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ CCamera::CCamera()
m_ZoomSet = false;
m_Zoom = 1.0f;
m_Zooming = false;
m_ForceFreeviewPos = vec2(-1, -1);
m_ForceFreeview = false;
m_GotoSwitchOffset = 0;
m_GotoTeleOffset = 0;
m_GotoSwitchLastPos = ivec2(-1, -1);
@ -177,11 +177,14 @@ void CCamera::OnRender()
m_Center = m_pClient->m_LocalCharacterPos + s_aCurrentCameraOffset[g_Config.m_ClDummy];
}
if(m_ForceFreeviewPos != vec2(-1, -1) && m_CamType == CAMTYPE_SPEC)
if(m_ForceFreeview && m_CamType == CAMTYPE_SPEC)
{
m_Center = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] = m_ForceFreeviewPos;
m_ForceFreeviewPos = vec2(-1, -1);
m_ForceFreeview = false;
}
else
m_ForceFreeviewPos = m_Center;
m_PrevCenter = m_Center;
}
@ -191,6 +194,7 @@ void CCamera::OnConsoleInit()
Console()->Register("zoom-", "", CFGFLAG_CLIENT, ConZoomMinus, this, "Zoom decrease");
Console()->Register("zoom", "?i", CFGFLAG_CLIENT, ConZoom, this, "Change zoom");
Console()->Register("set_view", "i[x]i[y]", CFGFLAG_CLIENT, ConSetView, this, "Set camera position to x and y in the map");
Console()->Register("set_view_relative", "i[x]i[y]", CFGFLAG_CLIENT, ConSetViewRelative, this, "Set camera position relative to current view in the map");
Console()->Register("goto_switch", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoSwitch, this, "View switch found (at offset) with given number");
Console()->Register("goto_tele", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoTele, this, "View tele found (at offset) with given number");
}
@ -238,6 +242,12 @@ void CCamera::ConSetView(IConsole::IResult *pResult, void *pUserData)
// wait until free view camera type to update the position
pSelf->SetView(ivec2(pResult->GetInteger(0), pResult->GetInteger(1)));
}
void CCamera::ConSetViewRelative(IConsole::IResult *pResult, void *pUserData)
{
CCamera *pSelf = (CCamera *)pUserData;
// wait until free view camera type to update the position
pSelf->SetView(ivec2(pResult->GetInteger(0), pResult->GetInteger(1)), true);
}
void CCamera::ConGotoSwitch(IConsole::IResult *pResult, void *pUserData)
{
CCamera *pSelf = (CCamera *)pUserData;
@ -249,11 +259,16 @@ void CCamera::ConGotoTele(IConsole::IResult *pResult, void *pUserData)
pSelf->GotoTele(pResult->GetInteger(0), pResult->NumArguments() > 1 ? pResult->GetInteger(1) : -1);
}
void CCamera::SetView(ivec2 Pos)
void CCamera::SetView(ivec2 Pos, bool Relative)
{
vec2 RealPos = vec2(Pos.x * 32.0, Pos.y * 32.0);
vec2 UntestedViewPos = Relative ? m_ForceFreeviewPos + RealPos : RealPos;
m_ForceFreeview = true;
m_ForceFreeviewPos = vec2(
clamp(Pos.x * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f),
clamp(Pos.y * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f));
clamp(UntestedViewPos.x, 200.0f, Collision()->GetWidth() * 32 - 200.0f),
clamp(UntestedViewPos.y, 200.0f, Collision()->GetWidth() * 32 - 200.0f));
}
void CCamera::GotoSwitch(int Number, int Offset)

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

@ -55,7 +55,7 @@ public:
virtual void OnReset() override;
void SetZoom(float Target, int Smoothness);
void SetView(ivec2 Pos);
void SetView(ivec2 Pos, bool Relative = false);
void GotoSwitch(int Number, int Offset = -1);
void GotoTele(int Number, int Offset = -1);
@ -64,9 +64,11 @@ private:
static void ConZoomMinus(IConsole::IResult *pResult, void *pUserData);
static void ConZoom(IConsole::IResult *pResult, void *pUserData);
static void ConSetView(IConsole::IResult *pResult, void *pUserData);
static void ConSetViewRelative(IConsole::IResult *pResult, void *pUserData);
static void ConGotoSwitch(IConsole::IResult *pResult, void *pUserData);
static void ConGotoTele(IConsole::IResult *pResult, void *pUserData);
bool m_ForceFreeview;
vec2 m_ForceFreeviewPos;
int m_GotoSwitchOffset;
int m_GotoTeleOffset;