Replace EnumFlags -> FlagsProperty

Author: keveleigh

org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs

@@ -1,15 +1,12 @@
 // Copyright (c) Mixed Reality Toolkit Contributors
 // Licensed under the BSD 3-Clause
 
+using System;
 using Unity.Profiling;
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;
 using static MixedReality.Toolkit.SpatialManipulation.ObjectManipulator;
-using System;
-
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
 
 namespace MixedReality.Toolkit.SpatialManipulation
 {
@@ -262,8 +259,7 @@ public HandleType EnabledHandles
             set => enabledHandles = value;
         }
 
-        [EnumFlags]
-        [SerializeField]
+        [SerializeField, FlagsProperty]
         [Tooltip("Specifies whether the rotate handles will rotate the object around its origin, or the center of its calculated bounds.")]
         private RotateAnchorType rotateAnchor = RotateAnchorType.BoundsCenter;
 
@@ -282,8 +278,7 @@ public RotateAnchorType RotateAnchor
             }
         }
 
-        [EnumFlags]
-        [SerializeField]
+        [SerializeField, FlagsProperty]
         [Tooltip("Specifies whether the scale handles will rotate the object around their opposing corner, or the center of its calculated bounds.")]
         private ScaleAnchorType scaleAnchor = ScaleAnchorType.OppositeCorner;
 

org.mixedrealitytoolkit.spatialmanipulation/Constraints/MoveAxisConstraint.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Mixed Reality Toolkit Contributors
 // Licensed under the BSD 3-Clause
 
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 
 namespace MixedReality.Toolkit.SpatialManipulation
@@ -17,8 +18,7 @@ public class MoveAxisConstraint : TransformConstraint
     {
         #region Properties
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("Constrain movement along an axis")]
         private AxisFlags constraintOnMovement = 0;
 
@@ -103,4 +103,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform)
 
         #endregion Public Methods
     }
-}
+}

org.mixedrealitytoolkit.spatialmanipulation/Constraints/RotationAxisConstraint.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Mixed Reality Toolkit Contributors
 // Licensed under the BSD 3-Clause
 
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 
 namespace MixedReality.Toolkit.SpatialManipulation
@@ -16,8 +17,7 @@ public class RotationAxisConstraint : TransformConstraint
     {
         #region Properties
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("Constrain rotation about an axis")]
         private AxisFlags constraintOnRotation = 0;
 
@@ -78,4 +78,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform)
 
         #endregion Public Methods
     }
-}
+}

org.mixedrealitytoolkit.spatialmanipulation/Constraints/TransformConstraint.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Mixed Reality Toolkit Contributors
 // Licensed under the BSD 3-Clause
 
-using System;
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 
 namespace MixedReality.Toolkit.SpatialManipulation
@@ -17,8 +17,7 @@ public abstract class TransformConstraint : MonoBehaviour
     {
         #region Properties
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("What type of manipulation this constraint applies to. Defaults to One Handed and Two Handed.")]
         private ManipulationHandFlags handType = ManipulationHandFlags.OneHanded | ManipulationHandFlags.TwoHanded;
 
@@ -31,8 +30,7 @@ public ManipulationHandFlags HandType
             set => handType = value;
         }
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("What type of manipulation this constraint applies to. Defaults to Near and Far.")]
         private ManipulationProximityFlags proximityType = ManipulationProximityFlags.Near | ManipulationProximityFlags.Far;
 

org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 using UnityEngine.Serialization;
 using UnityEngine.XR.Interaction.Toolkit;
@@ -135,8 +136,7 @@ public Transform HostTransform
             }
         }
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("What kinds of manipulation should be allowed?")]
         private TransformFlags allowedManipulations = TransformFlags.Move | TransformFlags.Rotate | TransformFlags.Scale;
 
@@ -288,8 +288,7 @@ public RotateAnchorType RotationAnchorFar
             set => rotationAnchorFar = value;
         }
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("Rigid body behavior of the dragged object when releasing it.")]
         private ReleaseBehaviorType releaseBehavior = ReleaseBehaviorType.KeepVelocity | ReleaseBehaviorType.KeepAngularVelocity;
 

org.mixedrealitytoolkit.spatialmanipulation/Solvers/Follow.cs

@@ -2,6 +2,7 @@
 // Licensed under the BSD 3-Clause
 
 using Unity.Profiling;
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 using UnityEngine.Serialization;
 
@@ -69,8 +70,7 @@ public Transform TargetToFace
             set => targetToFace = value;
         }
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("Rotation axes used when facing target.")]
         private AxisFlags pivotAxis = AxisFlags.XAxis | AxisFlags.YAxis | AxisFlags.ZAxis;
 

org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs

@@ -3,6 +3,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using Unity.XR.CoreUtils.GUI;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -38,8 +39,7 @@ protected IXRInteractable ThisInteractable
             }
         }
 
-        [SerializeField]
-        [EnumFlags]
+        [SerializeField, FlagsProperty]
         [Tooltip("Which axes should be used for manipulation instead of navigation?")]
         private AxisFlags movableAxes = 0;
 
@@ -109,9 +109,9 @@ internal protected XRInteractionManager InteractionManager
         /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector.
         /// </summary>
         protected override void OnValidate()
-        {   
+        {
             base.OnValidate();
-            
+
             // Validate that no transition type is set. You shouldn't be using this
             // for any sort of UI visuals; use a StatefulInteractable and a 
             // StateVisualizer instead, even for UI.
@@ -416,7 +416,7 @@ protected IEnumerator Move(Vector3 objectLocalDelta)
                 }
             }
         }
-        
+
         /// <summary>
         /// Called when the Unity UGUI element is selected.
         /// </summary>