fix: fixing some bugs on drop to surface but not all

Author: dbirman

Assets/Scenes/TrajectoryPlanner.unity

@@ -3130,15 +3130,15 @@ PrefabInstance:
       objectReference: {fileID: 1703646459}
     - target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 169.88
       objectReference: {fileID: 0}
     - target: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_IsOn
@@ -3274,19 +3274,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 354.84
       objectReference: {fileID: 0}
     - target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 341190944071593138, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMax.x
@@ -3566,19 +3566,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 384.91998
       objectReference: {fileID: 0}
     - target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 341190944411999430, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
       propertyPath: m_AnchorMax.y

Assets/Scripts/Pinpoint/Probes/ProbeManager.cs

@@ -100,10 +100,10 @@ public static string[] GetAllChannelAnnotationData()
     #endregion
 
     // Probe position data
-    private Vector3 _recRegionBaseCoordU;
-    private Vector3 _recRegionTopCoordU;
+    private Vector3 _recRegionBaseCoordWorldU;
+    private Vector3 _recRegionTopCoordWorldU;
 
-    public (Vector3 tipCoordU, Vector3 endCoordU) RecRegionCoordWorldU { get { return (_recRegionBaseCoordU, _recRegionTopCoordU); } }
+    public (Vector3 tipCoordU, Vector3 endCoordU) RecRegionCoordWorldU { get { return (_recRegionBaseCoordWorldU, _recRegionTopCoordWorldU); } }
 
     // Text
     private const float minYaw = -180;
@@ -382,8 +382,8 @@ public void ProbeMoved()
         // Update the world coordinates for the tip position
         Vector3 startCoordWorldT = _probeController.ProbeTipT.position + -_probeController.ProbeTipT.forward * channelCoords.startPosmm;
         Vector3 endCoordWorldT = _probeController.ProbeTipT.position + -_probeController.ProbeTipT.forward * channelCoords.endPosmm;
-        _recRegionBaseCoordU = BrainAtlasManager.WorldT2WorldU(startCoordWorldT);
-        _recRegionTopCoordU = BrainAtlasManager.WorldT2WorldU(endCoordWorldT);
+        _recRegionBaseCoordWorldU = BrainAtlasManager.WorldT2WorldU(startCoordWorldT);
+        _recRegionTopCoordWorldU = BrainAtlasManager.WorldT2WorldU(endCoordWorldT);
     }
 
     #region Channel map
@@ -770,8 +770,12 @@ public void DropProbeToBrainSurface()
                 return;
             }
 
-            var entryCoordAtlasT = BrainAtlasManager.ActiveAtlasTransform.U2T(
-                BrainAtlasManager.ActiveReferenceAtlas.Idx2Atlas(entryCoordAtlasIdx));
+            Debug.Log(entryCoordAtlasIdx);
+
+            Vector3 w = BrainAtlasManager.ActiveReferenceAtlas.AtlasIdx2World(entryCoordAtlasIdx);
+            Vector3 a = BrainAtlasManager.ActiveReferenceAtlas.World2Atlas(w);
+
+            var entryCoordAtlasT = BrainAtlasManager.ActiveAtlasTransform.U2T(a);
 
             _probeController.SetProbePosition(entryCoordAtlasT);
         }
@@ -850,6 +854,7 @@ public void UpdateSurfacePosition()
             if (!done)
             {
                 Debug.LogWarning("Impossible to find brain surface from here");
+                Debug.Log(tipInBrain);
                 return (new Vector3(float.NaN, float.NaN, float.NaN), false);
             }
         }