Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
Expand All @@ -6,7 +7,7 @@

public class GamepadButtonState : MonoBehaviour
{
public ButtonControl buttonToTrack;
[NonSerialized] public ButtonControl buttonToTrack;

[Header("If left empty, will try to auto populate with GetComponent<Image>()")]
public Image stateImage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private void DisableDomainReloads()
EditorPrefsTestUtils.DisableDomainReload();
}

private static InputActionBehaviour GetBehaviour() => Object.FindFirstObjectByType<InputActionBehaviour>();
private static InputActionBehaviour GetBehaviour() => Object.FindAnyObjectByType<InputActionBehaviour>();
private static InputActionAsset GetAsset() => AssetDatabase.LoadAssetAtPath<InputActionAsset>(assetPath);

// For unclear reason, NUnit fails to assert throwing exceptions after transition into play-mode.
Expand Down
2 changes: 1 addition & 1 deletion Assets/Tests/InputSystem/Plugins/UITests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4623,7 +4623,7 @@ public override string ToString()
}
}

public List<Event> events = new List<Event>();
[NonSerialized] public List<Event> events = new List<Event>();

public void OnPointerClick(PointerEventData eventData)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ internal struct MatcherJson
public string[] products;
public string version;
public string[] versions;
public Capability[] capabilities;
[NonSerialized] public Capability[] capabilities;

[Serializable]
public struct Capability
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ private enum Flags
internal struct RemoteSender
{
public int senderId;
public InternedString[] layouts; // Each item is the unqualified name of the layout (without namespace)
[NonSerialized] public InternedString[] layouts; // Each item is the unqualified name of the layout (without namespace)
public RemoteInputDevice[] devices;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ private void DrawHexDump()
// against any mutations.
// When inspecting controls (as opposed to events), we copy all their various
// state buffers and allow switching between them.
[SerializeField] private byte[][] m_StateBuffers;
[NonSerialized] private byte[][] m_StateBuffers;
[SerializeField] private int m_SelectedStateBuffer;
[SerializeField] private bool m_CompareStateBuffers;
[SerializeField] private bool m_ShowDifferentOnly;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static InputActionsEditorWindow()
// For UI testing purpose
internal InputActionAsset currentAssetInEditor => m_AssetObjectForEditing;
[SerializeField] private InputActionAsset m_AssetObjectForEditing;
[SerializeField] private InputActionsEditorState m_State;
[NonSerialized] private InputActionsEditorState m_State;
[SerializeField] private string m_AssetGUID;

private string m_AssetJson;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ public int stateSizeInBytes

[SerializeField] internal int m_DeviceId;
[SerializeField] internal string m_Layout;
[SerializeField] internal FourCC m_StateFormat;
[NonSerialized] internal FourCC m_StateFormat;
[SerializeField] internal int m_StateSizeInBytes;
[SerializeField] internal string m_FullLayoutJson;
}
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4329,7 +4329,7 @@ internal struct SerializedState
public InputEventHandledPolicy inputEventHandledPolicy;
public DeviceState[] devices;
public AvailableDevice[] availableDevices;
public InputStateBuffers buffers;
[NonSerialized] public InputStateBuffers buffers;
public InputUpdate.SerializedState updateState;
public InputUpdateType updateMask;
public InputSettings.ScrollDeltaBehavior scrollDeltaBehavior;
Expand Down
Loading