The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

ExpressionParser: Clean up some redundant using-declarations and wrong comments.

Browse Source
This commit is contained in:
Jordan Woyak 2019-01-27 09:13:12 -06:00
parent fae8b15db1
commit 5cb1248612
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
View File

@ -14,6 +14,9 @@ namespace ExpressionParser
constexpr int LOOP_MAX_REPS = 10000; constexpr int LOOP_MAX_REPS = 10000;
constexpr ControlState CONDITION_THRESHOLD = 0.5; constexpr ControlState CONDITION_THRESHOLD = 0.5;
using Clock = std::chrono::steady_clock;
using FSec = std::chrono::duration<ControlState>;
// TODO: Return an oscillating value to make it apparent something was spelled wrong? // TODO: Return an oscillating value to make it apparent something was spelled wrong?
class UnknownFunctionExpression : public FunctionExpression class UnknownFunctionExpression : public FunctionExpression
{ {
@ -108,8 +111,6 @@ private:
const auto now = Clock::now(); const auto now = Clock::now();
const auto elapsed = now - m_start_time; const auto elapsed = now - m_start_time;
using FSec = std::chrono::duration<ControlState>;
const ControlState val = GetArg(0).GetValue(); const ControlState val = GetArg(0).GetValue();
ControlState progress = std::chrono::duration_cast<FSec>(elapsed).count() / val; ControlState progress = std::chrono::duration_cast<FSec>(elapsed).count() / val;
@ -134,7 +135,6 @@ private:
std::string GetFuncName() const override { return "timer"; } std::string GetFuncName() const override { return "timer"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable Clock::time_point m_start_time = Clock::now(); mutable Clock::time_point m_start_time = Clock::now();
}; };
@ -207,7 +207,7 @@ class WhileExpression : public FunctionExpression
std::string GetFuncName() const override { return "while"; } std::string GetFuncName() const override { return "while"; }
}; };
// usage: deadzone(input, amount) // usage: !deadzone(input, amount)
class DeadzoneExpression : public FunctionExpression class DeadzoneExpression : public FunctionExpression
{ {
virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) override virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) override
@ -226,7 +226,7 @@ class DeadzoneExpression : public FunctionExpression
std::string GetFuncName() const override { return "deadzone"; } std::string GetFuncName() const override { return "deadzone"; }
}; };
// usage: smooth(input, seconds) // usage: !smooth(input, seconds)
// seconds is seconds to change from 0.0 to 1.0 // seconds is seconds to change from 0.0 to 1.0
class SmoothExpression : public FunctionExpression class SmoothExpression : public FunctionExpression
{ {
@ -244,8 +244,6 @@ class SmoothExpression : public FunctionExpression
const ControlState desired_value = GetArg(0).GetValue(); const ControlState desired_value = GetArg(0).GetValue();
const ControlState smooth = GetArg(1).GetValue(); const ControlState smooth = GetArg(1).GetValue();
using FSec = std::chrono::duration<ControlState>;
const ControlState max_move = std::chrono::duration_cast<FSec>(elapsed).count() / smooth; const ControlState max_move = std::chrono::duration_cast<FSec>(elapsed).count() / smooth;
if (std::isinf(max_move)) if (std::isinf(max_move))
@ -265,8 +263,6 @@ class SmoothExpression : public FunctionExpression
std::string GetFuncName() const override { return "smooth"; } std::string GetFuncName() const override { return "smooth"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable ControlState m_value = 0.0; mutable ControlState m_value = 0.0;
mutable Clock::time_point m_last_update = Clock::now(); mutable Clock::time_point m_last_update = Clock::now();
}; };
@ -294,8 +290,6 @@ class HoldExpression : public FunctionExpression
{ {
const auto hold_time = now - m_start_time; const auto hold_time = now - m_start_time;
using FSec = std::chrono::duration<ControlState>;
if (std::chrono::duration_cast<FSec>(hold_time).count() >= GetArg(1).GetValue()) if (std::chrono::duration_cast<FSec>(hold_time).count() >= GetArg(1).GetValue())
m_state = true; m_state = true;
} }
@ -307,8 +301,6 @@ class HoldExpression : public FunctionExpression
std::string GetFuncName() const override { return "smooth"; } std::string GetFuncName() const override { return "smooth"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable bool m_state = false; mutable bool m_state = false;
mutable Clock::time_point m_start_time = Clock::now(); mutable Clock::time_point m_start_time = Clock::now();
}; };
@ -325,8 +317,6 @@ class TapExpression : public FunctionExpression
{ {
const auto now = Clock::now(); const auto now = Clock::now();
using FSec = std::chrono::duration<ControlState>;
const auto elapsed = std::chrono::duration_cast<FSec>(now - m_start_time).count(); const auto elapsed = std::chrono::duration_cast<FSec>(now - m_start_time).count();
const ControlState input = GetArg(0).GetValue(); const ControlState input = GetArg(0).GetValue();
@ -368,8 +358,6 @@ class TapExpression : public FunctionExpression
std::string GetFuncName() const override { return "tap"; } std::string GetFuncName() const override { return "tap"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable bool m_released = true; mutable bool m_released = true;
mutable u32 m_taps = 0; mutable u32 m_taps = 0;
mutable Clock::time_point m_start_time = Clock::now(); mutable Clock::time_point m_start_time = Clock::now();
@ -405,8 +393,6 @@ class RelativeExpression : public FunctionExpression
if (GetArgCount() >= 4) if (GetArgCount() >= 4)
m_state = GetArg(3).GetValue(); m_state = GetArg(3).GetValue();
using FSec = std::chrono::duration<ControlState>;
const auto elapsed = std::chrono::duration_cast<FSec>(now - m_last_update).count(); const auto elapsed = std::chrono::duration_cast<FSec>(now - m_last_update).count();
m_last_update = now; m_last_update = now;
@ -432,8 +418,6 @@ class RelativeExpression : public FunctionExpression
std::string GetFuncName() const override { return "relative"; } std::string GetFuncName() const override { return "relative"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable ControlState m_state = 0.0; mutable ControlState m_state = 0.0;
mutable Clock::time_point m_last_update = Clock::now(); mutable Clock::time_point m_last_update = Clock::now();
}; };
@ -460,7 +444,6 @@ class PulseExpression : public FunctionExpression
{ {
m_released = false; m_released = false;
using FSec = std::chrono::duration<ControlState>;
const auto seconds = std::chrono::duration_cast<Clock::duration>(FSec(GetArg(1).GetValue())); const auto seconds = std::chrono::duration_cast<Clock::duration>(FSec(GetArg(1).GetValue()));
if (m_state) if (m_state)
@ -486,8 +469,6 @@ class PulseExpression : public FunctionExpression
std::string GetFuncName() const override { return "pulse"; } std::string GetFuncName() const override { return "pulse"; }
private: private:
using Clock = std::chrono::steady_clock;
mutable bool m_released = false; mutable bool m_released = false;
mutable bool m_state = false; mutable bool m_state = false;
mutable Clock::time_point m_release_time = Clock::now(); mutable Clock::time_point m_release_time = Clock::now();