feat: added sagittal/coronal angles, no from allowed for now

from is so complicated daaaamn

Author: dbirman

Assets/Prefabs/UI/SettingsMenu/Menus/ProbeMenu.prefab

@@ -4259,6 +4259,8 @@ MonoBehaviour:
       m_Image: {fileID: 0}
     - m_Text: 'Angle convention: New Scale MIS'
       m_Image: {fileID: 0}
+    - m_Text: 'Angle convention: Coronal/Sagittal'
+      m_Image: {fileID: 0}
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls:

Assets/Scenes/TrajectoryPlanner.unity

@@ -512,17 +512,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67bac97c0532be84b862331a0bfec212, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &499537228 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
-  m_PrefabInstance: {fileID: 341190943874437988}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &514262552 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2252271064940867327, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
@@ -9144,7 +9133,7 @@ PrefabInstance:
     - target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
       propertyPath: iblAngleToggle
       value: 
-      objectReference: {fileID: 499537228}
+      objectReference: {fileID: 0}
     - target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
       propertyPath: invivoDropdown
       value: 
@@ -9156,7 +9145,7 @@ PrefabInstance:
     - target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
       propertyPath: _iblAngleToggle
       value: 
-      objectReference: {fileID: 499537228}
+      objectReference: {fileID: 0}
     - target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
       propertyPath: _invivoDropdown
       value: 

Assets/Scripts/Pinpoint/AngleConventions/AngleConvention.cs

@@ -8,7 +8,49 @@ public abstract class AngleConvention
     public abstract string YName { get; }
     public abstract string ZName { get; }
 
+    public abstract bool AllowFrom { get; }
+
     public abstract Vector3 ToConvention(Vector3 pinpointAngles);
 
     public abstract Vector3 FromConvention(Vector3 conventionAngles);
+
+    /// <summary>
+    /// Convert Pinpoint angles to Cartesian coordinates in a unit sphere
+    /// </summary>
+    /// <param name="pinpointAngles"></param>
+    /// <returns></returns>
+    public static Vector3 ToCartesian(Vector3 pinpointAngles)
+    {
+        pinpointAngles.y = 90f - pinpointAngles.y; // invert the pitch
+        Vector3 radAngles = pinpointAngles * Mathf.Deg2Rad;
+        float x = Mathf.Sin(radAngles.y) * Mathf.Cos(radAngles.x);
+        float y = Mathf.Sin(radAngles.y) * Mathf.Sin(radAngles.x);
+        float z = Mathf.Cos(radAngles.y);
+
+        return new Vector3(x, y, z);
+    }
+
+    /// <summary>
+    /// Convert Cartesian coordiantes back to Pinpoint angles
+    /// </summary>
+    /// <param name="cartesianCoords">normalized vector of cartesian coordinates</param>
+    /// <returns></returns>
+    public static Vector3 FromCartesian(Vector3 cartesianCoords)
+    {
+        float yaw;
+
+        // Handle near-vertical vectors by checking if x and y are small
+        if (Mathf.Abs(cartesianCoords.x) < 1e-6f && Mathf.Abs(cartesianCoords.y) < 1e-6f)
+        {
+            return new Vector3(0f, 90f, 0f);
+        }
+
+        yaw = Mathf.Atan2(cartesianCoords.y, cartesianCoords.x) * Mathf.Rad2Deg;
+
+        // Calculate the pitch (angle from the z-axis)
+        float pitch = Mathf.Acos(cartesianCoords.z) * Mathf.Rad2Deg;
+
+        // Return the pinpoint angles
+        return new Vector3(yaw, 90f - pitch, 0f);
+    }
 }

Assets/Scripts/Pinpoint/AngleConventions/IBLAngleConvention.cs

@@ -10,6 +10,8 @@ public class IBLAngleConvention : AngleConvention
 
     public override string ZName => "Roll";
 
+    public override bool AllowFrom => true;
+
     /// <summary>
     /// Convert Pinpoint angles to IBL format
     /// </summary>

Assets/Scripts/Pinpoint/AngleConventions/MISAngleConvention.cs

@@ -6,12 +6,14 @@ public class MISAngleConvention : AngleConvention
 
     public override string DisplayName => "New Scale MIS";
 
-    public override string XName => "AP";
+    public override string XName => "Arc angle";
 
-    public override string YName => "ML";
+    public override string YName => "Arc tilt";
 
     public override string ZName => "Spin";
 
+    public override bool AllowFrom => false;
+
     /// <summary>
     /// Convert MIS angles to IBL format
     /// </summary>
@@ -20,6 +22,9 @@ public class MISAngleConvention : AngleConvention
     public override Vector3 ToConvention(Vector3 pinpointAngles)
     {
         // todo
+        Vector3 cartesianCoords = ToCartesian(pinpointAngles);
+        //float arc_tilt = Mathf.Asin(pinpointAngles)
+        //float arc_angle = 
         return new Vector3();
     }
 

Assets/Scripts/Pinpoint/AngleConventions/PinpointAngleConvention.cs

@@ -10,6 +10,8 @@ public class PinpointAngleConvention : AngleConvention
 
     public override string ZName => "Roll";
 
+    public override bool AllowFrom => true;
+
     public override Vector3 FromConvention(Vector3 conventionAngles)
     {
         return conventionAngles;

Assets/Scripts/Pinpoint/AngleConventions/SagittalCoronalAngleConvention.cs

@@ -0,0 +1,63 @@
+using UnityEngine;
+
+public class SagittalCoronalAngleConvention : AngleConvention
+{
+    public override string DisplayName => "Coronal/Sagittal";
+
+    public override string XName => "Coronal";
+
+    public override string YName => "Sagittal";
+
+    public override string ZName => "Roll";
+
+    public override bool AllowFrom => false;
+
+    public override Vector3 FromConvention(Vector3 conventionAngles)
+    {
+
+        //conventionAngles = conventionAngles.normalized;
+
+        //// Extract the sagittal (XZ) and coronal (YZ) angles from the convention angles
+        //float XZAngle = conventionAngles.x;
+        //float YZAngle = -conventionAngles.y; // Undo the sign change from ToConvention
+        //float combinedRoll = conventionAngles.z;
+
+        //Debug.Log(conventionAngles);
+
+        ////Convert the angles back to Cartesian coordinates
+        //float z = 1f; // We assume unit length for simplicity (same as in ToConvention)
+        //float x = Mathf.Tan((90f - XZAngle) * Mathf.Deg2Rad) * z;
+        //float y = Mathf.Tan((90f - YZAngle) * Mathf.Deg2Rad) * z;
+
+        //Debug.Log((x, y, z));
+
+        //Vector3 pinpointAngles = FromCartesian(new Vector3(x, y, z));
+
+        //Debug.Log(pinpointAngles);
+
+        //pinpointAngles.z = combinedRoll - pinpointAngles.x;
+
+
+        //Debug.Log(pinpointAngles);
+
+        return conventionAngles;
+    }
+
+    public override Vector3 ToConvention(Vector3 pinpointAngles)
+    {
+        Vector3 cartesianCoords = ToCartesian(pinpointAngles);
+
+        Debug.Log(cartesianCoords);
+
+        // Get the XZ angle, which is the sagittal angle
+        float XZAngle = 90f - Mathf.Atan2(cartesianCoords.z, cartesianCoords.x) * Mathf.Rad2Deg;
+        // Get the YZ angle, which is the coronal plane
+        float YZAngle = 90f - Mathf.Atan2(cartesianCoords.z, cartesianCoords.y) * Mathf.Rad2Deg;
+
+        Vector3 angles = new Vector3(XZAngle, -YZAngle, pinpointAngles.x + pinpointAngles.z);
+        Vector3 back = FromConvention(angles);
+
+        Debug.Log((pinpointAngles, back));
+        return new Vector3(XZAngle, -YZAngle, pinpointAngles.x + pinpointAngles.z);
+    }
+}

Assets/Scripts/Pinpoint/AngleConventions/SagittalCoronalAngleConvention.cs.meta

@@ -68,9 +68,18 @@ public void UpdateInteractable(Vector4 pos, Vector3 ang)
         _dvField.interactable = pos.z != 0f;
         _depthField.interactable = pos.w != 0f;
 
-        _yawField.interactable = ang.x != 0f;
-        _pitchField.interactable = ang.y != 0f;
-        _rollField.interactable = ang.z != 0f;
+        if (Settings.AngleConvention.AllowFrom)
+        {
+            _yawField.interactable = ang.x != 0f;
+            _pitchField.interactable = ang.y != 0f;
+            _rollField.interactable = ang.z != 0f;
+        }
+        else
+        {
+            _yawField.interactable = false;
+            _pitchField.interactable = false;
+            _rollField.interactable = false;
+        }
     }
 
     public void UpdateText()

Assets/Scripts/Pinpoint/CoordinateEntryPanel.cs

@@ -450,7 +450,8 @@ public ProbeManager AddNewProbe(ProbeProperties.ProbeType probeType, string UUID
 
             UpdateQuickSettingsProbeIdText();
 
-            newProbeManager.UIUpdateEvent.AddListener(() => UpdateQuickSettings(newProbeManager));
+            // This listener seems to be redundant with LateUpdate call
+            //newProbeManager.UIUpdateEvent.AddListener(() => UpdateQuickSettings(newProbeManager));
             newProbeManager.ProbeController.MovedThisFrameEvent.AddListener(SetMovedThisFrame);
 
             // Add listener for SetActiveProbe