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

add dejitter UI and experimental parameters

This commit is contained in:
thrust26 2019-05-08 22:02:04 +02:00
parent 3d032f36dd
commit 5ae03c4f70
6 changed files with 75 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emucore/EventHandler.cxx
View File

@ -98,6 +98,7 @@ void EventHandler::initialize()
setActionMappings(kMenuMode);
Joystick::setDeadZone(myOSystem.settings().getInt("joydeadzone"));
Paddles::setDejitter(myOSystem.settings().getInt("dejitter"));
Paddles::setDigitalSensitivity(myOSystem.settings().getInt("dsense"));
Paddles::setMouseSensitivity(myOSystem.settings().getInt("msense"));
PointingDevice::setSensitivity(myOSystem.settings().getInt("tsense"));

41
src/emucore/Paddles.cxx
View File

@ -262,23 +262,41 @@ void Paddles::update()
bool sa_changed = false;
int sa_xaxis = myEvent.get(myP0AxisValue);
int sa_yaxis = myEvent.get(myP1AxisValue);
const double factor1 = 0.2; // TODO: configurable
const double factor2 = 1.0 / 256;
const double fac1[MAX_DEJITTER - MIN_DEJITTER + 1] = {
// higher values mean more dejitter strength
0, // off
0.5, 0.6, 0.7, 0.8, 0.9,
0.5, 0.6, 0.7, 0.8, 0.9,
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] = {
// lower values mean more dejitter strength
1, // off
1.0 / 32 , 1.0 / 32 , 1.0 / 32 , 1.0 / 32 , 1.0 / 32 ,
1.0 / 64 , 1.0 / 64 , 1.0 / 64 , 1.0 / 64 , 1.0 / 64 ,
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 factor2 = fac2[DEJITTER];
if(abs(myLastAxisX - sa_xaxis) > 10)
{
// anti jitter
double dFactor = std::pow(factor1, 1 / (abs(sa_xaxis - myLastAxisX) * factor2));
sa_xaxis = sa_xaxis * dFactor + myLastAxisX * (1 - dFactor);
// anti jitter, suppress small changes only
double dejitter = std::pow(factor1, abs(sa_xaxis - myLastAxisX) * factor2);
sa_xaxis = sa_xaxis * (1 - dejitter) + myLastAxisX * dejitter;
setPin(AnalogPin::Nine, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_xaxis)) / 65536.0)));
sa_changed = true;
}
if(abs(myLastAxisY - sa_yaxis) > 10)
{
// anti jitter
double dFactor = std::pow(factor1, 1 / (abs(sa_yaxis - myLastAxisY) * factor2));
sa_yaxis = sa_yaxis * dFactor + myLastAxisY * (1 - dFactor);
// anti jitter, suppress small changes only
double dejitter = std::pow(factor1, abs(sa_yaxis - myLastAxisY) * factor2);
sa_yaxis = sa_yaxis * (1 - dejitter) + myLastAxisY * dejitter;
setPin(AnalogPin::Five, Int32(MAX_RESISTANCE * ((32767 - Int16(sa_yaxis)) / 65536.0)));
sa_changed = true;
@ -409,6 +427,12 @@ bool Paddles::setMouseControl(
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Paddles::setDejitter(int strength)
{
DEJITTER = BSPF::clamp(strength, MIN_DEJITTER, MAX_DEJITTER);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Paddles::setDigitalSensitivity(int sensitivity)
{
@ -434,6 +458,7 @@ int Paddles::TRIGRANGE = Paddles::TRIGMAX;
int Paddles::DIGITAL_SENSITIVITY = -1;
int Paddles::DIGITAL_DISTANCE = -1;
int Paddles::MOUSE_SENSITIVITY = -1;
int Paddles::DEJITTER = 0;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const Controller::DigitalPin Paddles::ourButtonPin[2] = {

14
src/emucore/Paddles.hxx
View File

@ -48,6 +48,12 @@ class Paddles : public Controller
virtual ~Paddles() = default;
public:
static constexpr int MAX_DIGITAL_SENSE = 20;
static constexpr int MAX_MOUSE_SENSE = 20;
static constexpr int MIN_DEJITTER = 0;
static constexpr int MAX_DEJITTER = 20;
/**
Update the entire digital and analog pin state according to the
events currently set.
@ -83,6 +89,11 @@ class Paddles : public Controller
bool setMouseControl(Controller::Type xtype, int xid,
Controller::Type ytype, int yid) override;
/**
@param strength Value from 0 to 20
*/
static void setDejitter(int strength);
/**
Sets the sensitivity for digital emulation of paddle movement.
This is only used for *digital* events (ie, buttons or keys,
@ -141,9 +152,8 @@ class Paddles : public Controller
static constexpr int TRIGMAX = 4096;
static int TRIGRANGE; // This one is variable for the upper range
static constexpr int MAX_DIGITAL_SENSE = 20;
static constexpr int MAX_MOUSE_SENSE = 20;
static int DIGITAL_SENSITIVITY, DIGITAL_DISTANCE;
static int DEJITTER;
static int MOUSE_SENSITIVITY;
// Lookup table for associating paddle buttons with controller pins

1
src/emucore/Settings.cxx
View File

@ -87,6 +87,7 @@ Settings::Settings()
setPermanent("usemouse", "analog");
setPermanent("grabmouse", "true");
setPermanent("cursor", "2");
setPermanent("dejitter", "0");
setPermanent("dsense", "10");
setPermanent("msense", "10");
setPermanent("tsense", "10");

26
src/gui/InputDialog.cxx
View File

@ -51,7 +51,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
StringList actions;
// Set real dimensions
setSize(50 * fontWidth + 10, 16 * (lineHeight + 4) + 16 + _th, max_w, max_h);
setSize(50 * fontWidth + 10, 17 * (lineHeight + 4) + 16 + _th, max_w, max_h);
// The tab widget
xpos = 2; ypos = vBorder + _th;
@ -151,6 +151,17 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
myDeadzoneLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 5*fontWidth, lineHeight, "");
wid.push_back(myDeadzone);
// Add dejitter (Stelladaptor emulation for now only)
ypos += lineHeight + VGAP;
myDejitter = new SliderWidget(myTab, font, HBORDER, ypos,
"Paddle dejitter strength",
lwidth, kDejitterChanged);
myDejitter->setMinValue(Paddles::MIN_DEJITTER); myDejitter->setMaxValue(Paddles::MAX_DEJITTER);
myDejitter->setTickmarkInterval(4);
xpos = HBORDER + myDejitter->getWidth() + 5;
myDejitterLabel = new StaticTextWidget(myTab, font, xpos, ypos + 1, 24, lineHeight, "");
wid.push_back(myDejitter);
// Add paddle speed (digital emulation)
ypos += lineHeight + VGAP;
myDPaddleSpeed = new SliderWidget(myTab, font, HBORDER, ypos,
@ -264,6 +275,8 @@ void InputDialog::loadConfig()
myDeadzoneLabel->setValue(Joystick::deadzone());
// Paddle speed (digital and mouse)
myDejitter->setValue(instance().settings().getInt("dejitter"));
myDejitterLabel->setLabel(instance().settings().getString("dejitter"));
myDPaddleSpeed->setValue(instance().settings().getInt("dsense"));
myDPaddleLabel->setLabel(instance().settings().getString("dsense"));
myMPaddleSpeed->setValue(instance().settings().getInt("msense"));
@ -317,9 +330,14 @@ void InputDialog::saveConfig()
Joystick::setDeadZone(deadzone);
// Paddle speed (digital and mouse)
int dejitter = myDejitter->getValue();
instance().settings().setValue("dejitter", dejitter);
Paddles::setDejitter(dejitter);
int sensitivity = myDPaddleSpeed->getValue();
instance().settings().setValue("dsense", sensitivity);
Paddles::setDigitalSensitivity(sensitivity);
sensitivity = myMPaddleSpeed->getValue();
instance().settings().setValue("msense", sensitivity);
Paddles::setMouseSensitivity(sensitivity);
@ -384,6 +402,8 @@ void InputDialog::setDefaults()
myDPaddleLabel->setLabel("10");
myMPaddleSpeed->setValue(10);
myMPaddleLabel->setLabel("10");
myDejitter->setValue(0);
myDejitterLabel->setLabel("0");
myTrackBallSpeed->setValue(10);
myTrackBallLabel->setLabel("10");
@ -508,6 +528,10 @@ void InputDialog::handleCommand(CommandSender* sender, int cmd,
myMPaddleLabel->setValue(myMPaddleSpeed->getValue());
break;
case kDejitterChanged:
myDejitterLabel->setValue(myDejitter->getValue());
break;
case kTBSpeedChanged:
myTrackBallLabel->setValue(myTrackBallSpeed->getValue());
break;

3
src/gui/InputDialog.hxx
View File

@ -60,6 +60,7 @@ class InputDialog : public Dialog
private:
enum {
kDeadzoneChanged = 'DZch',
kDejitterChanged = 'Pjch',
kDPSpeedChanged = 'PDch',
kMPSpeedChanged = 'PMch',
kTBSpeedChanged = 'TBch',
@ -81,9 +82,11 @@ class InputDialog : public Dialog
SliderWidget* myDeadzone;
StaticTextWidget* myDeadzoneLabel;
SliderWidget* myDejitter;
SliderWidget* myDPaddleSpeed;
SliderWidget* myMPaddleSpeed;
SliderWidget* myTrackBallSpeed;
StaticTextWidget* myDejitterLabel;
StaticTextWidget* myDPaddleLabel;
StaticTextWidget* myMPaddleLabel;
StaticTextWidget* myTrackBallLabel;