summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-05-18 09:59:41 +0200
committerLioncash <mathew1800@gmail.com>2021-05-18 09:59:44 +0200
commit44556dc21ac5609e5c60334347baa60701d056b3 (patch)
tree06c487c2510e0aaedecdc427c610971f8708982b /src/core/hle/service
parenthid/gesture: Ensure all ID arrays are initialized (diff)
downloadyuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar.gz
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar.bz2
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar.lz
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar.xz
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.tar.zst
yuzu-44556dc21ac5609e5c60334347baa60701d056b3.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/hid/controllers/gesture.cpp31
-rw-r--r--src/core/hle/service/hid/controllers/gesture.h6
2 files changed, 23 insertions, 14 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
index 2c9330941..764abb5b6 100644
--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ b/src/core/hle/service/hid/controllers/gesture.cpp
@@ -154,8 +154,8 @@ void Controller_Gesture::UpdateGestureSharedMemory(u8* data, std::size_t size,
void Controller_Gesture::NewGesture(GestureProperties& gesture, TouchType& type,
Attribute& attributes) {
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+ const auto& last_entry = GetLastGestureEntry();
+
gesture.detection_count++;
type = TouchType::Touch;
@@ -168,8 +168,7 @@ void Controller_Gesture::NewGesture(GestureProperties& gesture, TouchType& type,
void Controller_Gesture::UpdateExistingGesture(GestureProperties& gesture, TouchType& type,
f32 time_difference) {
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+ const auto& last_entry = GetLastGestureEntry();
// Promote to pan type if touch moved
for (size_t id = 0; id < MAX_POINTS; id++) {
@@ -204,8 +203,8 @@ void Controller_Gesture::UpdateExistingGesture(GestureProperties& gesture, Touch
void Controller_Gesture::EndGesture(GestureProperties& gesture,
GestureProperties& last_gesture_props, TouchType& type,
Attribute& attributes, f32 time_difference) {
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+ const auto& last_entry = GetLastGestureEntry();
+
if (last_gesture_props.active_points != 0) {
switch (last_entry.type) {
case TouchType::Touch:
@@ -255,10 +254,9 @@ void Controller_Gesture::UpdatePanEvent(GestureProperties& gesture,
GestureProperties& last_gesture_props, TouchType& type,
f32 time_difference) {
auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
- cur_entry.delta = gesture.mid_point - last_entry.pos;
+ const auto& last_entry = GetLastGestureEntry();
+ cur_entry.delta = gesture.mid_point - last_entry.pos;
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;
last_pan_time_difference = time_difference;
@@ -284,8 +282,7 @@ void Controller_Gesture::EndPanEvent(GestureProperties& gesture,
GestureProperties& last_gesture_props, TouchType& type,
f32 time_difference) {
auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+ const auto& last_entry = GetLastGestureEntry();
cur_entry.vel_x =
static_cast<f32>(last_entry.delta.x) / (last_pan_time_difference + time_difference);
cur_entry.vel_y =
@@ -309,8 +306,8 @@ void Controller_Gesture::EndPanEvent(GestureProperties& gesture,
void Controller_Gesture::SetSwipeEvent(GestureProperties& gesture,
GestureProperties& last_gesture_props, TouchType& type) {
auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
- const auto& last_entry =
- shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+ const auto& last_entry = GetLastGestureEntry();
+
type = TouchType::Swipe;
gesture = last_gesture_props;
force_update = true;
@@ -353,6 +350,14 @@ std::optional<std::size_t> Controller_Gesture::GetUnusedFingerID() const {
return std::nullopt;
}
+Controller_Gesture::GestureState& Controller_Gesture::GetLastGestureEntry() {
+ return shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+}
+
+const Controller_Gesture::GestureState& Controller_Gesture::GetLastGestureEntry() const {
+ return shared_memory.gesture_states[(shared_memory.header.last_entry_index + 16) % 17];
+}
+
std::size_t Controller_Gesture::UpdateTouchInputEvent(
const std::tuple<float, float, bool>& touch_input, std::size_t finger_id) {
const auto& [x, y, pressed] = touch_input;
diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h
index c1578ec25..eecfeaad5 100644
--- a/src/core/hle/service/hid/controllers/gesture.h
+++ b/src/core/hle/service/hid/controllers/gesture.h
@@ -162,7 +162,11 @@ private:
TouchType& type);
// Returns an unused finger id, if there is no fingers available std::nullopt is returned.
- std::optional<size_t> GetUnusedFingerID() const;
+ [[nodiscard]] std::optional<size_t> GetUnusedFingerID() const;
+
+ // Retrieves the last gesture entry, as indicated by shared memory indices.
+ [[nodiscard]] GestureState& GetLastGestureEntry();
+ [[nodiscard]] const GestureState& GetLastGestureEntry() const;
/**
* If the touch is new it tries to assign a new finger id, if there is no fingers available no