Skip to content

Commit 60b9580

Browse files
committed
Fix bug involving incorrect loading of the dot lifetime JSON settings
1 parent 4ca7b48 commit 60b9580

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

Assets/Scripts/AttentionCue.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void Update()
6565
var position = selfObject.transform.localPosition;
6666
var delta = _velocity * (2 * Time.deltaTime);
6767
selfObject.transform.localPosition = new Vector3(position.x + delta.x, position.y + delta.y, sessionSettings.attentionCueDepth);
68+
// The object cannot be parented to the inner stimulus since it is disabled when the cue should play
6869
} else if (sessionSettings.cueType == SessionSettings.CueType.StimulusBased)
6970
{
7071
gameObject.transform.localPosition = innerStimulus.transform.localPosition;

Assets/Scripts/Settings/InnerStimulusSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ MonoBehaviour:
1919
noiseDotPercentage: 100
2020
dotSizeArcMinutes: 14
2121
speed: 10
22-
minDotLifetime: 0.2
23-
maxDotLifetime: 0
22+
minDotLifetime: 49
23+
maxDotLifetime: 50
2424
stimDepthMeters: 0.569

Assets/Scripts/Settings/OuterStimulusSettings.asset

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ MonoBehaviour:
1515
correctAngle: 0
1616
coherenceRange: 0
1717
apertureRadiusDegrees: 45
18-
density: 3.5
18+
density: 2
1919
noiseDotPercentage: 100
2020
dotSizeArcMinutes: 14
2121
speed: 10
22-
dotLifetime: 0.3
22+
minDotLifetime: 49
23+
maxDotLifetime: 50
2324
stimDepthMeters: 0.57

Assets/Scripts/Trial Manager/TrialManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ private void InitializeStimuli()
186186
_innerStimulusSettings.density = sessionSettings.stimulusDensity;
187187
_outerStimulusSettings.density = sessionSettings.stimulusDensity;
188188
_innerStimulusSettings.minDotLifetime = sessionSettings.minDotLifetime;
189+
_outerStimulusSettings.minDotLifetime = sessionSettings.minDotLifetime;
190+
_innerStimulusSettings.maxDotLifetime = sessionSettings.maxDotLifetime;
189191
_outerStimulusSettings.maxDotLifetime = sessionSettings.maxDotLifetime;
190192
_innerStimulusSettings.dotSizeArcMinutes = sessionSettings.dotSize;
191193
_outerStimulusSettings.dotSizeArcMinutes = sessionSettings.dotSize;

Assets/StreamingAssets/TEMPLATE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"OuterStimulusNoisePercentage": 100,
1616
"InnerStimulusDurationMs": 500,
1717
"InnerStimulusRadiusDegrees": 5,
18-
"InnerStimulusNoisePercentage": 25,
18+
"InnerStimulusNoisePercentage": 50,
1919
"InnerStimulusSpawnRadius": 30,
2020

2121
"StimulusSpacingMeters": 0.001,

0 commit comments

Comments
 (0)