diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-05-10 19:16:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 19:16:40 -0700 |
| commit | 3ab06dcd02ea6040c2620a8ce8be144c65534c2d (patch) | |
| tree | d695cb4bb2c7f9573c99ee91bfcc54bad81f98dc /Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h | |
| parent | 46561cc242237c22fe24b6c990fbaeaba241f8fd (diff) | |
| parent | 374585f12806886f9ad8b117dfc4811033dad4f3 (diff) | |
Merge pull request #8016 from jordan-woyak/emu-wm-ir-rename
WiimoteEmu/DolphinQt: Rename "IR" to "Point" and eliminate redundant Forward/Backward actions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h index 4b0d13eb6c..7c72120dba 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h @@ -19,12 +19,11 @@ public: { ControlState x{}; ControlState y{}; - ControlState z{}; bool IsVisible() const; }; - explicit Cursor(const std::string& name); + Cursor(std::string name, std::string ui_name); ReshapeData GetReshapableState(bool adjusted) final override; ControlState GetGateRadiusAtAngle(double ang) const override; @@ -45,9 +44,6 @@ private: // to something that makes sense with the default range. static constexpr double STEP_PER_SEC = 0.01 * 200; - // Smooth out forward/backward movements: - static constexpr double STEP_Z_PER_SEC = 0.05 * 200; - static constexpr int AUTO_HIDE_MS = 2500; static constexpr double AUTO_HIDE_DEADZONE = 0.001; |