diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-20 14:18:03 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 14:18:03 -0400 | 
| commit | 326b044c19df0b1a342acf87f2ba7cd06e9a1e97 (patch) | |
| tree | d815c707b437b3685e8ba188bbf0940d4205de2a /src/input_common | |
| parent | 87f89ac82dae33f7ce4cd6a3b5e492510e8cf961 (diff) | |
| parent | fae2dd034462c5a6b086e46b3437ea6e2456d5eb (diff) | |
Merge pull request #367 from lioncash/clamp
math_util: Remove the Clamp() function
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/motion_emu.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index 59a035e70..caffe48cb 100644 --- a/src/input_common/motion_emu.cpp +++ b/src/input_common/motion_emu.cpp @@ -2,6 +2,7 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. +#include <algorithm>  #include <chrono>  #include <mutex>  #include <thread> @@ -43,8 +44,8 @@ public:                  tilt_angle = 0;              } else {                  tilt_direction = mouse_move.Cast<float>(); -                tilt_angle = MathUtil::Clamp(tilt_direction.Normalize() * sensitivity, 0.0f, -                                             MathUtil::PI * 0.5f); +                tilt_angle = +                    std::clamp(tilt_direction.Normalize() * sensitivity, 0.0f, MathUtil::PI * 0.5f);              }          }      } | 
