Bugfixes

Author: justinkasowski

Backend/BackendShaderHandler.cs

@@ -113,7 +113,7 @@ public void OnRenderImage(RenderTexture source, RenderTexture destination)
 
             RenderTexture.ReleaseTemporary(processedTexture);
 
-            if (vm.CheckForUpdate() || (framesToWait != frameDelay )) {
+            if (vm.CheckForUpdate() || (framesToWait != frameDelay ) || (vm.calculateAxonMap && axonMap.axonSegmentContributions == null)) {
                 UpdateAfterFrames(); // Insures the loading screen is loaded before doing calculations
                 return; }
 
@@ -124,8 +124,6 @@ public void OnRenderImage(RenderTexture source, RenderTexture destination)
             RasterizeElectrodes();
 
             GetGazeScreenPos();
-
-            BlurImage(false); 
 
 			RunPreprocessing();
 
@@ -137,7 +135,7 @@ public void OnRenderImage(RenderTexture source, RenderTexture destination)
 
             RunTemporal(); 
 
-            BlurImage(true);
+            BlurImage();
 
             ElectrodeDebug();
             Graphics.Blit(processedTexture, destination);
@@ -446,18 +444,18 @@ private void GazeLock() {
     /// <summary>
     /// If blurFinalImage is true, apply blurShader twice to processedTexture
     /// </summary>
-    private void BlurImage(bool final) {
-        if((final && vm.blurFinalImage) || (!final && vm.preprocessingBlur){
-            vm.blurShader.SetInt("_KernelSize", final ? vm.postBlurIntensity : preBlurIntensity);
-            temp = processedTexture;
-            processedTexture = RenderTexture.GetTemporary(startingResX, startingResY, 0);
-            Graphics.Blit(temp, processedTexture, vm.blurShader);
-            RenderTexture.ReleaseTemporary(temp);
+    private void BlurImage()
+    {
+        vm.postBlurShader.SetInt("_KernelSize", vm.postBlurIntensity );
+        temp = processedTexture;
+        processedTexture = RenderTexture.GetTemporary(temp.width, temp.height, 0);
+        Graphics.Blit(temp, processedTexture, vm.postBlurShader);
+        RenderTexture.ReleaseTemporary(temp);
 
-            temp = processedTexture;
-            processedTexture = RenderTexture.GetTemporary(startingResX, startingResY, 0);
-            Graphics.Blit(temp, processedTexture, vm.blurShader);
-            RenderTexture.ReleaseTemporary(temp); } }
+        temp = processedTexture;
+        processedTexture = RenderTexture.GetTemporary(temp.width, temp.height, 0);
+        Graphics.Blit(temp, processedTexture, vm.postBlurShader);
+        RenderTexture.ReleaseTemporary(temp);  }
 
     /// <summary>
     /// If in debugMode, log info to ErrorDebug
@@ -562,12 +560,13 @@ private void UpdateConfiguration()
     /// Release buffers
     /// </summary>
     private void OnApplicationQuit() {
-        if(electrodesBuffer != null && electrodesBuffer.IsValid())
-            electrodesBuffer.Release();
-        if (simulationVariablesBuffer != null && simulationVariablesBuffer.IsValid())
-            simulationVariablesBuffer.Release();
-        if (vm.useAxonMap && axonContributionBuffer != null && axonContributionBuffer.IsValid())
-            axonContributionBuffer.Release(); }
+        tempVarsBuffer?.Release();
+        axonSegmentGaussToElectrodes?.Release();
+        electrodesBuffer?.Release();
+        axonContributionBuffer?.Release();
+        axonIdxStartBuffer?.Release();
+        axonIdxEndBuffer?.Release();
+        }
 
     private void Start() {
         vm = VariableManagerScript.Instance;
@@ -581,8 +580,6 @@ private void Awake() {
             System.Runtime.InteropServices.Marshal.SizeOf(typeof(AxonSegment)));
         electrodesBuffer = new ComputeBuffer(10,
             System.Runtime.InteropServices.Marshal.SizeOf(typeof(Electrode)));
-        simulationVariablesBuffer = new ComputeBuffer(10,
-            System.Runtime.InteropServices.Marshal.SizeOf(typeof(AxonMapSettings)));
         axonContributionBuffer = new ComputeBuffer(10, 
             System.Runtime.InteropServices.Marshal.SizeOf(typeof(float))); 
         axonIdxStartBuffer = new ComputeBuffer(10, 

Backend/Resources/AxonMapHandler.cs

@@ -86,8 +86,6 @@ public void SetAxonMap() {
     /// </summary>
     public void SetElectrodeToAxonSegmentGauss()
     {
-        Timer time = new Timer("Calc Time");
-        time.start();
         int numberElectrodes = VariableManagerScript.Instance.numberYelectrodes *
                                VariableManagerScript.Instance.numberXelectrodes;
 
@@ -157,8 +155,7 @@ public void SetElectrodeToAxonSegmentGauss()
                         VariableManagerScript.Instance.configurationPath + "_axonElectrodeGauss", electrodeGauss
                     ); } }
 
-            ErrorDebug.Log("Finished Calculating Electrode Distances");
-            time.stopAndLog(); } }
+            ErrorDebug.Log("Finished Calculating Electrode Distances"); } }
 
 
     /// <summary>

Backend/Resources/CollisionHandler.cs

@@ -198,7 +198,8 @@ private void Awake()
 
         foreach (var rawImage in UiOverlayPositions)
         {
-            rawImage.enabled = false;
+            if(rawImage!=null)
+                rawImage.enabled = false;
         }
 
         if ( Instance == null) { Instance = this; DontDestroyOnLoad(gameObject); }

Backend/Resources/CollisionHandler.cs.meta

@@ -41,11 +41,9 @@ public class VariableManagerScript : MonoBehaviour {
     public bool depthDetection = false; 
     public bool useBionicVisionShader = true; 
     public Material perceptShaderMaterial;
-    public bool preprocessingblur = true;
-    public int preBlurIntensity = 5; 
     public bool blurFinalImage= true;
     public int postBlurIntensity = 15;
-    public Material blurShader;
+    public Material postBlurShader;
     public ComputeShader randomShuffler;
 
 
@@ -148,7 +146,7 @@ public string GetCurrentConfig()
     /// <returns></returns>
     public void updateConfigurationPath()
     {
-       backendPath = Application.dataPath + Path.DirectorySeparatorChar + "BionicVisionVR" +
+       backendPath = Application.dataPath + Path.DirectorySeparatorChar + "BionicVisionXR" +
         Path.DirectorySeparatorChar
         + "Backend" + Path.DirectorySeparatorChar ;
         configurationPath = backendPath + "PremadeConfigurations" + Path.DirectorySeparatorChar + GetCurrentConfig();