MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Add a virtual controller to merge Joy-Cons. #434

Open
madwind wants to merge 34 commits from madwind/master into master
pull from: madwind/master
merge into: MeloNX:master
Conversation 35 Commits 34 Files Changed 6 +17 -5
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6dec7ff8ba - Show all commits

22
src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
View File

@ -1,5 +1,6 @@
using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Configuration.Hid.Controller; using Ryujinx.Common.Configuration.Hid.Controller;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
@ -81,12 +82,23 @@ namespace Ryujinx.Input.SDL2
public Vector3 GetMotionData(MotionInputId inputId) public Vector3 GetMotionData(MotionInputId inputId)
{ {
return inputId switch Vector3 motionData;
switch (inputId)
{ {
MotionInputId.SecondAccelerometer => right.GetMotionData(MotionInputId.Accelerometer), case MotionInputId.Accelerometer:
MotionInputId.SecondGyroscope => right.GetMotionData(MotionInputId.Gyroscope), case MotionInputId.Gyroscope:
_ => left.GetMotionData(inputId) motionData = left.GetMotionData(inputId);
}; return new Vector3(-motionData.Z, motionData.Y, motionData.X);
case MotionInputId.SecondAccelerometer:
motionData = right.GetMotionData(MotionInputId.Accelerometer);
return new Vector3(motionData.Z, motionData.Y, -motionData.X);
case MotionInputId.SecondGyroscope:
motionData = right.GetMotionData(MotionInputId.Gyroscope);
return new Vector3(motionData.Z, motionData.Y, -motionData.X);
case MotionInputId.Invalid:
default:
return Vector3.Zero;
}
} }
public GamepadStateSnapshot GetStateSnapshot() public GamepadStateSnapshot GetStateSnapshot()