Native client drives the skeleton

ovi-lab · Jul 6, 2024 · a0fe085 · a0fe085
1 parent 4a8e3a6
commit a0fe085
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Assets/Plugins/Client.cs b/Assets/Plugins/Client.cs
@@ -70,7 +70,7 @@ public void ConfigureClient(ClientConfigArgs args)
 		public void ConnectClient(string baseURI)
 		{
 			Output_Connect OC = Connect(baseURI);
-			Debug.LogWarning("Attempt to Connect: " + OC.Result);
+			Debug.Log("Attempt to Connect: " + OC.Result);
 
 			if (OC.Result == Result.Success)
 			{

diff --git a/Assets/Scripts/ViconNexusUnityStream/CustomSubjectScript.cs b/Assets/Scripts/ViconNexusUnityStream/CustomSubjectScript.cs
@@ -125,14 +125,15 @@ protected void LateUpdate()
             if (subjectDataManager.UseDefaultData)
             {
                 defaultDataObj ??= JsonConvert.DeserializeObject<Data>(defaultData);
-                ProcessData(defaultDataObj, defaultData);
+                //ProcessData(defaultDataObj, defaultData);
             }
             else
             {
                 // TODO: move all of this to SubjectDataManager
-                if (subjectDataManager.StreamedStreamedData.TryGetValue(subjectName, out Data subjectDataObj) && subjectDataManager.StreamedRawData.TryGetValue(subjectName, out string subjectRawData))
+                if (subjectDataManager.StreamedData.TryGetValue(subjectName, out Data subjectDataObj))
                 {
-                    ProcessData(subjectDataObj, subjectRawData);
+
+                    ProcessData(subjectDataObj);
                 }
                 // TODO: Write empty lines when data not in frame?
                 // else { }
@@ -213,9 +214,9 @@ protected virtual string ConstructFinalWriterString()
         }
         #endregion
 
-        void ProcessData(Data data, string text)
+        void ProcessData(Data data)
         {
-            rawData = text;
+            //rawData = text;
 
             int zeroMarkers = 0;
 
@@ -347,9 +348,8 @@ void ProcessData(Data data, string text)
                     break;
                 }
             }
-
+            
             segments = ProcessSegments(segments, data);
-
             if (driveSkeleton)
             {
                 ///Retest the data quality

diff --git a/Assets/Scripts/ViconNexusUnityStream/SubjectDataManager.cs b/Assets/Scripts/ViconNexusUnityStream/SubjectDataManager.cs
@@ -39,7 +39,7 @@ public bool UseDefaultData
     /// Enable writing data to disk.
     /// </summary>
     public bool EnableWriteData { get => enableWriteData; set => enableWriteData = value; }
-    public Dictionary<string, Data> StreamedStreamedData => streamedData;
+    public Dictionary<string, Data> StreamedData => streamedData;
     public Dictionary<string, string> StreamedRawData => rawData;
     public IViconClient ViconClient => viconClient;
 
@@ -97,6 +97,7 @@ private void Update()
             };
             if(!streamedData.TryAdd(subject, viconPositionData));
             streamedData[subject] = viconPositionData;
+            //Debug.Log(streamedData[subject].position["base1"][0]);
 
         }
     }
@@ -248,6 +249,7 @@ private void ProcessChildData(string subject, string segmentName)
     /// </summary>
     private void MaybeDisableConnection()
     {
+        if(viconClient == null) return;
         Result disconnectionStatus = viconClient.Disconnect().Result;
         Debug.Log($"Disconnected:{disconnectionStatus}");
     }