diff options
author | bunnei <bunneidev@gmail.com> | 2020-10-08 19:18:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-08 19:18:39 +0200 |
commit | 06e65de93cfa923b6fb1f12fa20193515249234d (patch) | |
tree | 9771ca19a2686af1185f62ed7488d977d37a1703 /src/input_common/udp | |
parent | Merge pull request #4765 from ReinUsesLisp/fix-sort-devices (diff) | |
parent | Add random motion input to keyboard (diff) | |
download | yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar.gz yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar.bz2 yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar.lz yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar.xz yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.tar.zst yuzu-06e65de93cfa923b6fb1f12fa20193515249234d.zip |
Diffstat (limited to 'src/input_common/udp')
-rw-r--r-- | src/input_common/udp/client.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp index cf72f6fef..9d0b9f31d 100644 --- a/src/input_common/udp/client.cpp +++ b/src/input_common/udp/client.cpp @@ -219,14 +219,10 @@ void Client::OnPadData(Response::PadData data) { clients[client].motion.SetGyroscope(raw_gyroscope / 312.0f); clients[client].motion.UpdateRotation(time_difference); clients[client].motion.UpdateOrientation(time_difference); - Common::Vec3f gyroscope = clients[client].motion.GetGyroscope(); - Common::Vec3f accelerometer = clients[client].motion.GetAcceleration(); - Common::Vec3f rotation = clients[client].motion.GetRotations(); - std::array<Common::Vec3f, 3> orientation = clients[client].motion.GetOrientation(); { std::lock_guard guard(clients[client].status.update_mutex); - clients[client].status.motion_status = {accelerometer, gyroscope, rotation, orientation}; + clients[client].status.motion_status = clients[client].motion.GetMotion(); // TODO: add a setting for "click" touch. Click touch refers to a device that differentiates // between a simple "tap" and a hard press that causes the touch screen to click. @@ -250,6 +246,8 @@ void Client::OnPadData(Response::PadData data) { clients[client].status.touch_status = {x, y, is_active}; if (configuring) { + const Common::Vec3f gyroscope = clients[client].motion.GetGyroscope(); + const Common::Vec3f accelerometer = clients[client].motion.GetAcceleration(); UpdateYuzuSettings(client, accelerometer, gyroscope, is_active); } } |