Fix bug in UXF

There was a UI bug where if a session number for a particular
participant already exists, the application would throw a
NullReferenceException in a standalone build. This change will be made
in a fork of UXF and a pull request will be done.

Author: JFrit

Assets/Scripts/DotStimulus/Dot.cs

@@ -36,6 +36,8 @@ public Dot(Vector2 velocity, Vector3 startingPosition, StimulusSettings settings
 
         public void UpdateDot()
         {
+            var deltaTime = Time.deltaTime;
+            
             if (_elapsedTime > Random.Range(_settings.minDotLifetime, _settings.maxDotLifetime))
             {
                 var randomPosition = Random.insideUnitCircle * _apertureRadius;
@@ -45,8 +47,8 @@ public void UpdateDot()
             }
             else
             {
-                _currentPosition.x += _velocity.x * Time.deltaTime;
-                _currentPosition.z += _velocity.y * Time.deltaTime;
+                _currentPosition.x += _velocity.x * deltaTime;
+                _currentPosition.z += _velocity.y * deltaTime;
 
                 // Square magnitude used for efficiency
                 if (_currentPosition.sqrMagnitude > _sqrApertureRadius)
@@ -57,7 +59,7 @@ public void UpdateDot()
             }
 
             Position = _currentPosition;
-            _elapsedTime += Time.deltaTime;
+            _elapsedTime += deltaTime;
             _oldPosition = _currentPosition;
         }
     }

Assets/Scripts/SessionManager.cs.meta

@@ -11,16 +11,16 @@
 		"MinDotLifetimeSeconds": 0.2,
 		"MaxDotLifetimeSeconds": 0.5,
 		"OuterStimulusDurationMs": 5000,
-		"OuterStimulusRadiusDegrees": 45,
+		"OuterStimulusRadiusDegrees": 55,
 		"OuterStimulusNoisePercentage": 100,
 		"InnerStimulusDurationMs": 500,
 		"InnerStimulusRadiusDegrees": 5,
-		"InnerStimulusNoisePercentage": 25,
+		"InnerStimulusNoisePercentage": 100,
 		"InnerStimulusSpawnRadius": 30,
 
 		"StimulusSpacingMeters": 0.001,
 
-		"StimulusDepthMeters": 0.57,
+		"StimulusDepthMeters": 2.0,
 
 		"InterTrialDelaySeconds": 2.5,
 

Assets/Scripts/Trial Manager/TrialManager.cs.meta

@@ -157,6 +157,7 @@ void Awake()
         {
             if (session == null) session = GetComponentInParent<Session>();
             if (canvas == null) canvas = GetComponent<Canvas>();
+            if (popupController == null) popupController = GetComponentInChildren<PopupController>(true);
             // read word list
             if (uuidWordList) words = uuidWordList.text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
             GenerateSidebar();
@@ -389,7 +390,7 @@ IEnumerator TryBeginSessionFromUISequence()
 
             if (exists)
             {
-                Popup newPopup = new Popup()
+                Popup newPopup = new Popup
                 {
                     message = string.Format(
                         "{0} - {1} - Session #{2} already exists! Press OK to start the session anyway, data may be overwritten.",

Assets/StreamingAssets/TEMPLATE.json

@@ -19,5 +19,5 @@ MonoBehaviour:
   InitializationType: 1
   EditorAppKey: application.generated.unity.dotstimulustest.exe
   ActionManifestFileRelativeFilePath: StreamingAssets\SteamVR\actions.json
-  MirrorView: 0
+  MirrorView: 1
   HasCopiedDefaults: 0

Assets/UXF/Scripts/UI/UIController.cs

@@ -125,7 +125,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 6405742922248523384, guid: efde690a735af1f4a89b7bfd2c31a41a, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

Assets/XR/Settings/Open VR Settings.asset

@@ -3,7 +3,7 @@
 --- !u!5 &1
 TimeManager:
   m_ObjectHideFlags: 0
-  Fixed Timestep: 0.02
+  Fixed Timestep: 0.00833333
   Maximum Allowed Timestep: 0.33333334
   m_TimeScale: 1
   Maximum Particle Timestep: 0.03

ProjectSettings/ProjectSettings.asset

@@ -8,5 +8,5 @@ VFXManager:
   m_SortShader: {fileID: 0}
   m_StripUpdateShader: {fileID: 0}
   m_RenderPipeSettingsPath: 
-  m_FixedTimeStep: 0.016666668
+  m_FixedTimeStep: 0.00833333
   m_MaxDeltaTime: 0.05