yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

input_common: Fix VS2022 compilation errors

This commit is contained in:
ameerj 2021-10-19 20:35:38 -04:00
parent f190547bbb
commit b01aa721ff
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/input_common/udp/client.cpp
View File

@ -471,39 +471,35 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
std::function<void(u16, u16, u16, u16)> data_callback) { std::function<void(u16, u16, u16, u16)> data_callback) {
std::thread([=, this] { std::thread([=, this] {
constexpr u16 CALIBRATION_THRESHOLD = 100;
u16 min_x{UINT16_MAX};
u16 min_y{UINT16_MAX};
u16 max_x{};
u16 max_y{};
Status current_status{Status::Initialized}; Status current_status{Status::Initialized};
SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, SocketCallback callback{
[](Response::Version) {}, [](Response::PortInfo) {},
[&](Response::PadData data) { [&](Response::PadData data) {
static constexpr u16 CALIBRATION_THRESHOLD = 100;
static constexpr u16 MAX_VALUE = UINT16_MAX;
if (current_status == Status::Initialized) { if (current_status == Status::Initialized) {
// Receiving data means the communication is ready now // Receiving data means the communication is ready now
current_status = Status::Ready; current_status = Status::Ready;
status_callback(current_status); status_callback(current_status);
} }
if (data.touch[0].is_active == 0) { const auto& touchpad_0 = data.touch[0];
if (touchpad_0.is_active == 0) {
return; return;
} }
LOG_DEBUG(Input, "Current touch: {} {}", data.touch[0].x, LOG_DEBUG(Input, "Current touch: {} {}", touchpad_0.x, touchpad_0.y);
data.touch[0].y); const u16 min_x = std::min(MAX_VALUE, static_cast<u16>(touchpad_0.x));
min_x = std::min(min_x, static_cast<u16>(data.touch[0].x)); const u16 min_y = std::min(MAX_VALUE, static_cast<u16>(touchpad_0.y));
min_y = std::min(min_y, static_cast<u16>(data.touch[0].y));
if (current_status == Status::Ready) { if (current_status == Status::Ready) {
// First touch - min data (min_x/min_y) // First touch - min data (min_x/min_y)
current_status = Status::Stage1Completed; current_status = Status::Stage1Completed;
status_callback(current_status); status_callback(current_status);
} }
if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD && if (touchpad_0.x - min_x > CALIBRATION_THRESHOLD &&
data.touch[0].y - min_y > CALIBRATION_THRESHOLD) { touchpad_0.y - min_y > CALIBRATION_THRESHOLD) {
// Set the current position as max value and finishes // Set the current position as max value and finishes configuration
// configuration const u16 max_x = touchpad_0.x;
max_x = data.touch[0].x; const u16 max_y = touchpad_0.y;
max_y = data.touch[0].y;
current_status = Status::Completed; current_status = Status::Completed;
data_callback(min_x, min_y, max_x, max_y); data_callback(min_x, min_y, max_x, max_y);
status_callback(current_status); status_callback(current_status);