-
Notifications
You must be signed in to change notification settings - Fork 322
FIX: Custom processors serialises enum by index rather than by value. #2164
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
FIX: Custom processors serialises enum by index rather than by value. #2164
Conversation
…anging the value.
…tps://github.com/Unity-Technologies/InputSystem into isxb-1482/fix-custom-processor-serializesbyIndex
@AswinRajGopal Its generally recommended to add one developer on the team and one QA as reviewers on the PR when published. This will help making sure you receive feedback on it. Looks like there are CI failures for non-required tests and that branch is outdated. I would recommend updating the branch (which will automatically re-run CI). |
@AswinRajGopal I notice you have published internal URLs in this public-facing PR. This should be avoided. Instead use public URLs to issue tickets when available and otherwise only use issue number (without link). I will remove the URLs for now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for looking into this @AswinRajGopal! Left some comments on things to address.
… added, made classes and enums internal and refactor.
… added, made classes and enums internal and refactor.
…tps://github.com/Unity-Technologies/InputSystem into isxb-1482/fix-custom-processor-serializesbyIndex
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for addressing comments. Changes look good to me now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One concern I noticed is that the enum field is blank after upgrading to the new version, requiring the user to repick and save. Real problem? Any way to fix it?
Hi @Pauliusd01 could you please give me the steps to repro this issue? which version should I upgrade? Thanks. |
Your version. Steps are: Open the user project -> Upgrade the version to yours (package manager -> add from disk -> point to the version with your changes) -> observe the user's enum field is blank |
Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Codecov ReportAttention: Patch coverage is
@@ Coverage Diff @@
## develop #2164 +/- ##
===========================================
+ Coverage 65.45% 67.69% +2.23%
===========================================
Files 367 367
Lines 53505 53565 +60
===========================================
+ Hits 35024 36261 +1237
+ Misses 18481 17304 -1177
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 34 files with indirect coverage changes 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes look ok to me, added some suggestions to motivate complex code parts for increased readability. Would also recommend checking the codecov bot suggestions for logic not being tested.
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the PR as it is increases the tech debt in a way that is not worth the fix.
I believe there are better ways to achieve the desired outcome, and if not I would rather take the fix without the migration.
Take a look at migrating the data during importing, let me know if you have any questions
… the enums by value in the processors.
6bfc950
to
a521b32
Compare
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Show resolved
Hide resolved
…o handle migration.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Marking this Request Changes based on code being in impropriate places given that this is handling the migration in-memory (See comments).
While this PR now handles multi-version parsing I struggle with two main issues:
- The parsing is inside the importer which is fine in one sense, but it implies this won't work (produce incorrect results), for a JSON loaded in a player via LoadFromJson directly.
- The migration code is heavily modifying strings which is unfortunate but maybe not possible to avoid since the processor definitions are actually strings to begin with. So as long as we mark dirty the user is likely not experiencing this much anyway if existing assets are migrated in edit-mode.
It might be that migrating directly in https://github.com/Unity-Technologies/InputSystem/blob/develop/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs#L1609 reduces the complexity since this is where an action is parsed. However doing this might require the version to be parsed first prior to parsing the asset to be able to reason about the version.
@@ -946,10 +947,12 @@ private void OnDestroy() | ||
[NonSerialized] internal InputActionRebindingExtensions.ParameterOverride[] m_ParameterOverrides; | ||
|
||
[NonSerialized] internal InputActionMap.DeviceArray m_Devices; | ||
[SerializeField] internal int m_Version; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The introduced "version" seems related to the the file format and not the asset object right? Hence I would recommend removing this field. I.e. in a code-only project version doesn't play any role, hence its misplaced IMO and we would better not associate it with the asset.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am unresolving this since I do not see why we need this. In a project without assets version has no purpose. Only the file format is (needs to) be versioned?
Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporter.cs
Outdated
Show resolved
Hide resolved
…arser, moved the migration funciton to the InputActionAsset.
accd69f
to
8bc3ef0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for updating. Some additional (hopefully final) batch of feedback.
|
||
[Serializable] | ||
internal struct WriteFileJson | ||
{ | ||
public int? version; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer that this is an int (not nullable), it could default to version 0 (file format version)
@@ -946,10 +947,12 @@ private void OnDestroy() | ||
[NonSerialized] internal InputActionRebindingExtensions.ParameterOverride[] m_ParameterOverrides; | ||
|
||
[NonSerialized] internal InputActionMap.DeviceArray m_Devices; | ||
[SerializeField] internal int m_Version; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am unresolving this since I do not see why we need this. In a project without assets version has no purpose. Only the file format is (needs to) be versioned?
@@ -379,6 +383,12 @@ public void LoadFromJson(string json) | ||
throw new ArgumentNullException(nameof(json)); | ||
|
||
var parsedJson = JsonUtility.FromJson<ReadFileJson>(json); | ||
|
||
m_Version = parsedJson.version; | ||
if (m_Version <= 13) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would propose introducing documented constants for the JSON versions introduced by this PR, e.g.
private static struct JsonVersion
{
/// <summary>The original JSON version format for InputActionAsset.</summary>
public static const int Version0 = 0,
/// <summary>Updated JSON version format for InputActionAsset.</summary>
/// <remarks>Changes representation of parameter values from being serialized by value to being serialized by value.</remarks>
public static const int Version1 = 1;
/// <summary>The current version.</summary>
public static const int Current = Version1;
}
To create a natural place to call out all changes in-between those formats and remove "magic values". Hence that constant could be checked against here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might have incorrectly pushed against matching this with importer version previously but not sure that was the correct move.
@@ -298,6 +301,7 @@ public string ToJson() | ||
{ | ||
return JsonUtility.ToJson(new WriteFileJson | ||
{ | ||
version = (m_Version >= 13) ? (int?)m_Version : null, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this always be the latest (current version)? I see no need to generate obsolete formats?
version = JsonVersion.Current;
public string name; | ||
public InputActionMap.ReadMapJson[] maps; | ||
public InputControlScheme.SchemeJson[] controlSchemes; | ||
|
||
public void ToAsset(InputActionAsset asset) | ||
{ | ||
asset.m_Version = version; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need to store this? I think it should be removed.
continue; | ||
|
||
var rebuilt = new List<string>(parsedList.Count); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: Remove empty line
{ | ||
var paramString = string.Join(",", dict.Select(kv => $"{kv.Key}={kv.Value}")); | ||
var newNamedValues = NamedValue.ParseMultiple(paramString); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: remove empty line
var dict = nap.parameters.ToDictionary(pv => pv.name, pv => pv.value.ToString()); | ||
|
||
bool anyChanged = false; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: Remove empty line
} | ||
|
||
var procType = InputSystem.TryGetProcessor(nap.name); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: Remove empty line
foreach (var action in map.actions) | ||
{ | ||
var raw = action.processors; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: Remove empty line
Description
Bug: https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1474
Port 1.13.1
The issue is that the DropdownField expects a selected index (starting at 0), but the enum’s underlying values (10, 20, 30..) don't match these indices. Instead of passing the enum’s integer value directly, I have mapped the value to the correct index in the list of enum options.
An automated test added which validates that a custom input processor with an enumerated parameter integrates correctly with both the Unity Input System’s asset serialization and its UI.
The issue is that
Testing status & QA
Verified manually in windows machine with the provided repro project.
Authored an automated test to cover the fix.
Observer details of the test run:
Overall Product Risks
Comments to reviewers
Checklist
Before review:
Changed
,Fixed
,Added
sections.Area_CanDoX
,Area_CanDoX_EvenIfYIsTheCase
,Area_WhenIDoX_AndYHappens_ThisIsTheResult
.During merge:
NEW: ___
.FIX: ___
.DOCS: ___
.CHANGE: ___
.RELEASE: 1.1.0-preview.3
.After merge: