Bug fixes due to asynchronous annotation dataset loading

Author: dbirman

Assets/Scenes/TrajectoryPlanner.unity

@@ -14169,7 +14169,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -17873,6 +17873,7 @@ MonoBehaviour:
   recRegionSlider: {fileID: 353300833}
   ccfCollider: {fileID: 1859818792}
   inPlaneSlice: {fileID: 672548778}
+  sliceRenderer: {fileID: 379075881}
   searchControl: {fileID: 1369876173}
   searchInput: {fileID: 1047957689}
   localPrefs: {fileID: 2108153956}
@@ -18256,7 +18257,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Scripts/TP_Search.cs

@@ -78,10 +78,15 @@ public void ClickArea(GameObject target)
             else
             {
                 if (!targetNode.IsLoaded())
-                    targetNode.loadNodeModel(false);
-
-                targetNode.SetNodeModelVisibility(true);
-                modelControl.ChangeMaterial(targetNode, "lit");
+                    targetNode.loadNodeModel(false, handle => {
+                        targetNode.SetNodeModelVisibility(true);
+                        modelControl.ChangeMaterial(targetNode, "lit");
+                    });
+                else
+                {
+                    targetNode.SetNodeModelVisibility(true);
+                    modelControl.ChangeMaterial(targetNode, "lit");
+                }
             }
             activeBrainAreas.Add(targetNode);
         }

Assets/Scripts/TP_SliceRenderer.cs

@@ -21,6 +21,7 @@ public class TP_SliceRenderer : MonoBehaviour
     private int apIdx = 0;
 
     bool needToRender = false;
+    bool loaded = false;
 
     private bool camXLeft;
     private bool camYBack;
@@ -42,10 +43,13 @@ void Start()
     public void AsyncStart()
     {
         annotationDataset = tpmanager.GetAnnotationDataset();
+        loaded = true;
+        ToggleSliceVisibility(localPrefs.GetSlice3D());
     }
 
     private void Update()
     {
+
         if (localPrefs.GetSlice3D())
         {
             // Check if the camera moved such that we have to flip the slice quads
@@ -68,6 +72,7 @@ private void Update()
     private void UpdateSlicePosition()
     {
         ProbeController activeProbeController = tpmanager.GetActiveProbeController();
+        if (activeProbeController == null) return;
         Transform activeProbeTipT = activeProbeController.GetTipTransform();
         Vector3 tipPosition = activeProbeTipT.position + activeProbeTipT.up * 0.2f; // add 200 um to get to the start of the recording region
 
@@ -132,6 +137,9 @@ private bool UpdateCameraPosition()
     /// </summary>
     private void RenderAnnotationLayer()
     {
+        // prevent use of annotation dataset until it is loaded properly
+        if (!loaded) return;
+
         // Render sagittal slice
         for (int x = 0; x < baseSize[0]; x++)
         {
@@ -159,9 +167,12 @@ public void ToggleSliceVisibility(bool visible)
         localPrefs.SetSlice3D(visible);
         sagittalSliceGO.SetActive(visible);
         coronalSliceGO.SetActive(visible);
-        // Force everything to render
-        UpdateCameraPosition();
-        UpdateSlicePosition();
-        RenderAnnotationLayer();
+        if (visible)
+        {
+            // Force everything to render
+            UpdateCameraPosition();
+            UpdateSlicePosition();
+            RenderAnnotationLayer();
+        }
     }
 }

Assets/Scripts/TrajectoryPlannerManager.cs

@@ -145,7 +145,7 @@ private void LoadAnnotationDatasetCompleted()
         datasetIndexes_bytes = null;
         inPlaneSlice.StartAnnotationDataset();
 
-        localPrefs.AsyncStart();
+        //localPrefs.AsyncStart();
         sliceRenderer.AsyncStart();
     }