Skip to content

Commit 8178b94

Browse files
committed
Generalized RebindActionParameterUI to make it possible to select parameters to override.
1 parent 90f0b53 commit 8178b94

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Assets/Samples/RebindingUI/RebindActionParameterUI.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ public float defaultValue
8383
[SerializeField]
8484
private Slider m_Slider;
8585

86+
[SerializeField]
87+
private string[] m_ParameterOverrides;
88+
8689
private float m_Value;
8790

8891
public void ResetToDefault()

Assets/Samples/RebindingUI/RebindActionParameterUIEditor.cs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#if UNITY_EDITOR
22

33
using System;
4-
using System.Collections.Generic;
54
using UnityEditor;
65
using UnityEngine;
7-
using UnityEngine.InputSystem.Utilities;
86
using UnityEngine.UI;
97

108
namespace UnityEngine.InputSystem.Samples.RebindUI
@@ -21,6 +19,7 @@ protected void OnEnable()
2119
m_DefaultValueProperty = serializedObject.FindProperty("m_DefaultValue");
2220
m_PreferenceKeyProperty = serializedObject.FindProperty("m_PreferenceKey");
2321
m_SliderProperty = serializedObject.FindProperty("m_Slider");
22+
m_ParameterOverridesProperty = serializedObject.FindProperty("m_ParameterOverrides");
2423

2524
Refresh();
2625
}
@@ -43,19 +42,15 @@ public override void OnInspectorGUI()
4342
EditorGUILayout.LabelField("Parameter");
4443
using (new EditorGUI.IndentLevelScope())
4544
{
46-
var key = EditorGUILayout.TextField("Preference Key", m_PreferenceKeyProperty.stringValue);
47-
if (key != m_PreferenceKeyProperty.stringValue)
48-
m_PreferenceKeyProperty.stringValue = key;
49-
50-
var defaultValue = EditorGUILayout.FloatField("Default Value", m_DefaultValueProperty.floatValue);
51-
if (!Mathf.Approximately(defaultValue, m_DefaultValueProperty.floatValue))
52-
m_DefaultValueProperty.floatValue = defaultValue;
45+
EditorGUILayout.PropertyField(m_PreferenceKeyProperty);
46+
EditorGUILayout.PropertyField(m_DefaultValueProperty);
47+
EditorGUILayout.PropertyField(m_ParameterOverridesProperty, true);
48+
}
5349

54-
if (EditorGUI.EndChangeCheck())
55-
{
56-
serializedObject.ApplyModifiedProperties();
57-
Refresh();
58-
}
50+
if (EditorGUI.EndChangeCheck())
51+
{
52+
serializedObject.ApplyModifiedProperties();
53+
Refresh();
5954
}
6055
}
6156

@@ -73,6 +68,7 @@ private struct ParameterValue
7368
private SerializedProperty m_PreferenceKeyProperty;
7469
private SerializedProperty m_DefaultValueProperty;
7570
private SerializedProperty m_SliderProperty;
71+
private SerializedProperty m_ParameterOverridesProperty;
7672

7773
private BindingUI m_Binding;
7874
}

Assets/Samples/RebindingUI/RebindingUISampleScene.unity

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5100,6 +5100,9 @@ MonoBehaviour:
51005100
m_PreferenceKey: lookSensitivity
51015101
m_DefaultValue: 1
51025102
m_Slider: {fileID: 244172485}
5103+
m_ParameterOverrides:
5104+
- x
5105+
- y
51035106
--- !u!114 &1214352214
51045107
MonoBehaviour:
51055108
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)