fix(Editor): ensure custom properties are changeable and savable

The custom inspector for the Interactable Object now allows for custom properties to be amended.
ExtendRealityLtd · Aug 28, 2016 · ebf7b0e · ebf7b0e
1 parent 902ee05
commit ebf7b0e
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/Assets/VRTK/Editor/VRTK_InteractableObjectEditor.cs b/Assets/VRTK/Editor/VRTK_InteractableObjectEditor.cs
@@ -12,6 +12,7 @@ public class VRTK_InteractableObjectEditor : Editor
 
     public override void OnInspectorGUI()
     {
+        serializedObject.Update();
         VRTK_InteractableObject targ = (VRTK_InteractableObject)target;
         GUILayout.Space(10);
         GUIStyle guiStyle = EditorStyles.foldout;
@@ -33,10 +34,10 @@ public override void OnInspectorGUI()
             GUILayout.BeginHorizontal();
             EditorGUILayout.PrefixLabel("Rumble on Touch:");
             EditorGUI.indentLevel--;
-            GUILayout.Label("Strength");
-            float x = EditorGUILayout.FloatField(targ.rumbleOnTouch.x);
-            GUILayout.Label("Duration");
-            float y = EditorGUILayout.FloatField(targ.rumbleOnTouch.y);
+            GUILayout.Label("Strength", GUILayout.MinWidth(49f));
+            float x = EditorGUILayout.FloatField(targ.rumbleOnTouch.x, GUILayout.MinWidth(10f));
+            GUILayout.Label("Duration", GUILayout.MinWidth(50f));
+            float y = EditorGUILayout.FloatField(targ.rumbleOnTouch.y, GUILayout.MinWidth(10f));
             targ.rumbleOnTouch = new Vector2(y, x);
             EditorGUI.indentLevel++;
             GUILayout.EndHorizontal();
@@ -70,10 +71,10 @@ public override void OnInspectorGUI()
                 GUILayout.BeginHorizontal();
                 EditorGUILayout.PrefixLabel("Rumble on Grab:");
                 EditorGUI.indentLevel--;
-                GUILayout.Label("Strength");
-                float x = EditorGUILayout.FloatField(targ.rumbleOnGrab.x);
-                GUILayout.Label("Duration");
-                float y = EditorGUILayout.FloatField(targ.rumbleOnGrab.y);
+                GUILayout.Label("Strength", GUILayout.MinWidth(49f));
+                float x = EditorGUILayout.FloatField(targ.rumbleOnGrab.x, GUILayout.MinWidth(10f));
+                GUILayout.Label("Duration", GUILayout.MinWidth(50f));
+                float y = EditorGUILayout.FloatField(targ.rumbleOnGrab.y, GUILayout.MinWidth(10f));
                 targ.rumbleOnGrab = new Vector2(y, x);
                 EditorGUI.indentLevel++;
                 GUILayout.EndHorizontal();
@@ -126,13 +127,13 @@ public override void OnInspectorGUI()
                 targ.pointerActivatesUseAction = EditorGUILayout.Toggle("Pointer Activates Use Action: ", targ.pointerActivatesUseAction);
 
                 GUILayout.BeginHorizontal();
-                EditorGUILayout.PrefixLabel("Rumble on Grab:");
+                EditorGUILayout.PrefixLabel("Rumble on Use:");
                 EditorGUI.indentLevel--;
-                GUILayout.Label("Strength");
-                float x = EditorGUILayout.FloatField(targ.rumbleOnGrab.x);
-                GUILayout.Label("Duration");
-                float y = EditorGUILayout.FloatField(targ.rumbleOnGrab.y);
-                targ.rumbleOnGrab = new Vector2(y, x);
+                GUILayout.Label("Strength", GUILayout.MinWidth(49f));
+                float x = EditorGUILayout.FloatField(targ.rumbleOnUse.x, GUILayout.MinWidth(10f));
+                GUILayout.Label("Duration", GUILayout.MinWidth(50f));
+                float y = EditorGUILayout.FloatField(targ.rumbleOnUse.y, GUILayout.MinWidth(10f));
+                targ.rumbleOnUse = new Vector2(y, x);
                 EditorGUI.indentLevel++;
                 GUILayout.EndHorizontal();
 
@@ -160,6 +161,6 @@ public override void OnInspectorGUI()
                     "isGrabbable","hideControllerOnTouch","allowedTouchControllers","rumbleOnTouch","touchHighlightColor","highlightOnTouch", "isUsable"});
             }
         }
-
+        serializedObject.ApplyModifiedProperties();
     }
-}
+}