Expose service IP and port as variables in service providers

Packages/Tracking/CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Pose Detector) Add a new rule type to match rotation of a joint to a target
 - Help Menu that links out to docs, a place to report bugs & places to get support
+- (Service Provider) Expose service IP and port as user settable variables
 
 ### Changed
 - Changed from using obsolete FindObjectOfType to using newer implementations

Packages/Tracking/Core/Editor/Scripts/LeapServiceProviderEditor.cs

@@ -63,7 +63,10 @@ protected override void OnEnable()
 
             specifyCustomDrawer("_specificSerialNumber", drawSerialNumberToggle);
 
+            deferProperty("_serviceConnectionInput");
             deferProperty("_serverNameSpace");
+            deferProperty("_servicePort");
+            deferProperty("_serviceIP");
             deferProperty("_useInterpolation");
 
             deferProperty("_reconnectionAttempts");
@@ -78,7 +81,24 @@ protected override void OnEnable()
                 hideField("_trackingOptimization");
             }
             addPropertyToFoldout("_useInterpolation", "Advanced Options");
+
+            addPropertyToFoldout("_serviceConnectionInput", "Advanced Options");
+
+            specifyConditionalDrawing("_serviceConnectionInput",
+                (int)LeapServiceProvider.ServiceConnectionInput.NAME,
+                "_serverNameSpace");
+
+            specifyConditionalDrawing("_serviceConnectionInput",
+                (int)LeapServiceProvider.ServiceConnectionInput.IP_PORT,
+                "_serviceIP");
+
+            specifyConditionalDrawing("_serviceConnectionInput",
+                (int)LeapServiceProvider.ServiceConnectionInput.IP_PORT,
+                "_servicePort");
+
             addPropertyToFoldout("_serverNameSpace", "Advanced Options");
+            addPropertyToFoldout("_serviceIP", "Advanced Options");
+            addPropertyToFoldout("_servicePort", "Advanced Options");
 
             addPropertyToFoldout("_reconnectionAttempts", "Advanced Options");
             addPropertyToFoldout("_reconnectionInterval", "Advanced Options");

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

@@ -269,11 +269,34 @@ public enum TrackingOptimizationMode
         [SerializeField]
         protected bool _preventInitializingTrackingMode;
 
+        /// <summary>
+        /// The type of input to use for connection to the service
+        /// </summary>
+        public enum ServiceConnectionInput
+        {
+            NAME,
+            IP_PORT
+        }
+        [Tooltip("Which input to use for the service connection")]
+        [SerializeField]
+        [EditTimeOnly]
+        protected ServiceConnectionInput _serviceConnectionInput = ServiceConnectionInput.NAME;
+
         [Tooltip("Which Leap Service API Endpoint to connect to.  This is configured on the service with the 'api_namespace' argument.")]
         [SerializeField]
         [EditTimeOnly]
         protected string _serverNameSpace = "Leap Service";
 
+        [Tooltip("The IP address on which the Tracking service listens to. This is configured on the service with 'ip_address' in the 'leap_server_config' session of 'ServerConfig.json'")]
+        [SerializeField]
+        [EditTimeOnly]
+        protected string _serviceIP = "127.0.0.1";
+
+        [Tooltip("The port on which the Tracking service listens to. This is configured on the service with 'port' in the 'leap_server_config' session of 'ServerConfig.json'")]
+        [SerializeField]
+        [EditTimeOnly]
+        protected string _servicePort = "12345";
+
         public override TrackingSource TrackingDataSource { get { return CheckLeapServiceAvailable(); } }
 
         /// <summary>
@@ -845,6 +868,20 @@ public TrackingOptimizationMode GetTrackingMode()
             throw new Exception("Unknown tracking optimization mode");
         }
 
+        /// <summary>
+        /// Set the _serviceConnectionInput mode to IP_PORT, set the target IP and port of the service to the parameters and connect to the new service address
+        /// </summary>
+        public void SetTargetServiceIPPortToConnectTo(string IP, string port)
+        {
+            _serviceConnectionInput = ServiceConnectionInput.IP_PORT;
+
+            _serviceIP = IP;
+            _servicePort = port;
+
+            destroyController();
+            createController();
+        }
+
         #endregion
 
         #region Internal Methods
@@ -888,6 +925,11 @@ protected void createController()
 
             string serialNumber = _multipleDeviceMode != MultipleDeviceMode.Disabled ? SpecificSerialNumber : "";
 
+            if(_serviceConnectionInput == ServiceConnectionInput.IP_PORT)
+            {
+                _serverNameSpace = $"{{\"tracking_server_ip\": \"{_serviceIP}\", \"tracking_server_port\": {_servicePort}}}";
+            }
+
             _leapController = new Controller(serialNumber.GetHashCode(), _serverNameSpace, _multipleDeviceMode != MultipleDeviceMode.Disabled);
 
             _leapController.Device += (s, e) =>
@@ -1066,6 +1108,10 @@ private TrackingSource CheckLeapServiceAvailable()
                 return _trackingSource;
             }
 #endif
+            if (_serviceConnectionInput == ServiceConnectionInput.IP_PORT)
+            {
+                _serverNameSpace = $"{{\"tracking_server_ip\": \"{_serviceIP}\", \"tracking_server_port\": {_servicePort}}}";
+            }
 
             if (LeapInternal.Connection.IsConnectionAvailable(_serverNameSpace))
             {
@@ -1289,4 +1335,4 @@ public class LeapFOVInfo
 
         #endregion
     }
-}
+}