Bug/unity 1463 fix device id on frame

Packages/Tracking/CHANGELOG.md

@@ -14,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Android 	v5.17.1
 
 ### Added
-- 
 
 ### Changed
 - (Config) Additional uses of Config marked as Obsolete
@@ -26,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Errors in Editor when using pre-2023.3.18 LTS due to FindObjectByType issue
 - (Physical Hands) Objects are sticky when they ignore collision with hard contact hands
+- DeviceID now correctly set on the Frame object, fixing issue particularly with multiple devices / recording playback
 
 ## [6.14.0] - 24/01/24
 

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

@@ -123,6 +123,7 @@ public event EventHandler<ConnectionEventArgs> LeapConnection
         public EventHandler<DeviceFailureEventArgs> LeapDeviceFailure;
         public EventHandler<PolicyEventArgs> LeapPolicyChange;
         public EventHandler<FrameEventArgs> LeapFrame;
+        public EventHandler<RawFrameEventArgs> LeapRawFrameData;
         public EventHandler<InternalFrameEventArgs> LeapInternalFrame;
         public EventHandler<LogEventArgs> LeapLogEvent;
         [Obsolete("Config is not used in Ultraleap's Tracking Service 5.X+. This will be removed in the next Major release")]
@@ -408,6 +409,11 @@ private void handleTrackingMessage(ref LEAP_TRACKING_EVENT trackingMsg, UInt32 d
         {
             Frames.Put(ref trackingMsg);
 
+            if (LeapRawFrameData != null)
+            {
+                LeapRawFrameData.DispatchOnContext(this, EventContext, new RawFrameEventArgs(trackingMsg));
+            }
+
             if (LeapFrame != null)
             {
                 LeapFrame.DispatchOnContext(this, EventContext, new FrameEventArgs(new Frame(deviceID).CopyFrom(ref trackingMsg)));
@@ -438,8 +444,6 @@ public UInt64 GetInterpolatedFrameSize(Int64 time, Device device = null)
             return size;
         }
 
-
-
         public void GetInterpolatedFrame(Frame toFill, Int64 time, Device device = null)
         {
             UInt64 size = GetInterpolatedFrameSize(time, device);
@@ -461,6 +465,11 @@ public void GetInterpolatedFrame(Frame toFill, Int64 time, Device device = null)
                 LEAP_TRACKING_EVENT tracking_evt;
                 StructMarshal<LEAP_TRACKING_EVENT>.PtrToStruct(trackingBuffer, out tracking_evt);
                 toFill.CopyFrom(ref tracking_evt);
+
+                if (device != null)
+                {
+                    toFill.DeviceID = device.DeviceID;
+                }
             }
             Marshal.FreeHGlobal(trackingBuffer);
         }
@@ -487,6 +496,11 @@ public void GetInterpolatedFrameFromTime(Frame toFill, Int64 time, Int64 sourceT
                 LEAP_TRACKING_EVENT tracking_evt;
                 StructMarshal<LEAP_TRACKING_EVENT>.PtrToStruct(trackingBuffer, out tracking_evt);
                 toFill.CopyFrom(ref tracking_evt);
+
+                if (device != null)
+                {
+                    toFill.DeviceID = device.DeviceID;
+                }
             }
             Marshal.FreeHGlobal(trackingBuffer);
         }

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

@@ -132,6 +132,21 @@ public event EventHandler<FrameEventArgs> FrameReady
             }
         }
 
+        /// <summary>
+        ///  Dispatched when the raw frame data is ready
+        /// </summary>
+        public event EventHandler<RawFrameEventArgs> RawFrameReady
+        {
+            add
+            {
+                _connection.LeapRawFrameData += value;
+            }
+            remove
+            {
+                _connection.LeapRawFrameData -= value;
+            }
+        }
+
         /// <summary>
         /// Dispatched when an internal tracking frame is ready.
         /// @since 3.0

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

@@ -50,6 +50,43 @@ public LeapEventArgs(LeapEvent type)
         public LeapEvent type { get; set; }
     }
 
+    /// <summary>
+    /// Provides access to the raw leap frame data
+    /// </summary>
+    public class RawFrameEventArgs : LeapEventArgs
+    {
+        public bool IsTrackingLeftHand { get; set; }
+        public LEAP_HAND LeftHand { get; set; }
+
+        public bool IsTrackingRightHand { get; set; }
+        public LEAP_HAND RightHand { get; set; }
+
+        public RawFrameEventArgs(LEAP_TRACKING_EVENT trackingMsg) : base(LeapEvent.EVENT_FRAME)
+        {
+            IsTrackingLeftHand = false;
+            IsTrackingRightHand = false;
+
+            for (int i = (int)trackingMsg.nHands; i-- != 0;)
+            {
+                LEAP_HAND hand;
+                StructMarshal<LEAP_HAND>.ArrayElementToStruct(trackingMsg.pHands, i, out hand);
+
+                switch (hand.type)
+                {
+                    case eLeapHandType.eLeapHandType_Left:
+                        LeftHand = hand;
+                        IsTrackingLeftHand = true;
+                        break;
+
+                    case eLeapHandType.eLeapHandType_Right:
+                        RightHand = hand;
+                        IsTrackingRightHand = true;
+                        break;
+                }
+            }
+        }
+    }
+
     /// <summary>
     /// Dispatched when a tracking frame is ready.
     ///

Packages/Tracking/Core/Runtime/Scripts/LeapServiceProvider.cs

@@ -647,6 +647,11 @@ protected virtual void FixedUpdate()
             else
             {
                 _leapController.Frame(_untransformedFixedFrame);
+
+                if (_currentDevice != null)
+                {
+                    _untransformedFixedFrame.DeviceID = _currentDevice.DeviceID;
+                }
             }
 
             if (_untransformedFixedFrame != null)