Skip to content

[outdated] ControllerManagement for iOS #168

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

Closed
J0EK3R wants to merge 12 commits into from
Closed

[outdated] ControllerManagement for iOS #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67940f6
added ControllerManagement for iOS
Aug 30, 2025
436546c
removed commented-out code and enshure PlayerIndex is set
Sep 3, 2025
56eaa80
split "controllerdevice" to "controller device"
Sep 6, 2025
1ba447b
split "Controllerdevice" to "Controller device"
Sep 6, 2025
9956cee
codebase simplified
Sep 6, 2025
220ec02
split "ControllerDevice" to "Controller device"
Sep 6, 2025
510a368
changed variable name "gamepad" to "controller"
Sep 6, 2025
5373ae0
static array of ValidPlayerIndexes
Sep 6, 2025
aff7c47
Use GCController.VendorName if available as controller's displayed name
Sep 10, 2025
47ea406
use HasValueChanged from base class
Sep 10, 2025
86b8d19
use of constants BUTTON_PRESSED and BUTTON_RELEASED
Sep 10, 2025
e3e78a2
use switch-expression and constants to adjust value
Sep 10, 2025
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
17 changes: 0 additions & 17 deletions BrickController2/BrickController2.Android/Extensions/InputDeviceExtensions.cs
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions ...roller2/BrickController2.Android/PlatformServices/GameController/GameControllerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace BrickController2.Droid.PlatformServices.GameController
{
internal class GameControllerService : GameControllerServiceBase<GamepadController>
internal class GameControllerService : GameControllerServiceBase
{
private readonly InputManager _inputManager;

Expand Down Expand Up @@ -36,9 +36,9 @@ internal void MainActivityOnInputDeviceAdded(int deviceId)
/// <param name="deviceId">deviceId of InputDevice</param>
internal void MainActivityOnInputDeviceRemoved(int deviceId)
{
if (TryRemove(x => x.Gamepad.Id == deviceId, out var controller))
if (TryRemove<GamepadController>(x => x.ControllerDevice.Id == deviceId, out var controller))
{
_logger.LogInformation("Gamepad has been removed DeviceId:{id}, ControllerId:{controllerId}",
_logger.LogInformation("ControllerDevice has been removed DeviceId:{id}, ControllerId:{controllerId}",
deviceId, controller.ControllerId);
}
}
Expand All @@ -64,14 +64,14 @@ internal void MainActivityOnInputDeviceChanged(int deviceId)
else if (controller != null)
{
// handle change - remove and then add it again
TryRemove(x => x.Gamepad.Id == deviceId, out _);
TryRemove<GamepadController>(x => x.ControllerDevice.Id == deviceId, out _);
}
AddGameControllerDevice(device);
}
}
else if (TryRemove(x => x.Gamepad.Id == deviceId, out var controller))
else if (TryRemove<GamepadController>(x => x.ControllerDevice.Id == deviceId, out var controller))
{
_logger.LogInformation("Gamepad has been removed DeviceId:{id}, ControllerId:{controllerId}",
_logger.LogInformation("ControllerDevice has been removed DeviceId:{id}, ControllerId:{controllerId}",
deviceId, controller.ControllerId);
}
}
Expand Down Expand Up @@ -122,7 +122,7 @@ private void AddGameControllerDevice(InputDevice gamepad)
}

private bool TryGetControllerByDeviceId(int deviceId, [MaybeNullWhen(false)] out GamepadController controller)
=> TryGetController(x => x.Gamepad.Id == deviceId, out controller);
=> TryGetController(x => x.ControllerDevice.Id == deviceId, out controller);

private static bool TryGetGamepadDevice(int deviceId, [MaybeNullWhen(false)] out InputDevice device)
{
Expand Down
4 changes: 0 additions & 4 deletions ...Controller2/BrickController2.Android/PlatformServices/GameController/GamepadController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Android.Views;
using BrickController2.Droid.Extensions;
using BrickController2.PlatformServices.GameController;
using System;
using System.Collections.Generic;
Expand All @@ -25,11 +24,8 @@ public GamepadController(GameControllerService service, InputDevice gamePad)
{
// initialize properties
Name = GetDisplayName(gamePad);
VendorId = gamePad.VendorId;
ProductId = gamePad.ProductId;
ControllerNumber = gamePad.ControllerNumber;
ControllerId = GetControllerIdFromNumber(gamePad.ControllerNumber);
UniquePersistantDeviceId = gamePad.GetUniquePersistentDeviceId();
}

internal bool OnButtonEvent(KeyEvent e, float buttonValue)
Expand Down
6 changes: 3 additions & 3 deletions ...ntroller2/BrickController2.WinUI/PlatformServices/GameController/GameControllerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace BrickController2.Windows.PlatformServices.GameController;

internal class GameControllerService : GameControllerServiceBase<GamepadController>, IGameControllerService
internal class GameControllerService : GameControllerServiceBase, IGameControllerService
{
private readonly IMainThreadService _mainThreadService;
private readonly IDispatcherProvider _dispatcherProvider;
Expand Down Expand Up @@ -53,9 +53,9 @@ private void Gamepad_GamepadRemoved(object? sender, Gamepad gamepad)
// ensure stopped in UI thread
_ = _mainThreadService.RunOnMainThread(() =>
{
if (TryRemove(x => x.Gamepad == gamepad, out var controller))
if (TryRemove<GamepadController>(x => x.ControllerDevice == gamepad, out var controller))
Copy link
Owner

@vicocz vicocz Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is type of GamepadController needed to be defined for TryRemove? What is the benefit of such change, if it has to be specified here?

Copy link
Author

@J0EK3R J0EK3R Sep 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's because we lost the generic in the base class - it's just the interface IGameController now

    /// <summary>
    /// Collection of available gamepads having <see cref="IGameController.ControllerId"/>
    /// </summary>
    private readonly List<IGameController> _availableControllers = [];

But to distinguish the controllers we neet to handle the real type to be able to access properties not defined in the interface.

If there is another remove-event for another controller type to handle - i.e. for the McpServer ;) - the generic paramater of TryRemove<> would be that special type of controller:

    private void McpServerRemoved(object? sender, McpServer e)
    {
        lock (_lockObject)
        {
            // ensure stopped in UI thread
            _ = _mainThreadService.RunOnMainThread(() =>
            {
                if (TryRemove<McpServerController>(x => x.ControllerDevice is McpServer, out var controller))
                {
                    _logger.LogInformation("McpServer has been removed");
                }
            });
        }
    }

Copy link
Owner

@vicocz vicocz Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I d not like this desgin as:

  • it enforces hard coupling of MCP server to controller service for each platform
image * additionally it seems to me in your follow up (#165), MCP platform inplementations are nearly the same. Is it?

Shortly said, it should be done differently. May be there might be some game controller providers, which are providing different types of game controllers, the gamepad ones, MCP ones. Just a quick idea.

Copy link
Author

@J0EK3R J0EK3R Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, if I understood you correctly, I see it that way too.
It would be a clean solution if there were a central instance that manages all types of input devices and handles event signaling (gamepad 🕹️ events, gyro events, mcp server events, etc.).
Then there should be providers for the different types of input devices that register and deregister the input devices with the central instance und call the event invoking methods...

If I find some time these days I'll suggest an implementation of that.

{
_logger.LogInformation("Gamepad has been removed ControllerId:{controllerId}", controller.ControllerId);
_logger.LogInformation("Controller device has been removed ControllerId:{controllerId}", controller.ControllerId);
}
});
}
Expand Down
8 changes: 2 additions & 6 deletions BrickController2/BrickController2.WinUI/PlatformServices/GameController/GamepadController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ internal class GamepadController : GamepadControllerBase<Gamepad>
public GamepadController(GameControllerService service, Gamepad gamepad, RawGameController rawController, int controllerNumber, IDispatcherTimer timer)
: base(service, gamepad)
{
Name = rawController.DisplayName;
ControllerNumber = controllerNumber;
ControllerId = GetControllerIdFromNumber(controllerNumber);

UniquePersistantDeviceId = rawController.NonRoamableId;
Name = rawController.DisplayName;
VendorId = rawController.HardwareVendorId;
ProductId = rawController.HardwareProductId;

_timer = timer;

_timer.Interval = DefaultInterval;
Expand All @@ -55,7 +51,7 @@ public override void Stop()

private void Timer_Tick(object? sender, object e)
{
var currentReading = Gamepad.GetCurrentReading();
var currentReading = ControllerDevice.GetCurrentReading();

var currentEvents = currentReading
.Enumerate()
Expand Down
Loading