Updating how CCF nodes are loaded to match new full/sided loading mechanisms

Author: dbirman

Assets/Scripts/TrajectoryPlanner/TP_Search.cs

@@ -93,7 +93,7 @@ public void ChangeSearch(string searchString)
                 else
                     areaPanel.GetComponentInChildren<TextMeshProUGUI>().text = areaNode.Name;
                 areaPanel.GetComponent<TP_SearchAreaPanel>().SetNode(areaNode);
-                areaPanel.GetComponent<Image>().color = areaNode.GetColor();
+                areaPanel.GetComponent<Image>().color = areaNode.Color;
                 areaPanel.SetActive(true);
             }
             else
@@ -132,7 +132,7 @@ public void SelectBrainArea(CCFTreeNode targetNode)
                 modelControl.ChangeMaterial(targetNode, "lit");
             else
             {
-                if (!targetNode.IsLoaded())
+                if (!targetNode.IsLoaded(true))
                     LoadSearchNode(targetNode);
                 else
                 {
@@ -162,8 +162,8 @@ public void ClearAllAreas()
 
     private async void LoadSearchNode(CCFTreeNode node)
     {
-        node.LoadNodeModel(false);
-        await node.GetLoadedTask();
+        node.LoadNodeModel(true, false);
+        await node.GetLoadedTask(true);
         node.GetNodeTransform().localPosition = Vector3.zero;
         node.GetNodeTransform().localRotation = Quaternion.identity;
         node.SetNodeModelVisibility(true);

Assets/Scripts/TrajectoryPlanner/TrajectoryPlannerManager.cs

@@ -271,11 +271,8 @@ private async void DelayedModelControlStart()
 
             foreach (CCFTreeNode node in modelControl.GetDefaultLoadedNodes())
             {
-                node.SetNodeModelVisibility(true);
-                Transform nodeT = node.GetNodeTransform();
-                // I don't know why this has to happen, somewhere these are getting set incorrectly?
-                nodeT.localPosition = Vector3.zero;
-                nodeT.localRotation = Quaternion.identity;
+                await node.GetLoadedTask(true);
+                node.SetNodeModelVisibility(true, false, false);
             }
         }
 
@@ -329,6 +326,11 @@ public TP_ProbeQuickSettings GetProbeQuickSettings()
         {
             return probeQuickSettings;
         }
+        
+        public TP_QuestionDialogue GetQuestionDialogue()
+        {
+            return qDialogue;
+        }
 
         public Collider CCFCollider()
         {
@@ -506,7 +508,7 @@ public ProbeManager AddNewProbeTransformed(int probeType, ProbeInsertion inserti
                 if (manipulatorId != 0) probeManager.SetEphysLinkMovement(true, manipulatorId);
             }
 
-            probeManager.GetProbeController().SetProbePositionTransformed(insertion);
+            probeManager.GetProbeController().SetProbePosition(insertion);
 
             return probeManager;
         }
@@ -623,13 +625,16 @@ public void ReturnProbeColor(Color returnColor)
             probeColors.Insert(0, returnColor);
         }
 
-        public void SetActiveProbe(ProbeManager newActiveProbeController)
+        public void SetActiveProbe(ProbeManager newActiveProbeManager)
         {
-            if (activeProbe == newActiveProbeController)
+            if (activeProbe == newActiveProbeManager)
                 return;
 
-            Debug.Log("Setting active probe to: " + newActiveProbeController.gameObject.name);
-            activeProbe = newActiveProbeController;
+#if UNITY_EDITOR
+            Debug.Log("Setting active probe to: " + newActiveProbeManager.gameObject.name);
+#endif
+            activeProbe = newActiveProbeManager;
+            activeProbe.SetActive();
 
             foreach (ProbeManager probeManager in allProbeManagers)
             {
@@ -657,7 +662,7 @@ public void SetActiveProbe(ProbeManager newActiveProbeController)
             inPlaneSlice.ResetZoom();
 
             // Update probe quick settings
-            probeQuickSettings.SetProbeManager(newActiveProbeController);
+            probeQuickSettings.SetProbeManager(newActiveProbeManager);
         }
 
         public void UpdateQuickSettings()