Skip to content

Commit c9ebffb

Browse files
jackbrookesjackbrookes
committed
minor fixes
1 parent a4c4973 commit c9ebffb

File tree

7 files changed

+93
-49
lines changed

7 files changed

+93
-49
lines changed

‎Assets/DevelopmentScene.unity‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -298,182 +298,182 @@ Prefab:
298298
propertyPath: m_RootOrder
299299
value: 2
300300
objectReference: {fileID: 0}
301-
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
301+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
302302
type: 2}
303303
propertyPath: m_AnchorMax.x
304304
value: 0
305305
objectReference: {fileID: 0}
306-
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
306+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
307307
type: 2}
308308
propertyPath: m_AnchorMax.y
309309
value: 0
310310
objectReference: {fileID: 0}
311-
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
311+
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
312312
type: 2}
313313
propertyPath: m_AnchorMax.x
314314
value: 0
315315
objectReference: {fileID: 0}
316-
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
316+
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
317317
type: 2}
318318
propertyPath: m_AnchorMax.y
319319
value: 0
320320
objectReference: {fileID: 0}
321-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
321+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
322322
type: 2}
323323
propertyPath: m_AnchorMin.y
324324
value: 0
325325
objectReference: {fileID: 0}
326-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
326+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
327327
type: 2}
328328
propertyPath: m_AnchorMax.y
329329
value: 0
330330
objectReference: {fileID: 0}
331-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
331+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
332332
type: 2}
333333
propertyPath: m_AnchoredPosition.x
334334
value: 0
335335
objectReference: {fileID: 0}
336-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
336+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
337337
type: 2}
338338
propertyPath: m_AnchoredPosition.y
339339
value: 0
340340
objectReference: {fileID: 0}
341-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
341+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
342342
type: 2}
343343
propertyPath: m_AnchorMin.y
344344
value: 0
345345
objectReference: {fileID: 0}
346-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
346+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
347347
type: 2}
348348
propertyPath: m_AnchorMax.y
349349
value: 0
350350
objectReference: {fileID: 0}
351-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
351+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
352352
type: 2}
353353
propertyPath: m_AnchoredPosition.x
354354
value: 0
355355
objectReference: {fileID: 0}
356-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
356+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
357357
type: 2}
358358
propertyPath: m_AnchoredPosition.y
359359
value: 0
360360
objectReference: {fileID: 0}
361-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
361+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
362362
type: 2}
363363
propertyPath: m_AnchorMin.y
364364
value: 0
365365
objectReference: {fileID: 0}
366-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
366+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
367367
type: 2}
368368
propertyPath: m_AnchorMax.y
369369
value: 0
370370
objectReference: {fileID: 0}
371-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
371+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
372372
type: 2}
373373
propertyPath: m_AnchoredPosition.x
374374
value: 0
375375
objectReference: {fileID: 0}
376-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
376+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
377377
type: 2}
378378
propertyPath: m_AnchoredPosition.y
379379
value: 0
380380
objectReference: {fileID: 0}
381-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
381+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
382382
type: 2}
383383
propertyPath: m_AnchorMin.y
384384
value: 0
385385
objectReference: {fileID: 0}
386-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
386+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
387387
type: 2}
388388
propertyPath: m_AnchorMax.y
389389
value: 0
390390
objectReference: {fileID: 0}
391-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
391+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
392392
type: 2}
393393
propertyPath: m_AnchoredPosition.x
394394
value: 0
395395
objectReference: {fileID: 0}
396-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
396+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
397397
type: 2}
398398
propertyPath: m_AnchoredPosition.y
399399
value: 0
400400
objectReference: {fileID: 0}
401-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
401+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
402402
type: 2}
403403
propertyPath: m_AnchorMin.y
404404
value: 0
405405
objectReference: {fileID: 0}
406-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
406+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
407407
type: 2}
408408
propertyPath: m_AnchorMax.y
409409
value: 0
410410
objectReference: {fileID: 0}
411-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
411+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
412412
type: 2}
413413
propertyPath: m_AnchoredPosition.x
414414
value: 0
415415
objectReference: {fileID: 0}
416-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
416+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
417417
type: 2}
418418
propertyPath: m_AnchoredPosition.y
419419
value: 0
420420
objectReference: {fileID: 0}
421-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
421+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
422422
type: 2}
423423
propertyPath: m_AnchorMin.y
424424
value: 0
425425
objectReference: {fileID: 0}
426-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
426+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
427427
type: 2}
428428
propertyPath: m_AnchorMax.y
429429
value: 0
430430
objectReference: {fileID: 0}
431-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
431+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
432432
type: 2}
433433
propertyPath: m_AnchoredPosition.x
434434
value: 0
435435
objectReference: {fileID: 0}
436-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
436+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
437437
type: 2}
438438
propertyPath: m_AnchoredPosition.y
439439
value: 0
440440
objectReference: {fileID: 0}
441-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
441+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
442442
type: 2}
443443
propertyPath: m_AnchorMin.y
444444
value: 0
445445
objectReference: {fileID: 0}
446-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
446+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
447447
type: 2}
448448
propertyPath: m_AnchorMax.y
449449
value: 0
450450
objectReference: {fileID: 0}
451-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
451+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
452452
type: 2}
453453
propertyPath: m_AnchoredPosition.x
454454
value: 0
455455
objectReference: {fileID: 0}
456-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
456+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
457457
type: 2}
458458
propertyPath: m_AnchoredPosition.y
459459
value: 0
460460
objectReference: {fileID: 0}
461-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
461+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
462462
type: 2}
463463
propertyPath: m_AnchorMin.y
464464
value: 0
465465
objectReference: {fileID: 0}
466-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
466+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
467467
type: 2}
468468
propertyPath: m_AnchorMax.y
469469
value: 0
470470
objectReference: {fileID: 0}
471-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
471+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
472472
type: 2}
473473
propertyPath: m_AnchoredPosition.x
474474
value: 0
475475
objectReference: {fileID: 0}
476-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
476+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
477477
type: 2}
478478
propertyPath: m_AnchoredPosition.y
479479
value: 0
@@ -568,6 +568,11 @@ Prefab:
568568
propertyPath: m_SizeDelta.y
569569
value: 0
570570
objectReference: {fileID: 0}
571+
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
572+
type: 2}
573+
propertyPath: m_SizeDelta.y
574+
value: 0
575+
objectReference: {fileID: 0}
571576
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
572577
type: 2}
573578
propertyPath: m_AnchorMin.y
@@ -593,11 +598,6 @@ Prefab:
593598
propertyPath: m_SizeDelta.y
594599
value: 0
595600
objectReference: {fileID: 0}
596-
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
597-
type: 2}
598-
propertyPath: m_SizeDelta.y
599-
value: 0
600-
objectReference: {fileID: 0}
601601
m_RemovedComponents: []
602602
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
603603
m_IsPrefabParent: 0

‎Assets/StreamingAssets/my_experiment.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎Assets/StreamingAssets/my_experiment.json.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Prefab:
296296
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
297297
type: 2}
298298
propertyPath: m_AnchoredPosition.y
299-
value: -0.000014781952
299+
value: 0.00002867449
300300
objectReference: {fileID: 0}
301301
- target: {fileID: 114345737082279174, guid: 0a3b6392f04558844bd340e68ced1ff9,
302302
type: 2}
@@ -693,6 +693,16 @@ Prefab:
693693
propertyPath: m_SizeDelta.y
694694
value: 0
695695
objectReference: {fileID: 0}
696+
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
697+
type: 2}
698+
propertyPath: m_AnchoredPosition.y
699+
value: -0.000011436641
700+
objectReference: {fileID: 0}
701+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
702+
type: 2}
703+
propertyPath: m_AnchorMin.y
704+
value: 0
705+
objectReference: {fileID: 0}
696706
m_RemovedComponents: []
697707
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
698708
m_IsPrefabParent: 0
@@ -1049,8 +1059,8 @@ MonoBehaviour:
10491059
the next one should begin.\n\nUpdate - this is the default Unity MonoBehaviour
10501060
function that runs each frame. Here we just check if it is time for us to end
10511061
the trial and start the next one. \n\nNotice, in the inspector of our Session
1052-
component (attached to the ExperimentWithUI GameObject), several Events have been
1053-
created which call functions from our BasicExampleScript component."
1062+
component (attached to the [UXF_Rig] GameObject), several Events have been created
1063+
which call functions from our BasicExampleScript component."
10541064
--- !u!222 &1335906556
10551065
CanvasRenderer:
10561066
m_ObjectHideFlags: 0

‎Assets/UXF/Prefabs/[UXF_Rig].prefab‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6440,8 +6440,9 @@ MonoBehaviour:
64406440
m_EditorClassIdentifier:
64416441
endOnQuit: 1
64426442
endOnDestroy: 1
6443-
settingsToLog: []
6443+
endAfterLastTrial: 0
64446444
customHeaders: []
6445+
settingsToLog: []
64456446
trackedObjects: []
64466447
onSessionBegin:
64476448
m_PersistentCalls:

‎Assets/UXF/Scripts/Session.cs‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class Session : MonoBehaviour
3333
/// Enable to automatically end the session when the final trial has ended.
3434
/// </summary>
3535
[Tooltip("Enable to automatically end the session when the final trial has ended.")]
36-
public bool endAfterLastTrial = true;
36+
public bool endAfterLastTrial = false;
3737

3838
/// <summary>
3939
/// List of blocks for this experiment
@@ -336,6 +336,8 @@ void Awake()
336336
{
337337
// get components attached to this gameobject and store their references
338338
AttachReferences(GetComponent<FileIOManager>());
339+
340+
if (endAfterLastTrial) onTrialEnd.AddListener(EndIfLastTrial);
339341
}
340342

341343
/// <summary>
@@ -569,8 +571,29 @@ public void EndCurrentTrial()
569571
/// </summary>
570572
public void BeginNextTrial()
571573
{
572-
if (hasInitialised)
573-
NextTrial.Begin();
574+
NextTrial.Begin();
575+
}
576+
577+
/// <summary>
578+
/// Begins next trial (if one exists). Useful to call from an inspector event
579+
/// </summary>
580+
public void BeginNextTrialSafe()
581+
{
582+
if (CurrentTrial != LastTrial)
583+
{
584+
BeginNextTrial();
585+
}
586+
}
587+
588+
/// <summary>
589+
/// Ends the session if the supplied trial is the last trial.
590+
/// </summary>
591+
public void EndIfLastTrial(Trial trial)
592+
{
593+
if (trial == LastTrial)
594+
{
595+
End();
596+
}
574597
}
575598

576599
/// <summary>

‎Assets/UXF/Scripts/UI/InfoBarController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class InfoBarController : MonoBehaviour
1717
/// <summary>
1818
/// Awake is called when the script instance is being loaded.
1919
/// </summary>
20-
void Start()
20+
void Awake()
2121
{
2222
session.onSessionBegin.AddListener(SessionBegin);
2323
session.onTrialBegin.AddListener(TrialBegin);

0 commit comments

Comments
 (0)