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

Introduced cl_dynamic_camera option to easily toggle between camera modes. Separated cl_mouse_max_distance in two settings, one for each mode

Browse source
This commit is contained in:
Jordy Ruiz 2018-11-02 15:33:41 +01:00
parent 8221dac5de
commit 4d1160971f
4 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ void CCamera::OnRender()
vec2 CameraOffset(0, 0); vec2 CameraOffset(0, 0);
float l = length(m_pClient->m_pControls->m_MousePos); float l = length(m_pClient->m_pControls->m_MousePos);
if(l > 0.0001f) // make sure that this isn't 0 if(g_Config.m_ClDynamicCamera && l > 0.0001f) // make sure that this isn't 0
{ {
float DeadZone = g_Config.m_ClMouseDeadzone; float DeadZone = g_Config.m_ClMouseDeadzone;
float FollowFactor = g_Config.m_ClMouseFollowfactor/100.0f; float FollowFactor = g_Config.m_ClMouseFollowfactor/100.0f;

8
src/game/client/components/controls.cpp
View file

@ -226,10 +226,16 @@ void CControls::ClampMousePos()
m_MousePos.y = clamp(m_MousePos.y, 200.0f, Collision()->GetHeight()*32-200.0f); m_MousePos.y = clamp(m_MousePos.y, 200.0f, Collision()->GetHeight()*32-200.0f);
} }
else else
{
float MouseMax;
if(g_Config.m_ClDynamicCamera)
{ {
float CameraMaxDistance = 200.0f; float CameraMaxDistance = 200.0f;
float FollowFactor = g_Config.m_ClMouseFollowfactor/100.0f; float FollowFactor = g_Config.m_ClMouseFollowfactor/100.0f;
float MouseMax = min(CameraMaxDistance/FollowFactor + g_Config.m_ClMouseDeadzone, (float)g_Config.m_ClMouseMaxDistance); MouseMax = min(CameraMaxDistance/FollowFactor + g_Config.m_ClMouseDeadzone, (float)g_Config.m_ClMouseMaxDistanceDynamic);
}
else
MouseMax = (float)g_Config.m_ClMouseMaxDistanceStatic;
if(length(m_MousePos) > MouseMax) if(length(m_MousePos) > MouseMax)
m_MousePos = normalize(m_MousePos)*MouseMax; m_MousePos = normalize(m_MousePos)*MouseMax;

19
src/game/client/components/menus_settings.cpp
View file

@ -706,18 +706,22 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
Game.HSplitTop(Spacing, 0, &Game); Game.HSplitTop(Spacing, 0, &Game);
Game.HSplitTop(ButtonHeight, &Button, &Game); Game.HSplitTop(ButtonHeight, &Button, &Game);
static int s_DynamicCameraButton = 0; static int s_DynamicCameraButton = 0;
if(DoButton_CheckBox(&s_DynamicCameraButton, Localize("Dynamic Camera"), g_Config.m_ClMouseDeadzone != 0, &Button)) if(DoButton_CheckBox(&s_DynamicCameraButton, Localize("Dynamic Camera"), g_Config.m_ClDynamicCamera, &Button))
{ {
if(g_Config.m_ClMouseDeadzone) if(g_Config.m_ClDynamicCamera)
{ {
g_Config.m_ClMouseFollowfactor = 0; g_Config.m_ClDynamicCamera = 0;
g_Config.m_ClMouseMaxDistance = 400; // force to defaults when using the GUI
g_Config.m_ClMouseDeadzone = 0; g_Config.m_ClMouseMaxDistanceStatic = 400;
// g_Config.m_ClMouseFollowfactor = 0;
// g_Config.m_ClMouseDeadzone = 0;
} }
else else
{ {
g_Config.m_ClDynamicCamera = 1;
// force to defaults when using the GUI
g_Config.m_ClMouseMaxDistanceDynamic = 1000;
g_Config.m_ClMouseFollowfactor = 60; g_Config.m_ClMouseFollowfactor = 60;
g_Config.m_ClMouseMaxDistance = 1000;
g_Config.m_ClMouseDeadzone = 300; g_Config.m_ClMouseDeadzone = 300;
} }
} }
@ -850,8 +854,9 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
static CButtonContainer s_ResetButton; static CButtonContainer s_ResetButton;
if(DoButton_Menu(&s_ResetButton, Localize("Reset"), 0, &Button)) if(DoButton_Menu(&s_ResetButton, Localize("Reset"), 0, &Button))
{ {
g_Config.m_ClDynamicCamera = 1;
g_Config.m_ClMouseMaxDistanceDynamic = 1000;
g_Config.m_ClMouseFollowfactor = 60; g_Config.m_ClMouseFollowfactor = 60;
g_Config.m_ClMouseMaxDistance = 1000;
g_Config.m_ClMouseDeadzone = 300; g_Config.m_ClMouseDeadzone = 300;
g_Config.m_ClAutoswitchWeapons = 1; g_Config.m_ClAutoswitchWeapons = 1;
g_Config.m_ClShowhud = 1; g_Config.m_ClShowhud = 1;

4
src/game/variables.h
View file

@ -23,9 +23,11 @@ MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 0, 0, 1, CFGFLAG_C
MACRO_CONFIG_INT(ClWarningTeambalance, cl_warning_teambalance, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Warn about team balance") MACRO_CONFIG_INT(ClWarningTeambalance, cl_warning_teambalance, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Warn about team balance")
MACRO_CONFIG_INT(ClDynamicCamera, cl_dynamic_camera, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Switches camera mode. If set to 0, forces mouse deadzone to 0.")
MACRO_CONFIG_INT(ClMouseDeadzone, cl_mouse_deadzone, 300, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") MACRO_CONFIG_INT(ClMouseDeadzone, cl_mouse_deadzone, 300, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
MACRO_CONFIG_INT(ClMouseFollowfactor, cl_mouse_followfactor, 60, 0, 200, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") MACRO_CONFIG_INT(ClMouseFollowfactor, cl_mouse_followfactor, 60, 0, 200, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
MACRO_CONFIG_INT(ClMouseMaxDistance, cl_mouse_max_distance, 800, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") MACRO_CONFIG_INT(ClMouseMaxDistanceDynamic, cl_mouse_max_distance_dynamic, 1000, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Mouse max distance, in dynamic camera mode")
MACRO_CONFIG_INT(ClMouseMaxDistanceStatic, cl_mouse_max_distance_static, 400, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Mouse max distance, in static camera mode")
MACRO_CONFIG_INT(ClCustomizeSkin, cl_customize_skin, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") MACRO_CONFIG_INT(ClCustomizeSkin, cl_customize_skin, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")