updated inspector to use new bold foldout property drawer (#162)

* updated inspector to use new bold foldout property drawer

* fixed accessors

Author: StephenHodgson

Features/UX/Scripts/Pointers/LinePointer.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using UnityEngine.Serialization;
 using XRTK.Definitions.Physics;
 using XRTK.Utilities.Lines.DataProviders;
 using XRTK.Utilities.Lines.Renderers;
@@ -14,24 +15,66 @@ namespace XRTK.SDK.UX.Pointers
     public class LinePointer : BaseControllerPointer
     {
         [SerializeField]
-        protected Gradient LineColorSelected = new Gradient();
+        [FormerlySerializedAs("LineColorSelected")]
+        private Gradient lineColorSelected = new Gradient();
+
+        protected Gradient LineColorSelected
+        {
+            get => lineColorSelected;
+            set => lineColorSelected = value;
+        }
 
         [SerializeField]
-        protected Gradient LineColorValid = new Gradient();
+        [FormerlySerializedAs("LineColorValid")]
+        private Gradient lineColorValid = new Gradient();
+
+        protected Gradient LineColorValid
+        {
+            get => lineColorValid;
+            set => lineColorValid = value;
+        }
 
         [SerializeField]
-        protected Gradient LineColorInvalid = new Gradient();
+        [FormerlySerializedAs("LineColorInvalid")]
+        private Gradient lineColorInvalid = new Gradient();
+
+        protected Gradient LineColorInvalid
+        {
+            get => lineColorInvalid;
+            set => lineColorInvalid = value;
+        }
 
         [SerializeField]
-        protected Gradient LineColorNoTarget = new Gradient();
+        [FormerlySerializedAs("LineColorNoTarget")]
+        private Gradient lineColorNoTarget = new Gradient();
+
+        protected Gradient LineColorNoTarget
+        {
+            get => lineColorNoTarget;
+            set => lineColorNoTarget = value;
+        }
 
         [SerializeField]
-        protected Gradient LineColorLockFocus = new Gradient();
+        [FormerlySerializedAs("LineColorLockFocus")]
+        private Gradient lineColorLockFocus = new Gradient();
+
+        protected Gradient LineColorLockFocus
+        {
+            get => lineColorLockFocus;
+            set => lineColorLockFocus = value;
+        }
 
         [Range(2, 50)]
         [SerializeField]
+        [FormerlySerializedAs("LineCastResolution")]
         [Tooltip("This setting has a high performance cost. Values above 20 are not recommended.")]
-        protected int LineCastResolution = 10;
+        private int lineCastResolution = 10;
+
+        protected int LineCastResolution
+        {
+            get => lineCastResolution;
+            set => lineCastResolution = value;
+        }
 
         [SerializeField]
         private BaseMixedRealityLineDataProvider lineBase;
@@ -57,8 +100,6 @@ public BaseMixedRealityLineRenderer[] LineRenderers
             set => lineRenderers = value;
         }
 
-        private Vector3 syncedPosition;
-
         private void CheckInitialization()
         {
             if (lineBase == null)
@@ -137,9 +178,9 @@ public override void OnPreRaycast()
             }
 
             // Make sure our array will hold
-            if (Rays == null || Rays.Length != LineCastResolution)
+            if (Rays == null || Rays.Length != lineCastResolution)
             {
-                Rays = new RayStep[LineCastResolution];
+                Rays = new RayStep[lineCastResolution];
             }
 
             var stepSize = 1f / Rays.Length;
@@ -181,20 +222,20 @@ public override void OnPostRaycast()
             if (Result.CurrentPointerTarget != null)
             {
                 clearWorldLength = Result.RayDistance;
-                lineColor = IsSelectPressed ? LineColorSelected : LineColorValid;
+                lineColor = IsSelectPressed ? lineColorSelected : lineColorValid;
             }
             else
             {
                 clearWorldLength = PointerExtent;
-                lineColor = IsSelectPressed ? LineColorSelected : LineColorNoTarget;
+                lineColor = IsSelectPressed ? lineColorSelected : lineColorNoTarget;
             }
 
             if (IsFocusLocked)
             {
-                lineColor = LineColorLockFocus;
+                lineColor = lineColorLockFocus;
             }
 
-            int maxClampLineSteps = LineCastResolution;
+            int maxClampLineSteps = lineCastResolution;
 
             for (var i = 0; i < lineRenderers.Length; i++)
             {

Features/UX/Scripts/Pointers/TeleportPointer.cs

@@ -3,6 +3,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Serialization;
 using XRTK.Definitions.InputSystem;
 using XRTK.Definitions.Physics;
 using XRTK.EventDatum.Input;
@@ -57,15 +58,36 @@ public class TeleportPointer : LinePointer
         private float upDirectionThreshold = 0.2f;
 
         [SerializeField]
-        protected Gradient LineColorHotSpot = new Gradient();
+        [FormerlySerializedAs("LineColorHotSpot")]
+        private Gradient lineColorHotSpot = new Gradient();
+
+        protected Gradient LineColorHotSpot
+        {
+            get => lineColorHotSpot;
+            set => lineColorHotSpot = value;
+        }
 
         [SerializeField]
+        [FormerlySerializedAs("ValidLayers")]
         [Tooltip("Layers that are considered 'valid' for navigation")]
-        protected LayerMask ValidLayers = Physics.DefaultRaycastLayers;
+        private LayerMask validLayers = Physics.DefaultRaycastLayers;
+
+        protected LayerMask ValidLayers
+        {
+            get => validLayers;
+            set => validLayers = value;
+        }
 
         [SerializeField]
+        [FormerlySerializedAs("InvalidLayers")]
         [Tooltip("Layers that are considered 'invalid' for navigation")]
-        protected LayerMask InvalidLayers = Physics.IgnoreRaycastLayer;
+        private LayerMask invalidLayers = Physics.IgnoreRaycastLayer;
+
+        protected LayerMask InvalidLayers
+        {
+            get => invalidLayers;
+            set => invalidLayers = value;
+        }
 
         private Vector2 currentInputPosition = Vector2.zero;
 
@@ -75,7 +97,7 @@ public class TeleportPointer : LinePointer
 
         private bool canMove = false;
 
-        private bool isTeleportSystemEnabled => MixedRealityToolkit.IsInitialized &&
+        private bool IsTeleportSystemEnabled => MixedRealityToolkit.IsInitialized &&
                                                 MixedRealityToolkit.HasActiveProfile &&
                                                 MixedRealityToolkit.Instance.ActiveProfile.IsTeleportSystemEnabled;
 
@@ -95,7 +117,7 @@ protected Gradient GetLineGradient(TeleportSurfaceResult targetResult)
                 case TeleportSurfaceResult.Invalid:
                     return LineColorInvalid;
                 case TeleportSurfaceResult.HotSpot:
-                    return LineColorHotSpot;
+                    return lineColorHotSpot;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(targetResult), targetResult, null);
             }
@@ -104,7 +126,7 @@ protected Gradient GetLineGradient(TeleportSurfaceResult targetResult)
         #region IMixedRealityPointer Implementation
 
         /// <inheritdoc />
-        public override bool IsInteractionEnabled => !IsTeleportRequestActive && teleportEnabled && isTeleportSystemEnabled;
+        public override bool IsInteractionEnabled => !IsTeleportRequestActive && teleportEnabled && IsTeleportSystemEnabled;
 
         /// <inheritdoc />
         public override float PointerOrientation
@@ -161,7 +183,7 @@ public override void OnPostRaycast()
                 if (Result.CurrentPointerTarget != null)
                 {
                     // Check if it's in our valid layers
-                    if (((1 << Result.CurrentPointerTarget.layer) & ValidLayers.value) != 0)
+                    if (((1 << Result.CurrentPointerTarget.layer) & validLayers.value) != 0)
                     {
                         // See if it's a hot spot
                         if (TeleportHotSpot != null && TeleportHotSpot.IsActive)
@@ -177,7 +199,7 @@ public override void OnPostRaycast()
                                 : TeleportSurfaceResult.Invalid;
                         }
                     }
-                    else if (((1 << Result.CurrentPointerTarget.layer) & InvalidLayers) != 0)
+                    else if (((1 << Result.CurrentPointerTarget.layer) & invalidLayers) != 0)
                     {
                         TeleportSurfaceResult = TeleportSurfaceResult.Invalid;
                     }
@@ -240,7 +262,7 @@ public override void OnPostRaycast()
         public override void OnInputChanged(InputEventData<Vector2> eventData)
         {
             // Don't process input if we've got an active teleport request in progress.
-            if (IsTeleportRequestActive || !isTeleportSystemEnabled) { return; }
+            if (IsTeleportRequestActive || !IsTeleportSystemEnabled) { return; }
 
             if (eventData.SourceId == InputSourceParent.SourceId &&
                 eventData.Handedness == Handedness &&

Inspectors/Input/Handlers/ControllerPoseSynchronizerInspector.cs

@@ -2,31 +2,30 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEditor;
+using UnityEngine;
 using XRTK.Definitions.Utilities;
+using XRTK.Inspectors.Extensions;
 using XRTK.SDK.Input.Handlers;
 
 namespace XRTK.SDK.Inspectors.Input.Handlers
 {
     [CustomEditor(typeof(ControllerPoseSynchronizer))]
     public class ControllerPoseSynchronizerInspector : Editor
     {
-        private const string SynchronizationSettingsKey = "XRTK_Inspector_SynchronizationSettingsFoldout";
+        private readonly GUIContent synchronizationSettings = new GUIContent("Synchronization Settings");
         private static readonly string[] HandednessLabels = { "Left", "Right" };
 
-        private static bool synchronizationSettingsFoldout = true;
-
-        private SerializedProperty handedness;
         private SerializedProperty useSourcePoseData;
         private SerializedProperty poseAction;
+        private SerializedProperty handedness;
 
         protected bool DrawHandednessProperty = true;
 
         protected virtual void OnEnable()
         {
-            synchronizationSettingsFoldout = SessionState.GetBool(SynchronizationSettingsKey, synchronizationSettingsFoldout);
-            handedness = serializedObject.FindProperty("handedness");
-            useSourcePoseData = serializedObject.FindProperty("useSourcePoseData");
-            poseAction = serializedObject.FindProperty("poseAction");
+            useSourcePoseData = serializedObject.FindProperty(nameof(useSourcePoseData));
+            poseAction = serializedObject.FindProperty(nameof(poseAction));
+            handedness = serializedObject.FindProperty(nameof(handedness));
         }
 
         public override void OnInspectorGUI()
@@ -35,40 +34,34 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.Space();
             EditorGUI.BeginChangeCheck();
-            synchronizationSettingsFoldout = EditorGUILayout.Foldout(synchronizationSettingsFoldout, "Synchronization Settings", true);
 
-            if (EditorGUI.EndChangeCheck())
+            if (useSourcePoseData.FoldoutWithBoldLabelPropertyField(synchronizationSettings))
             {
-                SessionState.SetBool(SynchronizationSettingsKey, synchronizationSettingsFoldout);
-            }
+                EditorGUI.indentLevel++;
 
-            if (!synchronizationSettingsFoldout) { return; }
-
-            EditorGUI.indentLevel++;
+                if (!useSourcePoseData.boolValue)
+                {
+                    EditorGUILayout.PropertyField(poseAction);
+                }
 
-            if (DrawHandednessProperty)
-            {
-                var currentHandedness = (Handedness)handedness.enumValueIndex;
-                var handIndex = currentHandedness == Handedness.Right ? 1 : 0;
+                if (DrawHandednessProperty)
+                {
+                    var currentHandedness = (Handedness)handedness.enumValueIndex;
+                    var handIndex = currentHandedness == Handedness.Right ? 1 : 0;
 
-                EditorGUI.BeginChangeCheck();
-                var newHandednessIndex = EditorGUILayout.Popup(handedness.displayName, handIndex, HandednessLabels);
+                    EditorGUI.BeginChangeCheck();
+                    var newHandednessIndex = EditorGUILayout.Popup(handedness.displayName, handIndex, HandednessLabels);
 
-                if (EditorGUI.EndChangeCheck())
-                {
-                    currentHandedness = newHandednessIndex == 0 ? Handedness.Left : Handedness.Right;
-                    handedness.enumValueIndex = (int)currentHandedness;
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        currentHandedness = newHandednessIndex == 0 ? Handedness.Left : Handedness.Right;
+                        handedness.enumValueIndex = (int)currentHandedness;
+                    }
                 }
-            }
-
-            EditorGUILayout.PropertyField(useSourcePoseData);
 
-            if (!useSourcePoseData.boolValue)
-            {
-                EditorGUILayout.PropertyField(poseAction);
+                EditorGUI.indentLevel--;
             }
 
-            EditorGUI.indentLevel--;
             serializedObject.ApplyModifiedProperties();
         }
     }