Skip to content

Commit 05aed76

Browse files
Fix naming for complexity to priority in UnmanagedMemory struct.
1 parent 7cb004e commit 05aed76

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ internal unsafe class InputActionState : IInputStateChangeMonitor, ICloneable, I
112112
public BindingState* bindingStates => memory.bindingStates;
113113
public InteractionState* interactionStates => memory.interactionStates;
114114
public int* controlIndexToBindingIndex => memory.controlIndexToBindingIndex;
115-
public ushort* controlGroupingAndPriority => memory.controlGroupingAndComplexity;
115+
public ushort* controlGroupingAndPriority => memory.controlGroupingAndPriority;
116116
public float* controlMagnitudes => memory.controlMagnitudes;
117117
public uint* enabledControls => (uint*)memory.enabledControls;
118118

@@ -4157,7 +4157,7 @@ public struct UnmanagedMemory : IDisposable
41574157
public int* controlIndexToBindingIndex;
41584158

41594159
// Two shorts per control. First one is group number. Second one is priority.
4160-
public ushort* controlGroupingAndComplexity;
4160+
public ushort* controlGroupingAndPriority;
41614161
public bool controlGroupingInitialized;
41624162

41634163
public ActionMapIndices* mapIndices;
@@ -4204,7 +4204,7 @@ public void Allocate(int mapCount, int actionCount, int bindingCount, int contro
42044204
controlMagnitudes = (float*)AllocFromBlob(ref ptr, controlCount * sizeof(float));
42054205
compositeMagnitudes = (float*)AllocFromBlob(ref ptr, compositeCount * sizeof(float));
42064206
controlIndexToBindingIndex = (int*)AllocFromBlob(ref ptr, controlCount * sizeof(int));
4207-
controlGroupingAndComplexity = (ushort*)AllocFromBlob(ref ptr, controlCount * sizeof(ushort) * 2);
4207+
controlGroupingAndPriority = (ushort*)AllocFromBlob(ref ptr, controlCount * sizeof(ushort) * 2);
42084208
actionBindingIndicesAndCounts = (ushort*)AllocFromBlob(ref ptr, actionCount * sizeof(ushort) * 2);
42094209
actionBindingIndices = (ushort*)AllocFromBlob(ref ptr, bindingCount * sizeof(ushort));
42104210
enabledControls = (int*)AllocFromBlob(ref ptr, (controlCount + 31) / 32 * sizeof(int));
@@ -4225,7 +4225,7 @@ public void Dispose()
42254225
controlMagnitudes = null;
42264226
compositeMagnitudes = null;
42274227
controlIndexToBindingIndex = null;
4228-
controlGroupingAndComplexity = null;
4228+
controlGroupingAndPriority = null;
42294229
actionBindingIndices = null;
42304230
actionBindingIndicesAndCounts = null;
42314231

@@ -4251,7 +4251,7 @@ public void CopyDataFrom(UnmanagedMemory memory)
42514251
UnsafeUtility.MemCpy(controlMagnitudes, memory.controlMagnitudes, memory.controlCount * sizeof(float));
42524252
UnsafeUtility.MemCpy(compositeMagnitudes, memory.compositeMagnitudes, memory.compositeCount * sizeof(float));
42534253
UnsafeUtility.MemCpy(controlIndexToBindingIndex, memory.controlIndexToBindingIndex, memory.controlCount * sizeof(int));
4254-
UnsafeUtility.MemCpy(controlGroupingAndComplexity, memory.controlGroupingAndComplexity, memory.controlCount * sizeof(ushort) * 2);
4254+
UnsafeUtility.MemCpy(controlGroupingAndPriority, memory.controlGroupingAndPriority, memory.controlCount * sizeof(ushort) * 2);
42554255
UnsafeUtility.MemCpy(actionBindingIndicesAndCounts, memory.actionBindingIndicesAndCounts, memory.actionCount * sizeof(ushort) * 2);
42564256
UnsafeUtility.MemCpy(actionBindingIndices, memory.actionBindingIndices, memory.bindingCount * sizeof(ushort));
42574257
UnsafeUtility.MemCpy(enabledControls, memory.enabledControls, (memory.controlCount + 31) / 32 * sizeof(int));

0 commit comments

Comments
 (0)