summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJohn Peterson <jpeterson57@gmail.com>2009-02-11 10:47:50 +0000
committerJohn Peterson <jpeterson57@gmail.com>2009-02-11 10:47:50 +0000
commit9651a30c1bbc73ccd890ae09e5fa1ffbb1bcec24 (patch)
tree16f0cae1fe69423cad234d0d821f8511c571ce32 /Source
parent0681f76a1df92bb92599623478322f906f2405f8 (diff)
Wiimote: Disabled the combined pitch and roll option that was not ready yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2217 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 9c159d6236..598c7e42e0 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -422,13 +422,17 @@ void TiltWiimoteGamepad(u8 &_x, u8 &_y, u8 &_z)
Roll = -Ly * (Range / 128);
}
+ // Adjustment to prevent a slightly to high angle
+ if (Pitch >= Range) Pitch = Range - 0.1;
+
// Calculate the accelerometer value from this tilt angle
- PitchDegreeToAccelerometer(Roll, Pitch, _x, _y, _z, g_Config.Trigger.Roll, g_Config.Trigger.Pitch);
+ //PitchDegreeToAccelerometer(Roll, Pitch, _x, _y, _z, g_Config.Trigger.Roll, g_Config.Trigger.Pitch);
+ PitchDegreeToAccelerometer(Roll, Pitch, _x, _y, _z, false, true);
//Console::ClearScreen();
/*Console::Print("L:%2.1f R:%2.1f Lx:%2.1f Range:%2.1f Degree:%2.1f L:%i R:%i\n",
Tl, Tr, Lx, Range, Degree, PadState[Page].Axis.Tl, PadState[Page].Axis.Tr);*/
- /*Console::Print("Degree:%2.1f\n", Degree);*/
+ /**/Console::Print("Pitch:%2.1f\n", Pitch);
}