manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-12-27 02:53:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle touch input from Touches struct

Browse source
This commit is contained in:
emmaus 2018-02-26 13:11:57 +00:00
parent dd103176fe
commit fdf1b42aae
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.Core/Hid.cs
View file

@ -206,9 +206,6 @@ namespace Ryujinx.Core
+ (uint)((uint)(TouchScreenHeader.LatestEntry) * Marshal.SizeOf(typeof(HidTouchScreenEntry))); + (uint)((uint)(TouchScreenHeader.LatestEntry) * Marshal.SizeOf(typeof(HidTouchScreenEntry)));
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset); HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
//Truncate number of touches
TouchPoints.NumberOfTouches = TouchPoints.NumberOfTouches > 16 ? 16 : TouchPoints.NumberOfTouches;
HidTouchScreenEntry hidTouchScreenEntry = new HidTouchScreenEntry() HidTouchScreenEntry hidTouchScreenEntry = new HidTouchScreenEntry()
{ {
Header = new HidTouchScreenEntryHeader() Header = new HidTouchScreenEntryHeader()

12
Ryujinx.Core/Hid/HidTouchScreen.cs
View file

@ -56,8 +56,18 @@ namespace Ryujinx.Core
{ {
public uint[] XTouches; public uint[] XTouches;
public uint[] YTouches; public uint[] YTouches;
public uint NumberOfTouches; public uint NumberOfTouches { get; private set; }
public const uint Hid_Max_Num_Touches = 16; public const uint Hid_Max_Num_Touches = 16;
public void AddTouch(uint X, uint Y)
{
if (NumberOfTouches < Hid_Max_Num_Touches)
{
XTouches[NumberOfTouches] = X;
YTouches[NumberOfTouches] = Y;
NumberOfTouches++;
}
}
} }
} }

4
Ryujinx/Ui/GLScreen.cs
View file

@ -98,9 +98,7 @@ namespace Ryujinx
{ {
if (Mouse.GetState().LeftButton == OpenTK.Input.ButtonState.Pressed && Focused) if (Mouse.GetState().LeftButton == OpenTK.Input.ButtonState.Pressed && Focused)
{ {
CurrentTouchPoints.XTouches[CurrentTouchPoints.NumberOfTouches] = (uint)Mouse.X; CurrentTouchPoints.AddTouch((uint)Mouse.X, (uint)Mouse.Y);
CurrentTouchPoints.YTouches[CurrentTouchPoints.NumberOfTouches] = (uint)Mouse.Y;
CurrentTouchPoints.NumberOfTouches++;
} }
} }