ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust dejitter factors

This commit is contained in:
thrust26 2019-05-08 22:36:11 +02:00
parent 5ae03c4f70
commit 70c8049275
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/emucore/Paddles.cxx
View File

@ -263,30 +263,25 @@ void Paddles::update()
int sa_xaxis = myEvent.get(myP0AxisValue); int sa_xaxis = myEvent.get(myP0AxisValue);
int sa_yaxis = myEvent.get(myP1AxisValue); int sa_yaxis = myEvent.get(myP1AxisValue);
const double fac1[MAX_DEJITTER - MIN_DEJITTER + 1] = { const double bFac[MAX_DEJITTER - MIN_DEJITTER + 1] = {
// higher values mean more dejitter strength // higher values mean more dejitter strength
0, // off 0, // off
0.5, 0.6, 0.7, 0.8, 0.9, 0.50, 0.59, 0.67, 0.74, 0.80,
0.5, 0.6, 0.7, 0.8, 0.9, 0.85, 0.89, 0.92, 0.94, 0.95
0.5, 0.6, 0.7, 0.8, 0.9,
0.5, 0.6, 0.7, 0.8, 0.9
}; };
const double fac2[MAX_DEJITTER - MIN_DEJITTER + 1] = { const double dFac[MAX_DEJITTER - MIN_DEJITTER + 1] = {
// lower values mean more dejitter strength // lower values mean more dejitter strength
1, // off 1, // off
1.0 / 32 , 1.0 / 32 , 1.0 / 32 , 1.0 / 32 , 1.0 / 32 , 1.0 / 45 , 1.0 / 64 , 1.0 / 90 , 1.0 / 128, 1.0 / 181,
1.0 / 64 , 1.0 / 64 , 1.0 / 64 , 1.0 / 64 , 1.0 / 64 , 1.0 / 256, 1.0 / 362, 1.0 / 512, 1.0 / 724, 1.0 / 1024
1.0 / 128, 1.0 / 128, 1.0 / 128, 1.0 / 128, 1.0 / 128,
1.0 / 256, 1.0 / 256, 1.0 / 256, 1.0 / 256, 1.0 / 256,
}; };
const double factor1 = fac1[DEJITTER]; const double baseFactor = bFac[DEJITTER];
const double factor2 = fac2[DEJITTER]; const double diffFactor = dFac[DEJITTER];
if(abs(myLastAxisX - sa_xaxis) > 10) if(abs(myLastAxisX - sa_xaxis) > 10)
{ {
// anti jitter, suppress small changes only // anti jitter, suppress small changes only
double dejitter = std::pow(factor1, abs(sa_xaxis - myLastAxisX) * factor2); double dejitter = std::pow(baseFactor, abs(sa_xaxis - myLastAxisX) * diffFactor);
sa_xaxis = sa_xaxis * (1 - dejitter) + myLastAxisX * dejitter; sa_xaxis = sa_xaxis * (1 - dejitter) + myLastAxisX * dejitter;
setPin(AnalogPin::Nine, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_xaxis)) / 65536.0))); setPin(AnalogPin::Nine, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_xaxis)) / 65536.0)));
@ -295,7 +290,7 @@ void Paddles::update()
if(abs(myLastAxisY - sa_yaxis) > 10) if(abs(myLastAxisY - sa_yaxis) > 10)
{ {
// anti jitter, suppress small changes only // anti jitter, suppress small changes only
double dejitter = std::pow(factor1, abs(sa_yaxis - myLastAxisY) * factor2); double dejitter = std::pow(baseFactor, abs(sa_yaxis - myLastAxisY) * diffFactor);
sa_yaxis = sa_yaxis * (1 - dejitter) + myLastAxisY * dejitter; sa_yaxis = sa_yaxis * (1 - dejitter) + myLastAxisY * dejitter;
setPin(AnalogPin::Five, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_yaxis)) / 65536.0))); setPin(AnalogPin::Five, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_yaxis)) / 65536.0)));

2
src/emucore/Paddles.hxx
View File

@ -52,7 +52,7 @@ class Paddles : public Controller
static constexpr int MAX_DIGITAL_SENSE = 20; static constexpr int MAX_DIGITAL_SENSE = 20;
static constexpr int MAX_MOUSE_SENSE = 20; static constexpr int MAX_MOUSE_SENSE = 20;
static constexpr int MIN_DEJITTER = 0; static constexpr int MIN_DEJITTER = 0;
static constexpr int MAX_DEJITTER = 20; static constexpr int MAX_DEJITTER = 10;
/** /**
Update the entire digital and analog pin state according to the Update the entire digital and analog pin state according to the