diff options
| author | JMC47 <JMC4789@gmail.com> | 2019-04-26 05:50:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 05:50:18 -0400 |
| commit | 664376dae15ef187df4e4c8c7c5e241b9a68fb5d (patch) | |
| tree | 0bbfa4617934f632156996a90922e232be1e7651 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h | |
| parent | 057fa6c092fb10abb90a0f038d90c97a00731a59 (diff) | |
| parent | ba1b3351184864ed3d5692a461b00edd2f3a21f6 (diff) | |
Merge pull request #7861 from jordan-woyak/mplus-emu
WiimoteEmu: Emulated MotionPlus and improved emulated swing.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h index da66dc034e..ae9cabe340 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h @@ -26,8 +26,9 @@ public: StateData GetState(bool adjusted = true); - // Return jerk in m/s^3. - ControlState GetMaxJerk() const; + // Velocities returned in m/s. + ControlState GetSpeed() const; + ControlState GetReturnSpeed() const; // Return twist angle in radians. ControlState GetTwistAngle() const; @@ -37,7 +38,8 @@ public: private: SettingValue<double> m_distance_setting; - SettingValue<double> m_jerk_setting; + SettingValue<double> m_speed_setting; + SettingValue<double> m_return_speed_setting; SettingValue<double> m_angle_setting; }; |