HID: use TouchDevice for touch pad
This commit is contained in:
parent
61442d6afb
commit
c84e60b470
|
@ -126,4 +126,10 @@ using AnalogDevice = InputDevice<std::tuple<float, float>>;
|
||||||
*/
|
*/
|
||||||
using MotionDevice = InputDevice<std::tuple<Math::Vec3<float>, Math::Vec3<float>>>;
|
using MotionDevice = InputDevice<std::tuple<Math::Vec3<float>, Math::Vec3<float>>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A touch device is an input device that returns a tuple of two floats and a bool. The floats are
|
||||||
|
* x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed.
|
||||||
|
*/
|
||||||
|
using TouchDevice = InputDevice<std::tuple<float, float, bool>>;
|
||||||
|
|
||||||
} // namespace Input
|
} // namespace Input
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
|
#include "core/3ds.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
#include "core/frontend/emu_window.h"
|
|
||||||
#include "core/frontend/input.h"
|
#include "core/frontend/input.h"
|
||||||
#include "core/hle/ipc.h"
|
#include "core/hle/ipc.h"
|
||||||
#include "core/hle/kernel/event.h"
|
#include "core/hle/kernel/event.h"
|
||||||
|
@ -19,7 +19,6 @@
|
||||||
#include "core/hle/service/hid/hid_spvr.h"
|
#include "core/hle/service/hid/hid_spvr.h"
|
||||||
#include "core/hle/service/hid/hid_user.h"
|
#include "core/hle/service/hid/hid_user.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
#include "video_core/video_core.h"
|
|
||||||
|
|
||||||
namespace Service {
|
namespace Service {
|
||||||
namespace HID {
|
namespace HID {
|
||||||
|
@ -59,6 +58,7 @@ static std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::
|
||||||
buttons;
|
buttons;
|
||||||
static std::unique_ptr<Input::AnalogDevice> circle_pad;
|
static std::unique_ptr<Input::AnalogDevice> circle_pad;
|
||||||
static std::unique_ptr<Input::MotionDevice> motion_device;
|
static std::unique_ptr<Input::MotionDevice> motion_device;
|
||||||
|
static std::unique_ptr<Input::TouchDevice> touch_device;
|
||||||
|
|
||||||
DirectionState GetStickDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
|
DirectionState GetStickDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
|
||||||
// 30 degree and 60 degree are angular thresholds for directions
|
// 30 degree and 60 degree are angular thresholds for directions
|
||||||
|
@ -96,6 +96,7 @@ static void LoadInputDevices() {
|
||||||
circle_pad = Input::CreateDevice<Input::AnalogDevice>(
|
circle_pad = Input::CreateDevice<Input::AnalogDevice>(
|
||||||
Settings::values.analogs[Settings::NativeAnalog::CirclePad]);
|
Settings::values.analogs[Settings::NativeAnalog::CirclePad]);
|
||||||
motion_device = Input::CreateDevice<Input::MotionDevice>(Settings::values.motion_device);
|
motion_device = Input::CreateDevice<Input::MotionDevice>(Settings::values.motion_device);
|
||||||
|
touch_device = Input::CreateDevice<Input::TouchDevice>(Settings::values.touch_device);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void UnloadInputDevices() {
|
static void UnloadInputDevices() {
|
||||||
|
@ -104,6 +105,7 @@ static void UnloadInputDevices() {
|
||||||
}
|
}
|
||||||
circle_pad.reset();
|
circle_pad.reset();
|
||||||
motion_device.reset();
|
motion_device.reset();
|
||||||
|
touch_device.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void UpdatePadCallback(u64 userdata, int cycles_late) {
|
static void UpdatePadCallback(u64 userdata, int cycles_late) {
|
||||||
|
@ -172,8 +174,10 @@ static void UpdatePadCallback(u64 userdata, int cycles_late) {
|
||||||
// Get the current touch entry
|
// Get the current touch entry
|
||||||
TouchDataEntry& touch_entry = mem->touch.entries[mem->touch.index];
|
TouchDataEntry& touch_entry = mem->touch.entries[mem->touch.index];
|
||||||
bool pressed = false;
|
bool pressed = false;
|
||||||
|
float x, y;
|
||||||
std::tie(touch_entry.x, touch_entry.y, pressed) = VideoCore::g_emu_window->GetTouchState();
|
std::tie(x, y, pressed) = touch_device->GetStatus();
|
||||||
|
touch_entry.x = static_cast<u16>(x * Core::kScreenBottomWidth);
|
||||||
|
touch_entry.y = static_cast<u16>(y * Core::kScreenBottomHeight);
|
||||||
touch_entry.valid.Assign(pressed ? 1 : 0);
|
touch_entry.valid.Assign(pressed ? 1 : 0);
|
||||||
|
|
||||||
// TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which
|
// TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which
|
||||||
|
|
|
@ -80,6 +80,7 @@ struct Values {
|
||||||
std::array<std::string, NativeButton::NumButtons> buttons;
|
std::array<std::string, NativeButton::NumButtons> buttons;
|
||||||
std::array<std::string, NativeAnalog::NumAnalogs> analogs;
|
std::array<std::string, NativeAnalog::NumAnalogs> analogs;
|
||||||
std::string motion_device;
|
std::string motion_device;
|
||||||
|
std::string touch_device;
|
||||||
|
|
||||||
// Core
|
// Core
|
||||||
bool use_cpu_jit;
|
bool use_cpu_jit;
|
||||||
|
|
Reference in New Issue