Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HID SharedMem Rework (#1003)

Browse source 
* Delete old HLE.Input

* Add new HLE Input.

git shows Hid.cs as modified because of the same name. It is new.

* Change HID Service

* Change Ryujinx UI to reflect new Input

* Add basic ControllerApplet

* Add DebugPad

Should fix Kirby Star Allies

* Address Ac_K's comments

* Moved all of HLE.Input to Services.Hid
* Separated all structs and enums each to a file
* Removed vars
* Made some naming changes to align with switchbrew
* Added official joycon colors

As an aside, fixed a mistake in touchscreen headers and added checks to
important SharedMem structs at init time.

* Further address Ac_K's comments

* Addressed gdkchan's and some more Ac_K's comments

* Address AcK's review comments

* Address AcK's second review comments

* Replace missed Marshal.SizeOf and address gdkchan's comments
This commit is contained in:
mageven 2020-04-03 05:40:02 +05:30 • committed by GitHub
parent 5b5239ab5b
commit 2365ddfc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 1500 additions and 1044 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ryujinx/Ui/MainWindow.cs
View file

@ -10,6 +10,7 @@ using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.HOS.Services.Hid;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@ -446,7 +447,19 @@ namespace Ryujinx.Ui
private void CreateGameWindow(HLE.Switch device)
{
device.Hid.InitializePrimaryController(ConfigurationState.Instance.Hid.ControllerType);
ControllerType type = (Ryujinx.Configuration.Hid.ControllerType)ConfigurationState.Instance.Hid.ControllerType switch {
Ryujinx.Configuration.Hid.ControllerType.ProController => ControllerType.ProController,
Ryujinx.Configuration.Hid.ControllerType.Handheld => ControllerType.Handheld,
Ryujinx.Configuration.Hid.ControllerType.NpadPair => ControllerType.JoyconPair,
Ryujinx.Configuration.Hid.ControllerType.NpadLeft => ControllerType.JoyconLeft,
Ryujinx.Configuration.Hid.ControllerType.NpadRight => ControllerType.JoyconRight,
_ => ControllerType.Handheld
};
device.Hid.Npads.AddControllers(new ControllerConfig {
Player = PlayerIndex.Player1,
Type = type
});
_gLWidget = new GLRenderer(_emulationContext);