Skip to content

Add override argument to setAnalogControlState #1852

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

Merged
merged 3 commits into from
Dec 11, 2020
Merged

Add override argument to setAnalogControlState #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2814f6
SetAnalogControlState frameForced argument
LosFaul Nov 20, 2020
315c86b
Small cleanup
LosFaul Nov 25, 2020
9153c5e
override to forceOverrideNextFrame
LosFaul Nov 30, 2020
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
132 changes: 90 additions & 42 deletions Client/mods/deathmatch/logic/CClientPad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define CS_NAN -32768

SFixedArray<short, MAX_GTA_CONTROLS> CClientPad::m_sScriptedStates;
SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> CClientPad::m_bScriptedReadyToReset;
SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> CClientPad::m_bScriptedStatesNextFrameOverride;
bool CClientPad::m_bFlyWithMouse;
bool CClientPad::m_bSteerWithMouse;

Expand Down Expand Up @@ -119,7 +119,7 @@ CClientPad::CClientPad()
for (unsigned int i = 0; i < MAX_GTA_ANALOG_CONTROLS; i++)
{
m_sScriptedStates[i] = CS_NAN;
m_bScriptedReadyToReset[i] = false;
m_bScriptedStatesNextFrameOverride[i] = false;
}
}

Expand Down Expand Up @@ -590,7 +590,7 @@ bool CClientPad::GetAnalogControlState(const char* szName, CControllerState& cs,
return false;
}
// Set the analog control state and store them temporarilly before they are actually applied. Used for players.
bool CClientPad::SetAnalogControlState(const char* szName, float fState)
bool CClientPad::SetAnalogControlState(const char* szName, float fState, bool bFrameForced)
{
// Ensure values are between 0 and 1
fState = Clamp<float>(0, fState, 1);
Expand All @@ -602,56 +602,82 @@ bool CClientPad::SetAnalogControlState(const char* szName, float fState)
case 0:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[1] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[1] = false;
return true; // Left
case 1:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[0] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[0] = false;
return true; // Right
case 2:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[3] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[3] = false;
return true; // Up
case 3:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[2] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[2] = false;
return true; // Down
case 4:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[5] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[5] = false;
return true; // Vehicle Left
case 5:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[4] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[4] = false;
return true; // Vehicle Right
case 6:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[7] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[7] = false;
return true; // Up
case 7:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[6] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[6] = false;
return true; // Down
case 8:
m_sScriptedStates[uiIndex] = (short)(fState * 255.0f);
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
return true; // Accel
case 9:
m_sScriptedStates[uiIndex] = (short)(fState * 255.0f);
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
return true; // Reverse
case 10:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[11] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[11] = false;
return true; // Special Left
case 11:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[10] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[10] = false;
return true; // Special Right
case 12:
m_sScriptedStates[uiIndex] = (short)(fState * -128.0f);
m_sScriptedStates[13] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[13] = false;
return true; // Special Up
case 13:
m_sScriptedStates[uiIndex] = (short)(fState * 128.0f);
m_sScriptedStates[12] = 0;
m_bScriptedStatesNextFrameOverride[uiIndex] = bFrameForced;
m_bScriptedStatesNextFrameOverride[12] = false;
return true; // Special Down
default:
return false;
Expand All @@ -676,55 +702,77 @@ void CClientPad::ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot
{
unsigned int uiIndex = 0;

ProcessControl(cs.LeftStickX, uiIndex, false);
uiIndex++; // Left
ProcessControl(cs.LeftStickX, uiIndex, true);
uiIndex++; // Right
ProcessControl(cs.LeftStickY, uiIndex, false);
uiIndex++; // Up
ProcessControl(cs.LeftStickY, uiIndex, true);
uiIndex++; // Down
ProcessControl(cs.LeftStickX, uiIndex); // Left
uiIndex++;
ProcessControl(cs.LeftStickX, uiIndex); // Right
uiIndex++;
ProcessControl(cs.LeftStickY, uiIndex); // Up
uiIndex++;
ProcessControl(cs.LeftStickY, uiIndex); // Down
}
else
{
unsigned int uiIndex = 4;

ProcessControl(cs.LeftStickX, uiIndex, false);
uiIndex++; // Left
ProcessControl(cs.LeftStickX, uiIndex, true);
uiIndex++; // Right
ProcessControl(cs.LeftStickY, uiIndex, false);
uiIndex++; // Up
ProcessControl(cs.LeftStickY, uiIndex, true);
uiIndex++; // Down
ProcessControl(cs.ButtonCross, uiIndex, true);
uiIndex++; // Accel
ProcessControl(cs.ButtonSquare, uiIndex, true);
uiIndex++; // Brake
ProcessControl(cs.RightStickX, uiIndex, false);
uiIndex++; // Special Left
ProcessControl(cs.RightStickX, uiIndex, true);
uiIndex++; // Special Right
ProcessControl(cs.RightStickY, uiIndex, false);
uiIndex++; // Special Up
ProcessControl(cs.RightStickY, uiIndex, true);
uiIndex++; // Special Down
ProcessControl(cs.LeftStickX, uiIndex); // Left
uiIndex++;
ProcessControl(cs.LeftStickX, uiIndex); // Right
uiIndex++;
ProcessControl(cs.LeftStickY, uiIndex); // Up
uiIndex++;
ProcessControl(cs.LeftStickY, uiIndex); // Down
uiIndex++;
ProcessControl(cs.ButtonCross, uiIndex); // Accel
uiIndex++;
ProcessControl(cs.ButtonSquare, uiIndex); // Brake
uiIndex++;
ProcessControl(cs.RightStickX, uiIndex); // Special Left
uiIndex++;
ProcessControl(cs.RightStickX, uiIndex); // Special Right
uiIndex++;
ProcessControl(cs.RightStickY, uiIndex); // Special Up
uiIndex++;
ProcessControl(cs.RightStickY, uiIndex); // Special Down
}
}

void CClientPad::ProcessControl(short& usControlValue, unsigned int uiIndex, bool bPositive)
void CClientPad::ProcessControl(short& usControlValue, unsigned int uiIndex)
{
bool bResetCmp = bPositive ? (usControlValue > 0) : (usControlValue < 0);
if (!m_bScriptedReadyToReset[uiIndex]) // If we havent marked as ready to reset the control, find out if we are
m_bScriptedReadyToReset[uiIndex] = ((m_sScriptedStates[uiIndex] != CS_NAN) && (usControlValue == 0));

if (m_bScriptedReadyToReset[uiIndex] && bResetCmp) // If we're ready to reset, and our reset comparision is passed
m_sScriptedStates[uiIndex] = CS_NAN; // Remove our scripted control state
else
// Only apply the control state of we're actually a number, and that we're positive when we want it to be and vice versa
// Note: control values can be 0, negative or positive
// that's why we check unequals != 0
// otherwise the values are already in their expected value boundaries
//
// usControlValue is the updated input value we get from the player
// m_sScriptedStates contains our script value
// m_bScriptedStatesNextFrameOverride if the player input should be forcefully overriden for the next frame
//
//
// old behavior or (override == false)
// - player input will not be overwitten if it's unequals to 0* and script input is set 0
// - otherwise it will use the last set value after player input went 0*
// and will keep this behavior for comming frames
//
// behavior with (override == true)
// - will overwrite the player input even if not 0*
// only for the next frame
//
// 0* = no key pressed or analog hardware controll touched
//
//

if (m_bScriptedStatesNextFrameOverride[uiIndex])
{
m_bScriptedStatesNextFrameOverride[uiIndex] = false;
if (m_sScriptedStates[uiIndex] != CS_NAN)
if ((bPositive && m_sScriptedStates[uiIndex] > 0) || (!bPositive && m_sScriptedStates[uiIndex] < 0))
usControlValue = m_sScriptedStates[uiIndex]; // Otherwise force the scripted control state
std::swap(usControlValue, m_sScriptedStates[uiIndex]);
}
else
{
if (usControlValue != 0)
m_sScriptedStates[uiIndex] = CS_NAN;
else if (m_sScriptedStates[uiIndex] != CS_NAN && m_sScriptedStates[uiIndex] != 0)
usControlValue = m_sScriptedStates[uiIndex];
}
}

// Process toggled controls and apply them directly to the pad state. Used for players when keyboard input blocking is insufficient.
Expand Down
6 changes: 3 additions & 3 deletions Client/mods/deathmatch/logic/CClientPad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ class CClientPad
void DoPulse(CClientPed* pPed);

static bool GetAnalogControlState(const char* szName, CControllerState& cs, bool bOnFoot, float& fState, bool bIgnoreOverrides);
static bool SetAnalogControlState(const char* szName, float fState);
static bool SetAnalogControlState(const char* szName, float fState, bool bFrameForced);
static void RemoveSetAnalogControlState(const char* szName);

static void ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot);
static void ProcessControl(short& usControlValue, unsigned int uiIndex, bool bResetCmp);
static void ProcessControl(short& usControlValue, unsigned int uiIndex);

static void ProcessAllToggledControls(CControllerState& cs, bool bOnFoot);
static bool ProcessToggledControl(const char* szName, CControllerState& cs, bool bOnFoot, bool bEnabled);
static bool GetControlState(const char* szName, CControllerState& State, bool bOnFoot);

static SFixedArray<short, MAX_GTA_CONTROLS> m_sScriptedStates;
static SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> m_bScriptedReadyToReset;
static SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> m_bScriptedStatesNextFrameOverride;
static bool m_bFlyWithMouse;
static bool m_bSteerWithMouse;

Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7084,7 +7084,7 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt
{
if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
{
if (CClientPad::SetAnalogControlState(szControl, 1.0))
if (CClientPad::SetAnalogControlState(szControl, 1.0, false))
{
return true;
}
Expand Down
8 changes: 6 additions & 2 deletions Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,10 @@ int CLuaFunctionDefs::GetAnalogControlState(lua_State* luaVM)

int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
{
// bool setAnalogControlState ( string controlName [, float state] )
// bool setAnalogControlState ( string controlName [, float state][, bFrameForced] )
SString strControlState = "";
float fState = 0.0f;
bool bForceOverrideNextFrame = false; //if user input effect should be forcefully overriden for the next frame
CScriptArgReader argStream(luaVM);
argStream.ReadString(strControlState);

Expand All @@ -312,7 +313,10 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
if (argStream.NextIsNumber())
{
argStream.ReadNumber(fState);
if (CClientPad::SetAnalogControlState(strControlState, fState))
if (argStream.NextIsBool())
argStream.ReadBool(bForceOverrideNextFrame, false);

if (CClientPad::SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))
{
lua_pushboolean(luaVM, true);
return 1;
Expand Down