diff options
Diffstat (limited to 'src/input_common/motion_emu.cpp')
| -rw-r--r-- | src/input_common/motion_emu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index 6d96d4019..868251628 100644 --- a/src/input_common/motion_emu.cpp +++ b/src/input_common/motion_emu.cpp | |||
| @@ -39,7 +39,7 @@ public: | |||
| 39 | void Tilt(int x, int y) { | 39 | void Tilt(int x, int y) { |
| 40 | auto mouse_move = Common::MakeVec(x, y) - mouse_origin; | 40 | auto mouse_move = Common::MakeVec(x, y) - mouse_origin; |
| 41 | if (is_tilting) { | 41 | if (is_tilting) { |
| 42 | std::lock_guard<std::mutex> guard(tilt_mutex); | 42 | std::lock_guard guard{tilt_mutex}; |
| 43 | if (mouse_move.x == 0 && mouse_move.y == 0) { | 43 | if (mouse_move.x == 0 && mouse_move.y == 0) { |
| 44 | tilt_angle = 0; | 44 | tilt_angle = 0; |
| 45 | } else { | 45 | } else { |
| @@ -51,13 +51,13 @@ public: | |||
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | void EndTilt() { | 53 | void EndTilt() { |
| 54 | std::lock_guard<std::mutex> guard(tilt_mutex); | 54 | std::lock_guard guard{tilt_mutex}; |
| 55 | tilt_angle = 0; | 55 | tilt_angle = 0; |
| 56 | is_tilting = false; | 56 | is_tilting = false; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() { | 59 | std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() { |
| 60 | std::lock_guard<std::mutex> guard(status_mutex); | 60 | std::lock_guard guard{status_mutex}; |
| 61 | return status; | 61 | return status; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| @@ -93,7 +93,7 @@ private: | |||
| 93 | old_q = q; | 93 | old_q = q; |
| 94 | 94 | ||
| 95 | { | 95 | { |
| 96 | std::lock_guard<std::mutex> guard(tilt_mutex); | 96 | std::lock_guard guard{tilt_mutex}; |
| 97 | 97 | ||
| 98 | // Find the quaternion describing current 3DS tilting | 98 | // Find the quaternion describing current 3DS tilting |
| 99 | q = Common::MakeQuaternion( | 99 | q = Common::MakeQuaternion( |
| @@ -115,7 +115,7 @@ private: | |||
| 115 | 115 | ||
| 116 | // Update the sensor state | 116 | // Update the sensor state |
| 117 | { | 117 | { |
| 118 | std::lock_guard<std::mutex> guard(status_mutex); | 118 | std::lock_guard guard{status_mutex}; |
| 119 | status = std::make_tuple(gravity, angular_rate); | 119 | status = std::make_tuple(gravity, angular_rate); |
| 120 | } | 120 | } |
| 121 | } | 121 | } |