Merge branch 'develop' into feature/Simplify_specific_Bone_and_Finger…

…_access

Packages/Tracking Preview/Locomotion/Runtime/Scripts/Teleportation/Teleport Action/Jump Gem Teleport/JumpGem.cs

@@ -15,16 +15,16 @@ namespace Leap.Unity.Preview.Locomotion
     /// <summary>
     /// Used in conjunction with JumpGemTeleport, a Jump Gem can be pinched, aimed and released in order to teleport
     /// </summary>
-    [RequireComponent(typeof(LightweightPinchDetector))]
+    [RequireComponent(typeof(PinchDetector))]
     public class JumpGem : MonoBehaviour
     {
         #region Editor Settings
 
         public LeapProvider leapProvider;
 
         [SerializeField, Header("Pinch")]
-        protected LightweightPinchDetector _pinchDetector = null;
-        public LightweightPinchDetector PinchDetector => _pinchDetector;
+        protected PinchDetector _pinchDetector = null;
+        public PinchDetector PinchDetector => _pinchDetector;
 
         [SerializeField, Tooltip("This dictates the required pinch value and overall size of the visual elements used. " +
             "This value is a radius and will be used *0.5 on visual items.")]
@@ -619,7 +619,7 @@ private void OnValidate()
 
             if (_pinchDetector == null)
             {
-                _pinchDetector = GetComponent<LightweightPinchDetector>();
+                _pinchDetector = GetComponent<PinchDetector>();
             }
             if (_pinchDetector != null)
             {

Packages/Tracking Preview/Locomotion/Runtime/Scripts/Teleportation/Teleport Action/Pinch To Teleport/PinchToTeleport.cs

@@ -23,7 +23,7 @@ public class PinchToTeleport : TeleportActionBase
         private IsFacingObject _isFacingObject;
 
         [SerializeField]
-        private LightweightPinchDetector _pinchDetector;
+        private PinchDetector _pinchDetector;
 
         [Tooltip("The chirality which will be used for pinch to teleport. This will update the chirality in the pinch detector and hand ray.")]
         public Chirality chirality;
@@ -194,7 +194,7 @@ private void OnValidate()
 
             if (_pinchDetector == null)
             {
-                _pinchDetector = GetComponentInChildren<LightweightPinchDetector>(true);
+                _pinchDetector = GetComponentInChildren<PinchDetector>(true);
             }
         }
     }

Packages/Tracking/CHANGELOG.md

@@ -15,15 +15,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Support for reading the camera matrix
+- ImageRetriever allows more than 6 reconnections
 
 ### Changed
 - Improved XRHands support for Meta Aim Input Actions
+- XRLeapProviderManager renamed LEAP_DIRECT to ULTRALEAP
 - Accessors for Hand.Finger, Hand.Bone and Finger.Bone
 - Renamed BoneType enum entries to remove redundancies
 
 ### Fixed
 - Issue with the method signature for LeapPixelToRectilinearEx
 - Duplicate meta aim hands when using XRHands Input
+- Editor stuck in unending loop when no service running
 
 ## [6.15.0] - 19/04/24
 

Packages/Tracking/Core/Runtime/Plugins/LeapCSharp/ServerStatus.cs

@@ -25,12 +25,16 @@ public static void GetStatus()
             if (lastRequestTimestamp + requestInterval < Time.realtimeSinceStartup)
             {
                 IntPtr statusPtr = new IntPtr();
-                LeapC.GetServerStatus(1000, ref statusPtr);
+                LeapC.GetServerStatus(500, ref statusPtr);
 
-                lastStatus = Marshal.PtrToStructure<LeapC.LEAP_SERVER_STATUS>(statusPtr);
+                if (statusPtr != IntPtr.Zero)
+                {
+                    lastStatus = Marshal.PtrToStructure<LeapC.LEAP_SERVER_STATUS>(statusPtr);
+
+                    MarshalUnmananagedArray2Struct(lastStatus.devices, (int)lastStatus.device_count, out lastDevices);
+                    LeapC.ReleaseServerStatus(ref lastStatus);
+                }
 
-                MarshalUnmananagedArray2Struct(lastStatus.devices, (int)lastStatus.device_count, out lastDevices);
-                LeapC.ReleaseServerStatus(ref lastStatus);
                 lastRequestTimestamp = Time.realtimeSinceStartup;
             }
         }
@@ -97,7 +101,7 @@ public static string GetDeviceType(string _serial)
             return "";
         }
 
-        public static void MarshalUnmananagedArray2Struct<T>(IntPtr unmanagedArray, int length, out T[] mangagedArray)
+        static void MarshalUnmananagedArray2Struct<T>(IntPtr unmanagedArray, int length, out T[] mangagedArray)
         {
             var size = Marshal.SizeOf(typeof(T));
             mangagedArray = new T[length];