feat: adding waxholm78

- Memory *still* fails!! It's something else about the rat atlases that is causing the problems, the 78 atlas is much smaller than the Allen atlas. Could be that the Texture3D objects are too complex? Or could be something about the meshes being larger?

Author: dbirman

Assets/Scenes/TrajectoryPlanner.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44824904, g: 0.49827605, b: 0.5755831, a: 1}
+  m_IndirectSpecularColor: {r: 0.44912726, g: 0.49919963, b: 0.5757154, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -2874,10 +2874,12 @@ MonoBehaviour:
   _atlasNames:
   - allen_mouse_25um
   - whs_sd_rat_39um
+  - whs_sd_rat_78um
   _atlasMappings:
   - Mouse CCF (25um)
   - Rat Waxholm (39um)
-  _allowedOnWebGL: 0100
+  - Rat Waxholm (78um)
+  _allowedOnWebGL: 010001
   _transformDropdown: {fileID: 611159662}
 --- !u!1001 &341190943874437988
 PrefabInstance:

Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs

@@ -180,25 +180,52 @@ public async void Startup()
             }
             Settings.ReferenceCoord = referenceAtlas.AtlasSpace.ReferenceCoord;
 
-            // there is only one default set right now, tbd if we want to add others (beryl/cosmos/etc)
-            var nodeTask = _atlasManager.LoadDefaultAreas("");
 
-            referenceAtlas.LoadAnnotations();
-            referenceAtlas.LoadAnnotationTexture();
+            // [TODO REMOVE THIS CODE WHEN ADDRESSABLES GETS REBUILT
+            if (Settings.AtlasName.Equals("whs_sd_rat_78um"))
+            {
+                var areaIDs = new int[] { 1034, 1096, 1084, 1038, 1081, 1097, 1048, 1057, 1061, 1055, 1059, 1069, 1056, 1065, 1072, 1020, 1047, 58, 1044, 74, 1046, 56, 1045, 75, 1043 };
+                foreach (int areaID in areaIDs)
+                {
+                    OntologyNode node = BrainAtlasManager.ActiveReferenceAtlas.Ontology.ID2Node(areaID);
+
+                    // Load all models
+                    var nodeTask = node.LoadMesh(OntologyNode.OntologyNodeSide.Full);
 
-            await Task.WhenAll(new Task[] { referenceAtlas.AnnotationsTask, referenceAtlas.AnnotationTextureTask, nodeTask});
+                    await nodeTask;
 
-            foreach (var node in nodeTask.Result)
+                    node.SetVisibility(true, OntologyNode.OntologyNodeSide.Full);
+                    node.SetMaterial(BrainAtlasManager.BrainRegionMaterials["transparent-unlit"], OntologyNode.OntologyNodeSide.Full);
+                    node.ResetColor();
+                    node.SetShaderProperty("_Alpha", 0.25f, OntologyNode.OntologyNodeSide.Full);
+                    _pinpointAtlasManager.DefaultNodes.Add(node);
+                }
+            }
+            else
             {
-                node.SetVisibility(true, OntologyNode.OntologyNodeSide.Full);
-                node.SetVisibility(false, OntologyNode.OntologyNodeSide.Left);
-                node.SetVisibility(false, OntologyNode.OntologyNodeSide.Right);
-                node.SetMaterial(BrainAtlasManager.BrainRegionMaterials["transparent-unlit"]);
-                node.ResetColor();
-                node.SetShaderProperty("_Alpha", 0.25f, OntologyNode.OntologyNodeSide.Full);
-                _pinpointAtlasManager.DefaultNodes.Add(node);
+                // there is only one default set right now, tbd if we want to add others (beryl/cosmos/etc)
+                var nodeTask = _atlasManager.LoadDefaultAreas("");
+
+                await nodeTask;
+
+                foreach (var node in nodeTask.Result)
+                {
+                    node.SetVisibility(true, OntologyNode.OntologyNodeSide.Full);
+                    node.SetVisibility(false, OntologyNode.OntologyNodeSide.Left);
+                    node.SetVisibility(false, OntologyNode.OntologyNodeSide.Right);
+                    node.SetMaterial(BrainAtlasManager.BrainRegionMaterials["transparent-unlit"]);
+                    node.ResetColor();
+                    node.SetShaderProperty("_Alpha", 0.25f, OntologyNode.OntologyNodeSide.Full);
+                    _pinpointAtlasManager.DefaultNodes.Add(node);
+                }
             }
 
+            referenceAtlas.LoadAnnotations();
+            referenceAtlas.LoadAnnotationTexture();
+
+            await Task.WhenAll(new Task[] { referenceAtlas.AnnotationsTask, referenceAtlas.AnnotationTextureTask});
+
+
             // Now that the areas are loaded we can also set the BLDistance values
             SetBLUI();
 

Assets/UniversalRenderPipelineAsset.asset

@@ -104,6 +104,10 @@ MonoBehaviour:
   m_PrefilterDBufferMRT1: 1
   m_PrefilterDBufferMRT2: 1
   m_PrefilterDBufferMRT3: 1
+  m_PrefilterSoftShadowsQualityLow: 1
+  m_PrefilterSoftShadowsQualityMedium: 1
+  m_PrefilterSoftShadowsQualityHigh: 1
+  m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
   m_PrefilterNativeRenderPass: 1
   m_ShaderVariantLogLevel: 0

Packages/packages-lock.json

@@ -223,14 +223,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "fc064767fda32b093549649d6b38c12e5008d6dd"
+      "hash": "2371e91a1be3649cf070837f2248e8328e3ed977"
     },
     "vbl.urchin": {
       "version": "https://github.com/VirtualBrainLab/Urchin.git?path=/UnityClient/Packages/vbl.urchin",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "519062778b0b9d242835146c04485b87259f2a3f"
+      "hash": "f12ec151d3730d220ced7350dca8b6f3d170a4d1"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",