Skip to content

Commit 8b01044

Browse files
jackbrookesjackbrookes
committed
New settings sytax & caching
1 parent 680a8ec commit 8b01044

20 files changed

+558
-164
lines changed

‎Assets/UXF/Examples/Advanced/Scripts/ExperimentGenerator.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ExperimentGenerator : MonoBehaviour
1010
{
1111
public void Generate(Session session)
1212
{
13-
int numTrials = System.Convert.ToInt32(session.settings["trials_per_block"]);
13+
int numTrials = session.settings.GetInt("trials_per_block");
1414

1515
// create two blocks
1616
Block block1 = session.CreateBlock(numTrials);
@@ -24,7 +24,7 @@ public void Generate(Session session)
2424
foreach (Trial trial in session.Trials)
2525
{
2626
TargetPosition pos = Random.value > 0.5 ? TargetPosition.Left : TargetPosition.Right;
27-
trial.settings["correct_target_position"] = pos;
27+
trial.settings.SetValue("correct_target_position", pos);
2828
}
2929

3030
// set the block to be inverted ("go to the opposite target") or not, depending on the participant
@@ -44,13 +44,13 @@ public void Generate(Session session)
4444

4545
if (invertedBlockFirst)
4646
{
47-
block1.settings["inverted"] = true;
48-
block2.settings["inverted"] = false;
47+
block1.settings.SetValue("inverted", true);
48+
block2.settings.SetValue("inverted", false);
4949
}
5050
else
5151
{
52-
block1.settings["inverted"] = false;
53-
block2.settings["inverted"] = true;
52+
block1.settings.SetValue("inverted", false);
53+
block2.settings.SetValue("inverted", true);
5454
}
5555

5656
}
@@ -61,7 +61,7 @@ public void Generate(Session session)
6161
/// <param name="block"></param>
6262
void MakeCatchTrials(Block block)
6363
{
64-
int numCatchTrials = System.Convert.ToInt32(block.settings["catch_trials_per_block"]);
64+
int numCatchTrials = block.settings.GetInt("catch_trials_per_block");
6565

6666
if (numCatchTrials > block.trials.Count)
6767
{
@@ -72,7 +72,8 @@ void MakeCatchTrials(Block block)
7272
{
7373
// double the existing delay time during catch trials
7474
Trial trial = block.trials[i];
75-
trial.settings["delay_time"] = 2 * System.Convert.ToSingle(trial.settings["delay_time"]);
75+
float delayTime = 2 * trial.settings.GetFloat("delay_time");
76+
trial.settings.SetValue("delay_time", delayTime);
7677
}
7778

7879
// shuffle the trial order, so the catch trials are in random positions

‎Assets/UXF/Examples/Advanced/Scripts/InstructionsController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void UpdateInstructions()
4141
return;
4242
}
4343

44-
bool inverted = (bool)nextTrial.settings["inverted"];
44+
bool inverted = nextTrial.settings.GetBool("inverted");
4545
text.text = inverted ? invertedInstructions : normalInstructions;
4646

4747
}

‎Assets/UXF/Examples/Advanced/Scripts/StartBlockController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ IEnumerator RunSequence()
4040
// Take the delay time (seconds) for the next trial, wait for that time
4141
// If we move from the start block too early, StopCoroutine(runningSequence); will halt the execution of this coroutine
4242
// System.Convert: Safely convert to single (float)
43-
float delayTime = System.Convert.ToSingle(session.NextTrial.settings["delay_time"]);
43+
float delayTime = session.NextTrial.settings.GetFloat("delay_time");
4444
yield return new WaitForSeconds(delayTime);
4545

4646
Go();

‎Assets/UXF/Examples/Advanced/Scripts/TargetManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public class TargetManager : MonoBehaviour {
1414

1515
public void SetupTargets(Trial trial) // can be called from OnTrialBegin in the Session inspector
1616
{
17-
TargetPosition correctTargetPosition = (TargetPosition) trial.settings["correct_target_position"];
17+
TargetPosition correctTargetPosition = (TargetPosition) trial.settings.GetObject("correct_target_position");
1818

1919
leftTarget.Setup(correctTargetPosition == TargetPosition.Left);
2020
rightTarget.Setup(correctTargetPosition == TargetPosition.Right);
2121

22-
bool inverted = (bool)trial.settings["inverted"];
22+
bool inverted = trial.settings.GetBool("inverted");
2323

2424
if (inverted)
2525
{

‎Assets/UXF/Examples/Basic/BasicExample.unity‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -261,32 +261,32 @@ Prefab:
261261
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
262262
type: 2}
263263
propertyPath: m_AnchorMax.x
264-
value: 1
264+
value: 0
265265
objectReference: {fileID: 0}
266266
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
267267
type: 2}
268268
propertyPath: m_AnchorMax.y
269-
value: 1
269+
value: 0
270270
objectReference: {fileID: 0}
271271
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
272272
type: 2}
273273
propertyPath: m_AnchorMin.y
274-
value: 1
274+
value: 0
275275
objectReference: {fileID: 0}
276276
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
277277
type: 2}
278278
propertyPath: m_AnchorMax.y
279-
value: 1
279+
value: 0
280280
objectReference: {fileID: 0}
281281
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
282282
type: 2}
283283
propertyPath: m_AnchoredPosition.x
284-
value: 164
284+
value: 0
285285
objectReference: {fileID: 0}
286286
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
287287
type: 2}
288288
propertyPath: m_SizeDelta.x
289-
value: 318
289+
value: 0
290290
objectReference: {fileID: 0}
291291
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
292292
type: 2}
@@ -431,27 +431,27 @@ Prefab:
431431
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
432432
type: 2}
433433
propertyPath: m_AnchorMax.x
434-
value: 1
434+
value: 0
435435
objectReference: {fileID: 0}
436436
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
437437
type: 2}
438438
propertyPath: m_AnchorMax.y
439-
value: 1
439+
value: 0
440440
objectReference: {fileID: 0}
441441
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
442442
type: 2}
443443
propertyPath: m_AnchorMin.y
444-
value: 1
444+
value: 0
445445
objectReference: {fileID: 0}
446446
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
447447
type: 2}
448448
propertyPath: m_AnchorMax.y
449-
value: 1
449+
value: 0
450450
objectReference: {fileID: 0}
451451
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
452452
type: 2}
453453
propertyPath: m_AnchoredPosition.x
454-
value: 12
454+
value: 0
455455
objectReference: {fileID: 0}
456456
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
457457
type: 2}
@@ -461,17 +461,17 @@ Prefab:
461461
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
462462
type: 2}
463463
propertyPath: m_AnchorMin.y
464-
value: 1
464+
value: 0
465465
objectReference: {fileID: 0}
466466
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
467467
type: 2}
468468
propertyPath: m_AnchorMax.y
469-
value: 1
469+
value: 0
470470
objectReference: {fileID: 0}
471471
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
472472
type: 2}
473473
propertyPath: m_AnchoredPosition.x
474-
value: 33
474+
value: 0
475475
objectReference: {fileID: 0}
476476
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
477477
type: 2}
@@ -481,17 +481,17 @@ Prefab:
481481
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
482482
type: 2}
483483
propertyPath: m_AnchorMin.y
484-
value: 1
484+
value: 0
485485
objectReference: {fileID: 0}
486486
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
487487
type: 2}
488488
propertyPath: m_AnchorMax.y
489-
value: 1
489+
value: 0
490490
objectReference: {fileID: 0}
491491
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
492492
type: 2}
493493
propertyPath: m_AnchoredPosition.x
494-
value: 12
494+
value: 0
495495
objectReference: {fileID: 0}
496496
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
497497
type: 2}
@@ -501,17 +501,17 @@ Prefab:
501501
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
502502
type: 2}
503503
propertyPath: m_AnchorMin.y
504-
value: 1
504+
value: 0
505505
objectReference: {fileID: 0}
506506
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
507507
type: 2}
508508
propertyPath: m_AnchorMax.y
509-
value: 1
509+
value: 0
510510
objectReference: {fileID: 0}
511511
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
512512
type: 2}
513513
propertyPath: m_AnchoredPosition.x
514-
value: 29
514+
value: 0
515515
objectReference: {fileID: 0}
516516
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
517517
type: 2}
@@ -521,17 +521,17 @@ Prefab:
521521
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
522522
type: 2}
523523
propertyPath: m_AnchorMin.y
524-
value: 1
524+
value: 0
525525
objectReference: {fileID: 0}
526526
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
527527
type: 2}
528528
propertyPath: m_AnchorMax.y
529-
value: 1
529+
value: 0
530530
objectReference: {fileID: 0}
531531
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
532532
type: 2}
533533
propertyPath: m_AnchoredPosition.x
534-
value: 160.75
534+
value: 0
535535
objectReference: {fileID: 0}
536536
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
537537
type: 2}
@@ -541,17 +541,17 @@ Prefab:
541541
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
542542
type: 2}
543543
propertyPath: m_AnchorMin.y
544-
value: 1
544+
value: 0
545545
objectReference: {fileID: 0}
546546
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
547547
type: 2}
548548
propertyPath: m_AnchorMax.y
549-
value: 1
549+
value: 0
550550
objectReference: {fileID: 0}
551551
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
552552
type: 2}
553553
propertyPath: m_AnchoredPosition.x
554-
value: 408.75
554+
value: 0
555555
objectReference: {fileID: 0}
556556
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
557557
type: 2}
@@ -561,17 +561,17 @@ Prefab:
561561
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
562562
type: 2}
563563
propertyPath: m_AnchorMin.y
564-
value: 1
564+
value: 0
565565
objectReference: {fileID: 0}
566566
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
567567
type: 2}
568568
propertyPath: m_AnchorMax.y
569-
value: 1
569+
value: 0
570570
objectReference: {fileID: 0}
571571
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
572572
type: 2}
573573
propertyPath: m_AnchoredPosition.x
574-
value: 625.75
574+
value: 0
575575
objectReference: {fileID: 0}
576576
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
577577
type: 2}
@@ -581,17 +581,17 @@ Prefab:
581581
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
582582
type: 2}
583583
propertyPath: m_AnchorMin.y
584-
value: 1
584+
value: 0
585585
objectReference: {fileID: 0}
586586
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
587587
type: 2}
588588
propertyPath: m_AnchorMax.y
589-
value: 1
589+
value: 0
590590
objectReference: {fileID: 0}
591591
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
592592
type: 2}
593593
propertyPath: m_AnchoredPosition.x
594-
value: 856.75
594+
value: 0
595595
objectReference: {fileID: 0}
596596
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
597597
type: 2}
@@ -606,17 +606,17 @@ Prefab:
606606
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
607607
type: 2}
608608
propertyPath: m_AnchorMin.y
609-
value: 1
609+
value: 0
610610
objectReference: {fileID: 0}
611611
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
612612
type: 2}
613613
propertyPath: m_AnchorMax.y
614-
value: 1
614+
value: 0
615615
objectReference: {fileID: 0}
616616
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
617617
type: 2}
618618
propertyPath: m_AnchoredPosition.x
619-
value: 40.5
619+
value: 0
620620
objectReference: {fileID: 0}
621621
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
622622
type: 2}
@@ -626,7 +626,7 @@ Prefab:
626626
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
627627
type: 2}
628628
propertyPath: m_SizeDelta.x
629-
value: 81
629+
value: 0
630630
objectReference: {fileID: 0}
631631
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
632632
type: 2}
@@ -636,17 +636,17 @@ Prefab:
636636
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
637637
type: 2}
638638
propertyPath: m_AnchorMin.y
639-
value: 1
639+
value: 0
640640
objectReference: {fileID: 0}
641641
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
642642
type: 2}
643643
propertyPath: m_AnchorMax.y
644-
value: 1
644+
value: 0
645645
objectReference: {fileID: 0}
646646
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
647647
type: 2}
648648
propertyPath: m_AnchoredPosition.x
649-
value: 755
649+
value: 0
650650
objectReference: {fileID: 0}
651651
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
652652
type: 2}
@@ -656,7 +656,7 @@ Prefab:
656656
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
657657
type: 2}
658658
propertyPath: m_SizeDelta.x
659-
value: 1344
659+
value: 0
660660
objectReference: {fileID: 0}
661661
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
662662
type: 2}
@@ -666,17 +666,17 @@ Prefab:
666666
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
667667
type: 2}
668668
propertyPath: m_AnchorMin.y
669-
value: 1
669+
value: 0
670670
objectReference: {fileID: 0}
671671
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
672672
type: 2}
673673
propertyPath: m_AnchorMax.y
674-
value: 1
674+
value: 0
675675
objectReference: {fileID: 0}
676676
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
677677
type: 2}
678678
propertyPath: m_AnchoredPosition.x
679-
value: 1465.5
679+
value: 0
680680
objectReference: {fileID: 0}
681681
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
682682
type: 2}
@@ -686,7 +686,7 @@ Prefab:
686686
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
687687
type: 2}
688688
propertyPath: m_SizeDelta.x
689-
value: 73
689+
value: 0
690690
objectReference: {fileID: 0}
691691
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
692692
type: 2}

0 commit comments

Comments
 (0)