Fix new UxrGrabbableObject methods causing compiler errors when creating a build

- Fix UxrGrabbableObject editor methods that caused compiler errors when creating a build.
- Fix UxrGrabbableObject startup so that component can be added to an object at runtime.

Author: entromp

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.2] - 2022-10-18
+
+### Fixed
+
+- Fix UxrGrabbableObject editor methods that caused compiler errors when creating a build.
+- Fix UxrGrabbableObject startup so that component can be added to an object at runtime.
+
 ## [0.9.1] - 2022-10-13
 
 ### Changed
@@ -139,7 +146,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - First public release!
 
-[Unreleased]: https://github.com/VRMADA/ultimatexr-unity/compare/v0.9.1...HEAD
+[Unreleased]: https://github.com/VRMADA/ultimatexr-unity/compare/v0.9.2...HEAD
+[0.9.2]: https://github.com/VRMADA/ultimatexr-unity/releases/tag/v0.9.2
 [0.9.1]: https://github.com/VRMADA/ultimatexr-unity/releases/tag/v0.9.1
 [0.9.0]: https://github.com/VRMADA/ultimatexr-unity/releases/tag/v0.9.0
 [0.8.4]: https://github.com/VRMADA/ultimatexr-unity/releases/tag/v0.8.4

Scripts/Core/UxrConstants.cs

@@ -14,7 +14,7 @@ public static partial class UxrConstants
 
         public const int MajorVersion = 0;
         public const int MinorVersion = 9;
-        public const int PatchVersion = 1;
+        public const int PatchVersion = 2;
 
         public const string CoreModule         = "Core";
         public const string LocomotionModule   = "Locomotion";

Scripts/Manipulation/Editor/UxrGrabbableObjectEditor.cs

@@ -409,7 +409,7 @@ public override void OnInspectorGUI()
                         List<string>        rotationProviderOptions = new List<string>();
                         string              autoOption              = "Auto";
                         Transform           rightHandSnapTransform  = selectedAvatarComponent != null ? grabbableObject.Editor_GetGrabPointGrabAlignTransform(selectedAvatarComponent, 0, UxrHandSide.Right) : grabbableObject.GetGrabPoint(0).GetGripPoseInfo(0).GripAlignTransformHandRight;
-                        UxrRotationProvider autoRotationProvider    = grabbableObject.Editor_GetAutoRotationProvider(rightHandSnapTransform != null ? rightHandSnapTransform.position : grabbableObject.transform.position);
+                        UxrRotationProvider autoRotationProvider    = grabbableObject.GetAutoRotationProvider(rightHandSnapTransform != null ? rightHandSnapTransform.position : grabbableObject.transform.position);
 
                         if (serializedObject.isEditingMultipleObjects)
                         {

Scripts/Manipulation/UxrGrabbableObject.cs

@@ -110,7 +110,7 @@ public class UxrGrabbableObject : UxrComponent<UxrGrabbableObject>, IUxrGrabbabl
         // Grab points
 
         [SerializeField] private bool                   _firstGrabPointIsMain = true;
-        [SerializeField] private UxrGrabPointInfo       _grabPoint;
+        [SerializeField] private UxrGrabPointInfo       _grabPoint            = new UxrGrabPointInfo();
         [SerializeField] private List<UxrGrabPointInfo> _additionalGrabPoints;
 
         // Placement
@@ -1110,6 +1110,94 @@ public void CheckAndApplyLockHand(UxrGrabber grabber, int grabPoint)
             }
         }
 
+        /// <summary>
+        ///     Tries to get the longitudinal rotation axis of the grabbable object. If it hasn't been defined by the user (on
+        ///     objects where <see cref="RangeOfMotionRotationAxisCount" /> is less than 2.
+        /// </summary>
+        /// <returns>Longitudinal rotation axis</returns>
+        public UxrAxis GetMostProbableLongitudinalRotationAxis()
+        {
+            if (RangeOfMotionRotationAxisCount > 1)
+            {
+                // Longitudinal axis is user defined for constrained rotation with more than one axis
+                return _rotationLongitudinalAxis;
+            }
+
+            // We have an object with a single rotation axis. First compute bounds and see if the rotation pivot is not centered.
+
+            Bounds localBounds            = gameObject.GetLocalBounds(true);
+            int    maxUncenteredComponent = -1;
+            float  maxUncenteredDistance  = 0.0f;
+
+            for (int i = 0; i < 3; ++i)
+            {
+                float centerOffset = Mathf.Abs(localBounds.center[i]);
+
+                if (centerOffset > localBounds.size[i] * 0.25f && centerOffset > maxUncenteredDistance)
+                {
+                    maxUncenteredComponent = i;
+                    maxUncenteredDistance  = centerOffset;
+                }
+            }
+
+            // Found an axis that is significantly larger than others?
+
+            if (maxUncenteredComponent != -1)
+            {
+                return maxUncenteredComponent;
+            }
+
+            // At this point the best bet is the single rotation axis
+
+            int singleRotationAxisIndex = SingleRotationAxisIndex;
+
+            if (singleRotationAxisIndex != -1)
+            {
+                return singleRotationAxisIndex;
+            }
+
+            return UxrAxis.Z;
+        }
+
+        /// <summary>
+        ///     Tries to infer the most appropriate <see cref="UxrRotationProvider" /> to rotate the object based on the shape and
+        ///     size of the object, and the grip.
+        /// </summary>
+        /// <param name="gripPos">The grip snap position</param>
+        /// <returns>Most appropriate <see cref="UxrRotationProvider" /></returns>
+        public UxrRotationProvider GetAutoRotationProvider(Vector3 gripPos)
+        {
+            if (!(HasTranslationConstraint && LimitedRangeOfMotionRotationAxes.Any()))
+            {
+                // No constraint
+                return UxrRotationProvider.HandOrientation;
+            }
+
+            UxrAxis longitudinalAxis        = GetMostProbableLongitudinalRotationAxis();
+            int     singleRotationAxisIndex = SingleRotationAxisIndex;
+            float   leverageDistance        = 0.0f;
+
+            if (singleRotationAxisIndex != -1)
+            {
+                // Object with a single rotation axis
+
+                if (longitudinalAxis != singleRotationAxisIndex)
+                {
+                    // Lever action
+                    return UxrRotationProvider.HandPositionAroundPivot;
+                }
+
+                // Lever action will depend on grabber distance to rotation axis. Smaller than a hand distance will use rotation while larger will use leverage.
+                leverageDistance = Vector3.ProjectOnPlane(gripPos - transform.position, transform.TransformDirection(longitudinalAxis)).magnitude;
+                return leverageDistance > UxrConstants.Hand.HandWidth ? UxrRotationProvider.HandPositionAroundPivot : UxrRotationProvider.HandOrientation;
+            }
+
+            // Object with more than one rotation axis
+
+            leverageDistance = Mathf.Abs(gripPos.DistanceToPlane(transform.position, transform.TransformDirection(longitudinalAxis)));
+            return leverageDistance > UxrConstants.Hand.HandWidth ? UxrRotationProvider.HandPositionAroundPivot : UxrRotationProvider.HandOrientation;
+        }
+
         #endregion
 
         #region Internal Methods
@@ -1621,7 +1709,7 @@ internal void NotifyBeginGrab(UxrGrabber grabber, int grabPoint)
 
             if (_autoRotationProvider)
             {
-                _rotationProvider = Editor_GetAutoRotationProvider(snapPosition);
+                _rotationProvider = GetAutoRotationProvider(snapPosition);
             }
 
             if (RotationProvider == UxrRotationProvider.HandPositionAroundPivot && GetGrabPointSnapModeAffectsRotation(grabPoint))
@@ -1782,7 +1870,7 @@ protected override void OnDisable()
         private void Reset()
         {
             _grabPoint                = new UxrGrabPointInfo();
-            _rotationLongitudinalAxis = Editor_GetMostProbableLongitudinalRotationAxis();
+            _rotationLongitudinalAxis = GetMostProbableLongitudinalRotationAxis();
         }
 
         /// <summary>
@@ -2584,94 +2672,6 @@ public bool Editor_HasGrabPointWithGrabAlignTransform(Transform snapTransform, G
             return false;
         }
 
-        /// <summary>
-        ///     Tries to get the longitudinal rotation axis of the grabbable object. If it hasn't been defined by the user (on
-        ///     objects where <see cref="RangeOfMotionRotationAxisCount" /> is less than 2.
-        /// </summary>
-        /// <returns>Longitudinal rotation axis</returns>
-        public UxrAxis Editor_GetMostProbableLongitudinalRotationAxis()
-        {
-            if (RangeOfMotionRotationAxisCount > 1)
-            {
-                // Longitudinal axis is user defined for constrained rotation with more than one axis
-                return _rotationLongitudinalAxis;
-            }
-
-            // We have an object with a single rotation axis. First compute bounds and see if the rotation pivot is not centered.
-
-            Bounds localBounds            = gameObject.GetLocalBounds(true);
-            int    maxUncenteredComponent = -1;
-            float  maxUncenteredDistance  = 0.0f;
-
-            for (int i = 0; i < 3; ++i)
-            {
-                float centerOffset = Mathf.Abs(localBounds.center[i]);
-
-                if (centerOffset > localBounds.size[i] * 0.25f && centerOffset > maxUncenteredDistance)
-                {
-                    maxUncenteredComponent = i;
-                    maxUncenteredDistance  = centerOffset;
-                }
-            }
-
-            // Found an axis that is significantly larger than others?
-
-            if (maxUncenteredComponent != -1)
-            {
-                return maxUncenteredComponent;
-            }
-
-            // At this point the best bet is the single rotation axis
-
-            int singleRotationAxisIndex = SingleRotationAxisIndex;
-
-            if (singleRotationAxisIndex != -1)
-            {
-                return singleRotationAxisIndex;
-            }
-
-            return UxrAxis.Z;
-        }
-
-        /// <summary>
-        ///     Tries to infer the most appropriate <see cref="UxrRotationProvider" /> to rotate the object based on the shape and
-        ///     size of the object, and the grip.
-        /// </summary>
-        /// <param name="gripPos">The grip snap position</param>
-        /// <returns>Most appropriate <see cref="UxrRotationProvider" /></returns>
-        public UxrRotationProvider Editor_GetAutoRotationProvider(Vector3 gripPos)
-        {
-            if (!(HasTranslationConstraint && LimitedRangeOfMotionRotationAxes.Any()))
-            {
-                // No constraint
-                return UxrRotationProvider.HandOrientation;
-            }
-
-            UxrAxis longitudinalAxis        = Editor_GetMostProbableLongitudinalRotationAxis();
-            int     singleRotationAxisIndex = SingleRotationAxisIndex;
-            float   leverageDistance        = 0.0f;
-
-            if (singleRotationAxisIndex != -1)
-            {
-                // Object with a single rotation axis
-
-                if (longitudinalAxis != singleRotationAxisIndex)
-                {
-                    // Lever action
-                    return UxrRotationProvider.HandPositionAroundPivot;
-                }
-
-                // Lever action will depend on grabber distance to rotation axis. Smaller than a hand distance will use rotation while larger will use leverage.
-                leverageDistance = Vector3.ProjectOnPlane(gripPos - transform.position, transform.TransformDirection(longitudinalAxis)).magnitude;
-                return leverageDistance > UxrConstants.Hand.HandWidth ? UxrRotationProvider.HandPositionAroundPivot : UxrRotationProvider.HandOrientation;
-            }
-
-            // Object with more than one rotation axis
-
-            leverageDistance = Mathf.Abs(gripPos.DistanceToPlane(transform.position, transform.TransformDirection(longitudinalAxis)));
-            return leverageDistance > UxrConstants.Hand.HandWidth ? UxrRotationProvider.HandPositionAroundPivot : UxrRotationProvider.HandOrientation;
-        }
-
 #endif
     }
 }