ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InputCommon: follow coding conventions

This commit is contained in:
Filoppi 2021-05-04 23:53:55 +03:00
parent 4625359a4f
commit 5f74d0e08f
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View File

@ -247,22 +247,18 @@ ParseStatus Lexer::Tokenize(std::vector<Token>& tokens)
class ControlExpression : public Expression
{
public:
// Keep a shared_ptr to the device so the control pointer doesn't become invalid.
std::shared_ptr<Device> m_device;
explicit ControlExpression(ControlQualifier qualifier_) : qualifier(qualifier_) {}
explicit ControlExpression(ControlQualifier qualifier) : m_qualifier(qualifier) {}
ControlState GetValue() const override
{
if (s_hotkey_suppressions.IsSuppressed(input))
if (s_hotkey_suppressions.IsSuppressed(m_input))
return 0;
else
return GetValueIgnoringSuppression();
return GetValueIgnoringSuppression();
}
ControlState GetValueIgnoringSuppression() const
{
if (!input)
if (!m_input)
return 0.0;
// Note: Inputs may return negative values in situations where opposing directions are
@ -271,27 +267,29 @@ public:
// FYI: Clamping values greater than 1.0 is purposely not done to support unbounded values in
// the future. (e.g. raw accelerometer/gyro data)
return std::max(0.0, input->GetState());
return std::max(0.0, m_input->GetState());
}
void SetValue(ControlState value) override
{
if (output)
output->SetState(value);
if (m_output)
m_output->SetState(value);
}
int CountNumControls() const override { return (input || output) ? 1 : 0; }
int CountNumControls() const override { return (m_input || m_output) ? 1 : 0; }
void UpdateReferences(ControlEnvironment& env) override
{
m_device = env.FindDevice(qualifier);
input = env.FindInput(qualifier);
output = env.FindOutput(qualifier);
m_device = env.FindDevice(m_qualifier);
m_input = env.FindInput(m_qualifier);
m_output = env.FindOutput(m_qualifier);
}
Device::Input* GetInput() const { return input; };
Device::Input* GetInput() const { return m_input; };
private:
ControlQualifier qualifier;
Device::Input* input = nullptr;
Device::Output* output = nullptr;
// Keep a shared_ptr to the device so the control pointer doesn't become invalid.
std::shared_ptr<Device> m_device;
ControlQualifier m_qualifier;
Device::Input* m_input = nullptr;
Device::Output* m_output = nullptr;
};
bool HotkeySuppressions::IsSuppressedIgnoringModifiers(Device::Input* input,