midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Interpolation v2, w/vector and roundf (#5350)

Browse Source
This commit is contained in:
xperia64 2020-06-14 14:56:10 -04:00 committed by GitHub
parent 16913feb44
commit 2e24183e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/hle/service/hid/hid.cpp
View File

@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <numeric>
#include <boost/serialization/array.hpp> #include <boost/serialization/array.hpp>
#include <boost/serialization/shared_ptr.hpp> #include <boost/serialization/shared_ptr.hpp>
#include <boost/serialization/unique_ptr.hpp> #include <boost/serialization/unique_ptr.hpp>
@ -135,9 +136,25 @@ void Module::UpdatePadCallback(u64 userdata, s64 cycles_late) {
// Get current circle pad position and update circle pad direction // Get current circle pad position and update circle pad direction
float circle_pad_x_f, circle_pad_y_f; float circle_pad_x_f, circle_pad_y_f;
std::tie(circle_pad_x_f, circle_pad_y_f) = circle_pad->GetStatus(); std::tie(circle_pad_x_f, circle_pad_y_f) = circle_pad->GetStatus();
constexpr int MAX_CIRCLEPAD_POS = 0x9C; // Max value for a circle pad position
s16 circle_pad_x = static_cast<s16>(circle_pad_x_f * MAX_CIRCLEPAD_POS); // xperia64: 0x9A seems to be the calibrated limit of the circle pad
s16 circle_pad_y = static_cast<s16>(circle_pad_y_f * MAX_CIRCLEPAD_POS); // Verified by using Input Redirector with very large-value digital inputs
// on the circle pad and calibrating using the system settings application
constexpr int MAX_CIRCLEPAD_POS = 0x9A; // Max value for a circle pad position
// These are rounded rather than truncated on actual hardware
s16 circle_pad_new_x = static_cast<s16>(std::roundf(circle_pad_x_f * MAX_CIRCLEPAD_POS));
s16 circle_pad_new_y = static_cast<s16>(std::roundf(circle_pad_y_f * MAX_CIRCLEPAD_POS));
s16 circle_pad_x =
(circle_pad_new_x + std::accumulate(circle_pad_old_x.begin(), circle_pad_old_x.end(), 0)) /
CIRCLE_PAD_AVERAGING;
s16 circle_pad_y =
(circle_pad_new_y + std::accumulate(circle_pad_old_y.begin(), circle_pad_old_y.end(), 0)) /
CIRCLE_PAD_AVERAGING;
circle_pad_old_x.erase(circle_pad_old_x.begin());
circle_pad_old_x.push_back(circle_pad_new_x);
circle_pad_old_y.erase(circle_pad_old_y.begin());
circle_pad_old_y.push_back(circle_pad_new_y);
Core::Movie::GetInstance().HandlePadAndCircleStatus(state, circle_pad_x, circle_pad_y); Core::Movie::GetInstance().HandlePadAndCircleStatus(state, circle_pad_x, circle_pad_y);

9
src/core/hle/service/hid/hid.h
View File

@ -8,6 +8,7 @@
#include <atomic> #include <atomic>
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
#include <vector>
#include <boost/serialization/version.hpp> #include <boost/serialization/version.hpp>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
@ -318,6 +319,14 @@ private:
// Storing this here was necessary for emulation specific tasks like cheats or scripting. // Storing this here was necessary for emulation specific tasks like cheats or scripting.
PadState state; PadState state;
// xperia64: These are used to averate the previous N raw circle pad inputs with the current raw
// input to simulate the sluggishness of a real 3DS circle pad
// The Theatrhythm games rely on the circle pad being fairly slow to move, and from empircal
// testing, need a minimum of 3 averaging to not drop inputs
static constexpr s16 CIRCLE_PAD_AVERAGING = 3;
std::vector<s16> circle_pad_old_x = std::vector<s16>(CIRCLE_PAD_AVERAGING - 1, 0);
std::vector<s16> circle_pad_old_y = std::vector<s16>(CIRCLE_PAD_AVERAGING - 1, 0);
u32 next_pad_index = 0; u32 next_pad_index = 0;
u32 next_touch_index = 0; u32 next_touch_index = 0;
u32 next_accelerometer_index = 0; u32 next_accelerometer_index = 0;