Minor Cleanup

ovi-lab · Jul 6, 2024 · 0298af3 · 0298af3
1 parent aef5bc3
commit 0298af3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 39 deletions.
diff --git a/Assets/Scripts/ViconNexusUnityStream/CustomSubjectScript.cs b/Assets/Scripts/ViconNexusUnityStream/CustomSubjectScript.cs
@@ -213,7 +213,9 @@ protected virtual string ConstructFinalWriterString()
                 "}";
         }
         #endregion
-
+
+
+        //TO DO: Removed the rawData parameter. It might break things in future
         void ProcessData(Data data)
         {
             //rawData = text;

diff --git a/Assets/Scripts/ViconNexusUnityStream/SubjectDataManager.cs b/Assets/Scripts/ViconNexusUnityStream/SubjectDataManager.cs
@@ -40,7 +40,6 @@ public bool UseDefaultData
     /// </summary>
     public bool EnableWriteData { get => enableWriteData; set => enableWriteData = value; }
     public Dictionary<string, Data> StreamedData => streamedData;
-    public Dictionary<string, string> StreamedRawData => rawData;
     public IViconClient ViconClient => viconClient;
 
     [SerializeField] private ClientConfigArgs clientConfig;
@@ -189,53 +188,17 @@ private Dictionary<string, List<float>> ProcessData(string subject, uint markerC
         for(uint i = 0; i < markerCount; i++)
         {
             string markerName = viconClient.GetMarkerName(subject, i).MarkerName;
-             var globalTranslation = viconClient.GetMarkerGlobalTranslation(subject, markerName);
-             // if (globalTranslation.Result != Result.Success)
-             // {
-             //     Debug.LogWarning("Failed");
-             // }
+            Output_GetMarkerGlobalTranslation globalTranslation = viconClient.GetMarkerGlobalTranslation(subject, markerName);
             markerPositionsDict[markerName] = new List<float>()
             {
                 (float)globalTranslation.Translation[0],
                 (float)globalTranslation.Translation[1],
                 (float)globalTranslation.Translation[2]
             };
-            //Debug.Log($"{markerName}: {globalTranslation.Translation[0]}");
         }
-
         return markerPositionsDict;
     }
 
-    private void ProcessData(string subject, string segmentName)
-    {
-        double[] translationData = viconClient.GetSegmentLocalTranslation(subject, segmentName).Translation;
-        double[] orientationData = viconClient.GetSegmentLocalRotationQuaternion(subject, segmentName).Rotation;
-        FusionService.Quat viconOrientation = new(orientationData[0], orientationData[1], orientationData[2], orientationData[3]);
-        FusionService.Vec viconTranslation = new(translationData[0], translationData[1], translationData[2]);
-        FusionService.Pose posData = FusionService.GetMappedVicon(viconOrientation, viconTranslation);
-        List<float> positionData = new()
-            {(float)posData.Position.X, (float)posData.Position.Y, (float)posData.Position.Z};
-        Output_GetSegmentChildCount childCount = viconClient.GetSegmentChildCount(subject, segmentName);
-        streamedData[subject].position[segmentName] = positionData;
-        if(childCount.SegmentCount <= 0) return;
-        for (uint i = 0; i < childCount.SegmentCount; i++)
-        {
-            Output_GetSegmentChildName childSegment = viconClient.GetSegmentChildName(subject, segmentName, i);
-            ProcessData(subject, childSegment.SegmentName);
-        }
-    }
-
-    private void ProcessChildData(string subject, string segmentName)
-    {
-
-
-        coordinateUtils.Create();
-        //HMDUtils.FusionService.Pose ViconInHMD = FusionService.GetMappedVicon(ViconOrientation, translationData);
-
-
-
-    }
-
     /// <summary>
     /// Disable connection 
     /// </summary>