diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-19 03:01:46 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-19 06:14:25 +0200 |
| commit | 396a8d91a4423d9c793eeff0798d544613647511 (patch) | |
| tree | e0203961233db1ffcbbca2e15154d71d142c5822 /src/core/hle/service/hid | |
| parent | Tweak formatting settings (diff) | |
| download | yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.gz yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.bz2 yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.lz yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.xz yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.zst yuzu-396a8d91a4423d9c793eeff0798d544613647511.zip | |
Diffstat (limited to 'src/core/hle/service/hid')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 9 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid_spvr.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid_user.cpp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index d915a3105..5a2edd3c0 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -40,11 +40,10 @@ static int enable_accelerometer_count = 0; // positive means enabled static int enable_gyroscope_count = 0; // positive means enabled static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) { - constexpr float TAN30 = 0.577350269, - TAN60 = - 1 / TAN30; // 30 degree and 60 degree are angular thresholds for directions - constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = - 40 * 40; // a circle pad radius greater than 40 will trigger circle pad direction + // 30 degree and 60 degree are angular thresholds for directions + constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30; + // a circle pad radius greater than 40 will trigger circle pad direction + constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40; PadState state; state.hex = 0; diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp index 09007e304..00a0902c8 100644 --- a/src/core/hle/service/hid/hid_spvr.cpp +++ b/src/core/hle/service/hid/hid_spvr.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/hid/hid.h" #include "core/hle/service/hid/hid_spvr.h" +#include "core/hle/service/hid/hid.h" namespace Service { namespace HID { diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp index 42591543c..433e175bb 100644 --- a/src/core/hle/service/hid/hid_user.cpp +++ b/src/core/hle/service/hid/hid_user.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/hid/hid.h" #include "core/hle/service/hid/hid_user.h" +#include "core/hle/service/hid/hid.h" namespace Service { namespace HID { |