ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-23 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win] Fixed axis, button and hat value updates

Browse source
This commit is contained in:
thefiddler 2014-07-31 22:28:23 +02:00
parent e3875527eb
commit 5c0923004a
1 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Source/OpenTK/Platform/Windows/WinRawJoystick.cs
View file

@ -131,7 +131,8 @@ namespace OpenTK.Platform.Windows
int key = MakeKey(page, usage); int key = MakeKey(page, usage);
if (!axes.ContainsKey(key)) if (!axes.ContainsKey(key))
{ {
axes.Add(key, JoystickAxis.Axis0 + axes.Count); JoystickAxis axis = HidHelper.TranslateJoystickAxis(page, usage);
axes.Add(key, axis);
} }
return axes[key]; return axes[key];
} }
@ -319,7 +320,47 @@ namespace OpenTK.Platform.Windows
UpdateButtons(rin, stick, button_caps_count); UpdateButtons(rin, stick, button_caps_count);
//UpdateAxes(stick, caps, AxisCaps, axis_caps_count, DataBuffer, size); for (int i = 0; i < axis_caps_count; i++)
{
if (AxisCaps[i].IsRange)
{
Debug.Print("[{0}] Axis range collections not implemented. Please report your controller type at http://www.opentk.com",
GetType().Name);
continue;
}
HIDPage page = AxisCaps[i].UsagePage;
short usage = AxisCaps[i].NotRange.Usage;
uint value = 0;
HidProtocolStatus status = HidProtocol.GetUsageValue(
HidProtocolReportType.Input,
page, 0, usage, ref value,
PreparsedData,
new IntPtr((void*)&rin->Data.HID.RawData),
rin->Data.HID.Size);
if (status != HidProtocolStatus.Success)
{
Debug.Print("[{0}] HidProtocol.GetScaledUsageValue() failed. Error: {1}",
GetType().Name, status);
continue;
}
if (page == HIDPage.GenericDesktop && (HIDUsageGD)usage == HIDUsageGD.Hatswitch)
{
stick.SetHat(page, usage, GetHatPosition(value, AxisCaps[i]));
}
else
{
short scaled_value = (short)HidHelper.ScaleValue(
(int)((long)value + AxisCaps[i].LogicalMin),
AxisCaps[i].LogicalMin, AxisCaps[i].LogicalMax,
Int16.MinValue, Int16.MaxValue);
stick.SetAxis(page, usage, scaled_value);
}
}
return true; return true;
} }
} }
@ -327,13 +368,21 @@ namespace OpenTK.Platform.Windows
return false; return false;
} }
private HatPosition GetHatPosition(uint value, HidProtocolValueCaps caps)
{
if (caps.LogicalMax == 8)
return (HatPosition)value;
else
return HatPosition.Centered;
}
unsafe void UpdateButtons(RawInput* rin, Device stick, int button_caps_count) unsafe void UpdateButtons(RawInput* rin, Device stick, int button_caps_count)
{ {
stick.ClearButtons(); stick.ClearButtons();
for (int i = 0; i < button_caps_count; i++) for (int i = 0; i < button_caps_count; i++)
{ {
short* usage_list = stackalloc short[(int)JoystickButton.Last]; short* usage_list = stackalloc short[(int)JoystickButton.Last + 1];
int usage_length = (int)JoystickButton.Last; int usage_length = (int)JoystickButton.Last;
HIDPage page = ButtonCaps[i].UsagePage; HIDPage page = ButtonCaps[i].UsagePage;
@ -353,7 +402,8 @@ namespace OpenTK.Platform.Windows
for (int j = 0; j < usage_length; j++) for (int j = 0; j < usage_length; j++)
{ {
stick.SetButton(page, *(usage_list + j), true); short usage = *(usage_list + j);
stick.SetButton(page, usage, true);
} }
} }
} }
@ -462,7 +512,7 @@ namespace OpenTK.Platform.Windows
case HIDPage.Button: case HIDPage.Button:
if (is_range) if (is_range)
{ {
for (short usage = ButtonCaps[i].Range.UsageMin; usage < ButtonCaps[i].Range.UsageMax; usage++) for (short usage = ButtonCaps[i].Range.UsageMin; usage <= ButtonCaps[i].Range.UsageMax; usage++)
{ {
buttons++; buttons++;
stick.SetButton(page, usage, false); stick.SetButton(page, usage, false);