GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Demote keyboard layouts from MessagePack

Browse source
This commit is contained in:
Meta Vens 2026-06-13 08:46:09 +01:00
commit 37af47863a
4 changed files with 18 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Assets/Scripts/UI/InputScreen/InputLayout.cs
View file

@ -1,9 +1,8 @@
using System.Collections.Generic;
using MessagePack;
[MessagePackObject]
public class InputLayout
{
[Key(0)] public InputLayoutRow[] Rows;
public InputLayoutRow[] Rows;
public IEnumerable<InputLayoutBindableKey> GetBindableKeys()
{
@ -22,49 +21,33 @@ public class InputLayout
}
}
[MessagePackObject,
Union(0, typeof(InputLayoutRowSpacer)),
Union(1, typeof(InputLayoutKeyRow))
]
public abstract class InputLayoutRow { }
[MessagePackObject]
public class InputLayoutRowSpacer : InputLayoutRow
{
[Key(0)] public float Height;
public float Height;
}
[MessagePackObject]
public class InputLayoutKeyRow : InputLayoutRow
{
[Key(0)] public InputLayoutColumn[] Columns;
public InputLayoutColumn[] Columns;
}
[MessagePackObject,
Union(0, typeof(InputLayoutColumnSpacer)),
Union(1, typeof(InputLayoutKey)),
Union(2, typeof(InputLayoutBindableKey)),
Union(3, typeof(InputLayoutMultiRowKey))
]
public abstract class InputLayoutColumn
{
[Key(0)] public float Width;
public float Width;
}
[MessagePackObject]
public class InputLayoutColumnSpacer : InputLayoutColumn { }
[MessagePackObject]
public class InputLayoutKey : InputLayoutColumn { }
[MessagePackObject]
public class InputLayoutBindableKey : InputLayoutKey, IBindableButton
{
[Key(1)] public string MainLabel;
[Key(2)] public string AltLabel;
[Key(3)] public string ShortPath;
public string MainLabel;
public string AltLabel;
public string ShortPath;
[IgnoreMember]
public string InputSystemPath
{
get
@ -80,7 +63,7 @@ public class InputLayoutBindableKey : InputLayoutKey, IBindableButton
public class InputLayoutMultiRowKey : InputLayoutBindableKey
{
[Key(4)] public int Height;
public int Height;
}
public class InputLayoutMouseButton : IBindableButton
@ -96,4 +79,4 @@ public class InputLayoutMouseButton : IBindableButton
public interface IBindableButton
{
public string InputSystemPath { get; set; }
}
}