Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust non-linearity / precision mode interaction.

Browse Source 
Probably works.
This commit is contained in:
cim 2013-12-25 14:14:13 +00:00
parent 47d3f92bb1
commit 012af4837c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/OOJoystickManager.m
View File

@ -165,11 +165,25 @@ static id sSharedStickHandler = nil;
// from deadzone to non-deadzone // from deadzone to non-deadzone
if (axisvalue < 0.0) axisvalue = -(-axisvalue - deadzone)/(1 - deadzone); if (axisvalue < 0.0) axisvalue = -(-axisvalue - deadzone)/(1 - deadzone);
else axisvalue = (axisvalue - deadzone)/(1 - deadzone); else axisvalue = (axisvalue - deadzone)/(1 - deadzone);
// apply non-linearity
axisvalue = axisvalue*((1.0-nonlinear_parameter) + nonlinear_parameter*axisvalue*axisvalue);
// apply precision mode if needed
if (precisionMode)
{
axisvalue /= STICK_PRECISIONFAC;
}
return axisvalue;
/*
// these original settings caused problems for test pilots due to
// expectation that precisionmode would also reduce full-axis turn
// rate.
if (precisionMode) if (precisionMode)
{ {
return axisvalue*((1.0-nonlinear_parameter) + nonlinear_parameter*axisvalue*axisvalue); return axisvalue*((1.0-nonlinear_parameter) + nonlinear_parameter*axisvalue*axisvalue);
} }
return axisvalue; return axisvalue; */
} }