diff options
| author | Ameer <aj662@drexel.edu> | 2020-07-06 23:01:57 -0400 |
|---|---|---|
| committer | Ameer <aj662@drexel.edu> | 2020-07-06 23:01:57 -0400 |
| commit | e3253b5f1896605f94d661cae1a7333522b6aee8 (patch) | |
| tree | 491bece04d0603617e429e816f85281a3c601b22 /src/input_common/gcadapter/gc_poller.cpp | |
| parent | 86abff48e1212498a3f6361012062458d8ae24ba (diff) | |
Brace the code! Fix compile error due to class member construction order
Diffstat (limited to 'src/input_common/gcadapter/gc_poller.cpp')
| -rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index c9bb7e571..ed99f98b4 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp @@ -155,10 +155,11 @@ public: // division is not by a perfect 128 to account for some variance in center location // e.g. my device idled at 131 in X, 120 in Y, and full range of motion was in range // [20-230] - if (axis % 2 == 0) + if (axis % 2 == 0) { return (gcadapter->GetPadState()[port].axes.at(axis) - origin_value_x) / 95.0f; - else + } else { return (gcadapter->GetPadState()[port].axes.at(axis) - origin_value_y) / 95.0f; + } } std::pair<float, float> GetAnalog(int axis_x, int axis_y) const { @@ -208,10 +209,10 @@ private: const int axis_x; const int axis_y; const float deadzone; + GCAdapter::Adapter* gcadapter; const float origin_value_x; const float origin_value_y; mutable std::mutex mutex; - GCAdapter::Adapter* gcadapter; }; /// An analog device factory that creates analog devices from GC Adapter |
