From fa8e23b84281022bf6b4e8916231a17e9997e5aa Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Mon, 20 Sep 2021 17:20:56 -0500
Subject: input_common: Rewrite touch

---
 src/input_common/drivers/touch_screen.cpp | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 src/input_common/drivers/touch_screen.cpp

(limited to 'src/input_common/drivers/touch_screen.cpp')

diff --git a/src/input_common/drivers/touch_screen.cpp b/src/input_common/drivers/touch_screen.cpp
new file mode 100644
index 000000000..e13835e9f
--- /dev/null
+++ b/src/input_common/drivers/touch_screen.cpp
@@ -0,0 +1,47 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included
+
+#include "common/param_package.h"
+#include "input_common/drivers/touch_screen.h"
+
+namespace InputCommon {
+
+TouchScreen::TouchScreen(const std::string input_engine_) : InputEngine(input_engine_) {
+    PreSetController(identifier);
+}
+
+void TouchScreen::TouchMoved(float x, float y, std::size_t finger) {
+    if (finger >= 16) {
+        return;
+    }
+    TouchPressed(x, y, finger);
+}
+
+void TouchScreen::TouchPressed(float x, float y, std::size_t finger) {
+    if (finger >= 16) {
+        return;
+    }
+    SetButton(identifier, static_cast<int>(finger), true);
+    SetAxis(identifier, static_cast<int>(finger * 2), x);
+    SetAxis(identifier, static_cast<int>(finger * 2 + 1), y);
+}
+
+void TouchScreen::TouchReleased(std::size_t finger) {
+    if (finger >= 16) {
+        return;
+    }
+    SetButton(identifier, static_cast<int>(finger), false);
+    SetAxis(identifier, static_cast<int>(finger * 2), 0.0f);
+    SetAxis(identifier, static_cast<int>(finger * 2 + 1), 0.0f);
+}
+
+void TouchScreen::ReleaseAllTouch() {
+    for (int index = 0; index < 16; ++index) {
+        SetButton(identifier, index, false);
+        SetAxis(identifier, index * 2, 0.0f);
+        SetAxis(identifier, index * 2 + 1, 0.0f);
+    }
+}
+
+} // namespace InputCommon
-- 
cgit v1.2.3


From 77fa4d4bf60526826ef8b53ee3870f7d2a761976 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Mon, 1 Nov 2021 14:17:53 -0600
Subject: second commit lion review

---
 src/input_common/drivers/touch_screen.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/input_common/drivers/touch_screen.cpp')

diff --git a/src/input_common/drivers/touch_screen.cpp b/src/input_common/drivers/touch_screen.cpp
index e13835e9f..377c9ee2b 100644
--- a/src/input_common/drivers/touch_screen.cpp
+++ b/src/input_common/drivers/touch_screen.cpp
@@ -7,6 +7,12 @@
 
 namespace InputCommon {
 
+constexpr PadIdentifier identifier = {
+    .guid = Common::UUID{Common::INVALID_UUID},
+    .port = 0,
+    .pad = 0,
+};
+
 TouchScreen::TouchScreen(const std::string input_engine_) : InputEngine(input_engine_) {
     PreSetController(identifier);
 }
-- 
cgit v1.2.3


From 42949738f2c01a4125a9a385c9100240181153ec Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 14 Nov 2021 21:56:54 -0600
Subject: kraken: Address comments from review

Fix compiler bug
---
 src/input_common/drivers/touch_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/input_common/drivers/touch_screen.cpp')

diff --git a/src/input_common/drivers/touch_screen.cpp b/src/input_common/drivers/touch_screen.cpp
index 377c9ee2b..45b3086f6 100644
--- a/src/input_common/drivers/touch_screen.cpp
+++ b/src/input_common/drivers/touch_screen.cpp
@@ -13,7 +13,7 @@ constexpr PadIdentifier identifier = {
     .pad = 0,
 };
 
-TouchScreen::TouchScreen(const std::string input_engine_) : InputEngine(input_engine_) {
+TouchScreen::TouchScreen(const std::string& input_engine_) : InputEngine(input_engine_) {
     PreSetController(identifier);
 }
 
-- 
cgit v1.2.3