piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

nJoy:

Browse Source 
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-02-11 10:30:02 +00:00
parent 5ba51ed789
commit 68f39cb287
18 changed files with 271 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -357,7 +357,7 @@ void SingleShake(u8 &_z, u8 &_y)
}
else // the default Z if nothing is pressed
{
z = Z;
_z = Z;
}
#endif
}
@ -367,7 +367,7 @@ void SingleShake(u8 &_z, u8 &_y)
measure of the tilting of the Wiimote. We are interested in this tilting range
90<39> to -90<39> */
// ---------------
void TiltWiimoteGamepad(u8 &_y, u8 &_z)
void TiltWiimoteGamepad(u8 &_x, u8 &_y, u8 &_z)
{
// Return if we have no pads
if (NumGoodPads == 0) return;
@ -395,10 +395,8 @@ void TiltWiimoteGamepad(u8 &_y, u8 &_z)
}
// It's easier to use a float here
float Degree = 0;
// Calculate the present room between the neutral and the maximum values
float RoomAbove = 255.0 - (float)Y;
float RoomBelow = (float)Y;
float Roll = 0;
float Pitch = 0;
// Save the Range in degrees, 45<34> and 90<39> are good values in some games
float Range = (float)g_Config.Trigger.Range;
@ -409,8 +407,8 @@ void TiltWiimoteGamepad(u8 &_y, u8 &_z)
Tl = Tl / 2;
Tr = Tr / 2;
Degree = Tl * (Range / 128)
- Tr * (Range / 128);
Pitch = Tl * (Range / 128)
- Tr * (Range / 128);
}
// Analog stick
@ -418,12 +416,14 @@ void TiltWiimoteGamepad(u8 &_y, u8 &_z)
{
// Adjust the trigger to go between negative and positive values
Lx = Lx - 128;
Ly = Ly - 128;
// Produce the final value
Degree = -Lx * (Range / 128);
Pitch = -Lx * (Range / 128);
Roll = -Ly * (Range / 128);
}
// Calculate the acceleometer value from this tilt angle
PitchDegreeToAccelerometer(Degree, _y, _z);
// Calculate the accelerometer value from this tilt angle
PitchDegreeToAccelerometer(Roll, Pitch, _x, _y, _z, g_Config.Trigger.Roll, g_Config.Trigger.Pitch);
//Console::ClearScreen();
/*Console::Print("L:%2.1f R:%2.1f Lx:%2.1f Range:%2.1f Degree:%2.1f L:%i R:%i\n",
@ -476,7 +476,8 @@ void TiltWiimoteKeyboard(u8 &_y, u8 &_z)
}
else
{
PitchDegreeToAccelerometer(KbDegree, _y, _z);
u8 x;
PitchDegreeToAccelerometer(KbDegree, 0, x, _y, _z, false, true);
//Console::Print("Degree: %2.1f\n", KbDegree);
}
// --------------------
@ -519,6 +520,11 @@ void FillReportAcc(wm_accel& _acc)
// ------------------------------------------------
// Wiimote to Gamepad translations
// ------------
// The following functions may or may not update these values
x = X;
y = Y;
z = Z;
// Shake the Wiimote
SingleShake(z, y);
@ -527,10 +533,10 @@ void FillReportAcc(wm_accel& _acc)
if (g_Config.Trigger.Type == g_Config.KEYBOARD)
TiltWiimoteKeyboard(y, z);
else if (g_Config.Trigger.Type == g_Config.TRIGGER || g_Config.Trigger.Type == g_Config.ANALOG)
TiltWiimoteGamepad(y, z);
TiltWiimoteGamepad(x, y, z);
// Write values
_acc.x = X;
// Write final values
_acc.x = x;
_acc.y = y;
_acc.z = z;