Skip to content

Commit 51994b7

Browse files
committed
Removed nullabe version fileds due to readability issues and boxing.
1 parent 42bb20c commit 51994b7

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ static class JsonVersion
314314
/// <seealso cref="FromJson"/>
315315
public string ToJson()
316316
{
317-
var hasContent = (m_ActionMaps?.Length ?? 0) > 0 || (m_ControlSchemes?.Length ?? 0) > 0;
317+
var hasContent = m_ActionMaps.LengthSafe() > 0 || m_ControlSchemes.LengthSafe() > 0;
318318
return JsonUtility.ToJson(new WriteFileJson
319319
{
320-
version = hasContent ? JsonVersion.Current : null,
320+
version = hasContent ? JsonVersion.Current : JsonVersion.Version0,
321321
name = name,
322322
maps = InputActionMap.WriteFileJson.FromMaps(m_ActionMaps).maps,
323323
controlSchemes = InputControlScheme.SchemeJson.ToJson(m_ControlSchemes),
@@ -971,7 +971,7 @@ private void OnDestroy()
971971
[Serializable]
972972
internal struct WriteFileJson
973973
{
974-
public int? version;
974+
public int version;
975975
public string name;
976976
public InputActionMap.WriteMapJson[] maps;
977977
public InputControlScheme.SchemeJson[] controlSchemes;
@@ -987,7 +987,7 @@ internal struct WriteFileJsonNoName
987987
[Serializable]
988988
internal struct ReadFileJson
989989
{
990-
public int? version;
990+
public int version;
991991
public string name;
992992
public InputActionMap.ReadMapJson[] maps;
993993
public InputControlScheme.SchemeJson[] controlSchemes;
@@ -1012,11 +1012,9 @@ public void ToAsset(InputActionAsset asset)
10121012
/// </summary>
10131013
internal void MigrateJson(ref ReadFileJson parsedJson)
10141014
{
1015-
var existing = parsedJson.version ?? JsonVersion.Version0;
1016-
if (existing >= JsonVersion.Version1)
1015+
if (parsedJson.version >= JsonVersion.Version1)
10171016
return;
1018-
1019-
if ((parsedJson.maps?.Length ?? 0) > 0 && (parsedJson.version ?? 0) < JsonVersion.Version1)
1017+
if ((parsedJson.maps?.Length ?? 0) > 0 && (parsedJson.version) < JsonVersion.Version1)
10201018
{
10211019
for (var mi = 0; mi < parsedJson.maps.Length; ++mi)
10221020
{

0 commit comments

Comments
 (0)