Merge pull request #4515 from bollu/improvedTilControls

Redid the tilt controls in a nicer way
This commit is contained in:
Henrik Rydgård committed 2013-12-22 02:13:28 -08:00
commit b0bfda6333
13 files changed
+329 -18

No files matched your search

+3 -4
View File
@@ -254,15 +254,14 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
#endif
// control->Get("KeyMapping",iMappingMap);
#ifdef USING_GLES2
control->Get("AccelerometerToAnalogHoriz", &bAccelerometerToAnalogHoriz, false);
control->Get("TiltBaseX", &fTiltBaseX, 0);
control->Get("TiltBaseY", &fTiltBaseY, 0);
control->Get("InvertTiltX", &bInvertTiltX, false);
control->Get("InvertTiltY", &bInvertTiltY, true);
control->Get("TiltSensitivityX", &iTiltSensitivityX, 100);
control->Get("TiltSensitivityY", &iTiltSensitivityY, 100);
control->Get("DeadzoneRadius", &fDeadzoneRadius, 0.35);
control->Get("DeadzoneRadius", &fDeadzoneRadius, 0.2);
control->Get("TiltInputType", &iTiltInputType, 0);
#endif
control->Get("DisableDpadDiagonals", &bDisableDpadDiagonals, false);
@@ -539,7 +538,6 @@ void Config::Save() {
control->Set("ShowTouchDpad", bShowTouchDpad);
#ifdef USING_GLES2
control->Set("AccelerometerToAnalogHoriz", bAccelerometerToAnalogHoriz);
control->Set("TiltBaseX", fTiltBaseX);
control->Set("TiltBaseY", fTiltBaseY);
control->Set("InvertTiltX", bInvertTiltX);
@@ -547,6 +545,7 @@ void Config::Save() {
control->Set("TiltSensitivityX", iTiltSensitivityX);
control->Set("TiltSensitivityY", iTiltSensitivityY);
control->Set("DeadzoneRadius", fDeadzoneRadius);
control->Set("TiltInputType", iTiltInputType);
#endif
control->Set("DisableDpadDiagonals", bDisableDpadDiagonals);
control->Set("TouchButtonStyle", iTouchButtonStyle);