diff options
| author |  bunnei | 2016-12-15 17:45:24 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-15 17:45:24 -0500 |
| commit | 9dc43d3720fb852a5aa66b1b9e644fd102a61995 (patch) | |
| tree | 3ff5893b524937ae640967aa74f0675f4e38072d /src/core | |
| parent | Merge pull request #2330 from lioncash/pragma (diff) | |
| parent | hid: Get rid of a double -> float truncation warning (diff) | |
| download | yuzu-9dc43d3720fb852a5aa66b1b9e644fd102a61995.tar.gz yuzu-9dc43d3720fb852a5aa66b1b9e644fd102a61995.tar.xz yuzu-9dc43d3720fb852a5aa66b1b9e644fd102a61995.zip | |
Merge pull request #2331 from lioncash/trunc
hid: Get rid of a double -> float truncation warning
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 99baded11..18a1b6a16 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -37,7 +37,8 @@ static int enable_gyroscope_count = 0; // positive means enabled | |||
| 37 | 37 | ||
| 38 | static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) { | 38 | static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) { |
| 39 | // 30 degree and 60 degree are angular thresholds for directions | 39 | // 30 degree and 60 degree are angular thresholds for directions |
| 40 | constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30; | 40 | constexpr float TAN30 = 0.577350269f; |
| 41 | constexpr float TAN60 = 1 / TAN30; | ||
| 41 | // a circle pad radius greater than 40 will trigger circle pad direction | 42 | // a circle pad radius greater than 40 will trigger circle pad direction |
| 42 | constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40; | 43 | constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40; |
| 43 | PadState state; | 44 | PadState state; |