diff options
author | german77 <juangerman-13@hotmail.com> | 2021-10-23 06:04:06 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:25 +0100 |
commit | b564f024f0be5023cf13fb2fca953ea6c1feeeb6 (patch) | |
tree | bb2fb272058a239a345856d4b34389791ea0a783 /src/core/hle/service/hid/controllers/gesture.h | |
parent | service/hid: Match shared memory closer to HW (diff) | |
download | yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.gz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.bz2 yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.lz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.xz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.zst yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/controllers/gesture.h | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h index 6f5abaa4f..58139a5cf 100644 --- a/src/core/hle/service/hid/controllers/gesture.h +++ b/src/core/hle/service/hid/controllers/gesture.h @@ -60,7 +60,7 @@ private: // This is nn::hid::GestureAttribute struct GestureAttribute { union { - u32_le raw{}; + u32 raw{}; BitField<4, 1, u32> is_new_touch; BitField<8, 1, u32> is_double_tap; @@ -70,33 +70,28 @@ private: // This is nn::hid::GestureState struct GestureState { - s64_le sampling_number; - s64_le detection_count; + s64 sampling_number; + s64 detection_count; GestureType type; GestureDirection direction; - Common::Point<s32_le> pos; - Common::Point<s32_le> delta; + Common::Point<s32> pos; + Common::Point<s32> delta; f32 vel_x; f32 vel_y; GestureAttribute attributes; f32 scale; f32 rotation_angle; - s32_le point_count; - std::array<Common::Point<s32_le>, 4> points; + s32 point_count; + std::array<Common::Point<s32>, 4> points; }; static_assert(sizeof(GestureState) == 0x60, "GestureState is an invalid size"); - struct Finger { - Common::Point<f32> pos{}; - bool pressed{}; - }; - struct GestureProperties { - std::array<Common::Point<s32_le>, MAX_POINTS> points{}; + std::array<Common::Point<s32>, MAX_POINTS> points{}; std::size_t active_points{}; - Common::Point<s32_le> mid_point{}; - s64_le detection_count{}; - u64_le delta_time{}; + Common::Point<s32> mid_point{}; + s64 detection_count{}; + u64 delta_time{}; f32 average_distance{}; f32 angle{}; }; @@ -150,10 +145,10 @@ private: Core::HID::EmulatedConsole* console; - std::array<Finger, MAX_POINTS> fingers{}; + std::array<Core::HID::TouchFinger, MAX_POINTS> fingers{}; GestureProperties last_gesture{}; - s64_le last_update_timestamp{}; - s64_le last_tap_timestamp{}; + s64 last_update_timestamp{}; + s64 last_tap_timestamp{}; f32 last_pan_time_difference{}; bool force_update{false}; bool enable_press_and_tap{false}; |