diff options
| author | 2023-11-26 21:08:53 -0500 | |
|---|---|---|
| committer | 2023-11-26 21:08:53 -0500 | |
| commit | 1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a (patch) | |
| tree | c219aacab776c0a1e3956614b60a01fa2f6164cb /src/core/hid/emulated_console.h | |
| parent | shader_recompiler: Align SSBO offsets in GlobalMemory functions (diff) | |
| parent | Merge pull request #11535 from GPUCode/upload_cmdbuf (diff) | |
| download | yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.gz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.xz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.zip | |
Merge branch 'master' into ssbo-align
Diffstat (limited to 'src/core/hid/emulated_console.h')
| -rw-r--r-- | src/core/hid/emulated_console.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/hid/emulated_console.h b/src/core/hid/emulated_console.h index 79114bb6d..fae15a556 100644 --- a/src/core/hid/emulated_console.h +++ b/src/core/hid/emulated_console.h | |||
| @@ -38,14 +38,6 @@ using TouchParams = std::array<Common::ParamPackage, MaxTouchDevices>; | |||
| 38 | using ConsoleMotionValues = ConsoleMotionInfo; | 38 | using ConsoleMotionValues = ConsoleMotionInfo; |
| 39 | using TouchValues = std::array<Common::Input::TouchStatus, MaxTouchDevices>; | 39 | using TouchValues = std::array<Common::Input::TouchStatus, MaxTouchDevices>; |
| 40 | 40 | ||
| 41 | struct TouchFinger { | ||
| 42 | u64 last_touch{}; | ||
| 43 | Common::Point<float> position{}; | ||
| 44 | u32 id{}; | ||
| 45 | TouchAttribute attribute{}; | ||
| 46 | bool pressed{}; | ||
| 47 | }; | ||
| 48 | |||
| 49 | // Contains all motion related data that is used on the services | 41 | // Contains all motion related data that is used on the services |
| 50 | struct ConsoleMotion { | 42 | struct ConsoleMotion { |
| 51 | Common::Vec3f accel{}; | 43 | Common::Vec3f accel{}; |