summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-01-26 13:35:58 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2019-10-11 18:12:17 -0500
commitbbd6b1848fcaeaafbe14babb3911557e1a503c76 (patch)
tree922f96f3555cbdf8cec990789a43a4761afdb544 /Source/Core/InputCommon
parent6a2096c41977d6c33c2ca20494d9f623bed221ff (diff)
ExpressionParser: Add deadzone function.
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControlReference/FunctionExpression.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
index 84f3ac907e..629b8eae0b 100644
--- a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
+++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
@@ -27,6 +27,7 @@ private:
std::string GetFuncName() const override { return "unknown"; }
};
+// usage: !toggle(toggle_state_input, [clear_state_input])
class ToggleExpression : public FunctionExpression
{
private:
@@ -65,6 +66,7 @@ private:
mutable bool m_state{};
};
+// usage: !not(expression)
class NotExpression : public FunctionExpression
{
private:
@@ -78,6 +80,7 @@ private:
std::string GetFuncName() const override { return ""; }
};
+// usage: !sin(expression)
class SinExpression : public FunctionExpression
{
private:
@@ -91,6 +94,7 @@ private:
std::string GetFuncName() const override { return "sin"; }
};
+// usage: !timer(seconds)
class TimerExpression : public FunctionExpression
{
private:
@@ -134,6 +138,7 @@ private:
mutable Clock::time_point m_start_time = Clock::now();
};
+// usage: !if(condition, true_expression, false_expression)
class IfExpression : public FunctionExpression
{
private:
@@ -152,6 +157,7 @@ private:
std::string GetFuncName() const override { return "if"; }
};
+// usage: !minus(expression)
class UnaryMinusExpression : public FunctionExpression
{
private:
@@ -170,6 +176,7 @@ private:
std::string GetFuncName() const override { return "minus"; }
};
+// usage: !while(condition, expression)
class WhileExpression : public FunctionExpression
{
virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) override
@@ -200,6 +207,25 @@ class WhileExpression : public FunctionExpression
std::string GetFuncName() const override { return "while"; }
};
+// usage: deadzone(input, amount)
+class DeadzoneExpression : public FunctionExpression
+{
+ virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) override
+ {
+ return 2 == args.size();
+ }
+
+ ControlState GetValue() const override
+ {
+ const ControlState val = GetArg(0).GetValue();
+ const ControlState deadzone = GetArg(1).GetValue();
+ return std::copysign(std::max(0.0, std::abs(val) - deadzone) / (1.0 - deadzone), val);
+ }
+
+ void SetValue(ControlState value) override {}
+ std::string GetFuncName() const override { return "deadzone"; }
+};
+
std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string name)
{
if (name.empty())
@@ -216,6 +242,8 @@ std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string name)
return std::make_unique<WhileExpression>();
else if ("minus" == name)
return std::make_unique<UnaryMinusExpression>();
+ else if ("deadzone" == name)
+ return std::make_unique<DeadzoneExpression>();
else
return std::make_unique<UnknownFunctionExpression>();
}