Skip to content

Fire GLFW joystick events #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Fire GLFW joystick events #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4954b
Fire GLFW joystick events
Perksey Mar 20, 2024
1f73493
Sneak in a fix for #1862 as well
Perksey Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/Input/Silk.NET.Input.Glfw/GlfwJoystick.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,29 @@ public unsafe void Update()

for (var i = 0; i < btnCount; i++)
{
((Button[]) Buttons)[i] = new Button(ButtonName.Unknown, i, btn[i] == (int) InputAction.Press);
var thisBtn = new Button(ButtonName.Unknown, i, btn[i] == (int) InputAction.Press);
var shouldInvoke = ((Button[]) Buttons)[i].Pressed != thisBtn.Pressed;
((Button[]) Buttons)[i] = thisBtn;
if (shouldInvoke)
{
(thisBtn.Pressed ? ButtonDown : ButtonUp)?.Invoke(this, thisBtn);
}
}

for (var i = 0; i < axisCount; i++)
{
((Axis[]) Axes)[i] = new Axis(i, axes[i]);
var thisAxis = new Axis(i, Deadzone.Apply(axes[i]));
var shouldInvoke = ((Axis[]) Axes)[i].Position != thisAxis.Position;
((Axis[]) Axes)[i] = thisAxis;
if (shouldInvoke)
{
AxisMoved?.Invoke(this, thisAxis);
}
}

for (var i = 0; i < hatCount; i++)
{
((Hat[]) Hats)[i] = new Hat
var thisHat = new Hat
(
i, hats[i] switch
{
Expand All @@ -83,6 +95,12 @@ public unsafe void Update()
_ => Position2D.Centered
}
);
var shouldInvoke = ((Hat[]) Hats)[i].Position != thisHat.Position;
((Hat[]) Hats)[i] = thisHat;
if (shouldInvoke)
{
HatMoved?.Invoke(this, thisHat);
}
}

if (!_connected)
Expand Down
4 changes: 2 additions & 2 deletions src/Windowing/Silk.NET.Windowing.Sdl/SdlWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ protected override void CoreInitialize(ViewOptions opts)
};
CoreInitialize
(
opts, flags, InitialMonitor?.Bounds.Origin.X + Position.X,
InitialMonitor?.Bounds.Origin.Y + Position.Y, Size.X, Size.Y, Title, SharedContext
opts, flags, (InitialMonitor?.Bounds.Origin.X ?? 0) + _extendedOptionsCache.Position.X,
(InitialMonitor?.Bounds.Origin.Y ?? 0) + _extendedOptionsCache.Position.Y, Size.X, Size.Y, Title, SharedContext
);
}
}
Expand Down