CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hid/gesture: Replace x,y members of GestureState with a Point 

Simplifies assignments.
master
Lioncash 2021-05-17 15:10:59 +07:00
parent 2f1ef3910b
commit 20699e90fa
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hle/service/hid/controllers/gesture.cpp
Unescape Escape View File

@ -145,8 +145,7 @@ void Controller_Gesture::UpdateGestureSharedMemory(u8* data, std::size_t size,
cur_entry.detection_count = gesture.detection_count; cur_entry.detection_count = gesture.detection_count;
cur_entry.type = type; cur_entry.type = type;
cur_entry.attributes = attributes; cur_entry.attributes = attributes;
cur_entry.x = gesture.mid_point.x; cur_entry.pos = gesture.mid_point;
cur_entry.y = gesture.mid_point.y;
cur_entry.point_count = static_cast<s32>(gesture.active_points); cur_entry.point_count = static_cast<s32>(gesture.active_points);
for (size_t id = 0; id < MAX_POINTS; id++) { for (size_t id = 0; id < MAX_POINTS; id++) {
cur_entry.points[id].x = gesture.points[id].x; cur_entry.points[id].x = gesture.points[id].x;
@ -262,8 +261,8 @@ void Controller_Gesture::UpdatePanEvent(GestureProperties& gesture,
auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index]; auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
const auto& last_entry = const auto& last_entry =
shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17]; shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
cur_entry.delta_x = gesture.mid_point.x - last_entry.x; cur_entry.delta_x = gesture.mid_point.x - last_entry.pos.x;
cur_entry.delta_y = gesture.mid_point.y - last_entry.y; cur_entry.delta_y = gesture.mid_point.y - last_entry.pos.y;
cur_entry.vel_x = static_cast<f32>(cur_entry.delta_x) / time_difference; cur_entry.vel_x = static_cast<f32>(cur_entry.delta_x) / time_difference;
cur_entry.vel_y = static_cast<f32>(cur_entry.delta_y) / time_difference; cur_entry.vel_y = static_cast<f32>(cur_entry.delta_y) / time_difference;

3
src/core/hle/service/hid/controllers/gesture.h
Unescape Escape View File

@ -77,8 +77,7 @@ private:
s64_le detection_count; s64_le detection_count;
TouchType type; TouchType type;
Direction direction; Direction direction;
s32_le x; Point pos;
s32_le y;
s32_le delta_x; s32_le delta_x;
s32_le delta_y; s32_le delta_y;
f32 vel_x; f32 vel_x;