Skip to content

Commit 0135c3a

Browse files
jackbrookesjackbrookes
committed
Tidied up
1 parent 45bd03a commit 0135c3a

File tree

6 files changed

+84
-67
lines changed

6 files changed

+84
-67
lines changed

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

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Transform:
140140
m_LocalScale: {x: 1, y: 1, z: 1}
141141
m_Children: []
142142
m_Father: {fileID: 0}
143-
m_RootOrder: 5
143+
m_RootOrder: 4
144144
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
145145
--- !u!114 &42531503
146146
MonoBehaviour:
@@ -190,7 +190,7 @@ Prefab:
190190
objectReference: {fileID: 0}
191191
- target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
192192
propertyPath: m_RootOrder
193-
value: 3
193+
value: 6
194194
objectReference: {fileID: 0}
195195
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
196196
type: 2}
@@ -207,16 +207,60 @@ Prefab:
207207
propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Target
208208
value:
209209
objectReference: {fileID: 42531503}
210+
- target: {fileID: 1970900254558334, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
211+
propertyPath: m_Name
212+
value: '[UXF_Rig]'
213+
objectReference: {fileID: 0}
210214
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
211215
type: 2}
212216
propertyPath: m_AnchorMax.x
213-
value: 1
217+
value: 0
214218
objectReference: {fileID: 0}
215219
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
216220
type: 2}
217221
propertyPath: m_AnchorMax.y
222+
value: 0
223+
objectReference: {fileID: 0}
224+
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
225+
type: 2}
226+
propertyPath: m_AnchorMin.y
218227
value: 1
219228
objectReference: {fileID: 0}
229+
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
230+
type: 2}
231+
propertyPath: m_AnchorMax.y
232+
value: 1
233+
objectReference: {fileID: 0}
234+
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
235+
type: 2}
236+
propertyPath: m_AnchoredPosition.x
237+
value: 164
238+
objectReference: {fileID: 0}
239+
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
240+
type: 2}
241+
propertyPath: m_SizeDelta.x
242+
value: 318
243+
objectReference: {fileID: 0}
244+
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
245+
type: 2}
246+
propertyPath: m_SizeDelta.y
247+
value: 75
248+
objectReference: {fileID: 0}
249+
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
250+
type: 2}
251+
propertyPath: m_AnchoredPosition.y
252+
value: -0.000014781952
253+
objectReference: {fileID: 0}
254+
- target: {fileID: 114345737082279174, guid: 0a3b6392f04558844bd340e68ced1ff9,
255+
type: 2}
256+
propertyPath: m_Value
257+
value: 1
258+
objectReference: {fileID: 0}
259+
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
260+
type: 2}
261+
propertyPath: m_AnchorMin.y
262+
value: 0
263+
objectReference: {fileID: 0}
220264
m_RemovedComponents: []
221265
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
222266
m_IsPrefabParent: 0
@@ -297,7 +341,7 @@ GameObject:
297341
- component: {fileID: 984028291}
298342
- component: {fileID: 984028290}
299343
m_Layer: 5
300-
m_Name: Canvas
344+
m_Name: Information
301345
m_TagString: Untagged
302346
m_Icon: {fileID: 0}
303347
m_NavMeshLayer: 0
@@ -372,7 +416,7 @@ RectTransform:
372416
m_Children:
373417
- {fileID: 1740691193}
374418
m_Father: {fileID: 0}
375-
m_RootOrder: 6
419+
m_RootOrder: 5
376420
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
377421
m_AnchorMin: {x: 0, y: 0}
378422
m_AnchorMax: {x: 0, y: 0}
@@ -489,7 +533,7 @@ Transform:
489533
m_LocalScale: {x: 1, y: 1, z: 1}
490534
m_Children: []
491535
m_Father: {fileID: 0}
492-
m_RootOrder: 4
536+
m_RootOrder: 3
493537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
494538
--- !u!1 &1335906553
495539
GameObject:

Assets/UXF/Prefabs/ExperimentWithUI.prefab renamed to Assets/UXF/Prefabs/[UXF_Rig].prefab

Lines changed: 22 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ GameObject:
438438
- component: {fileID: 114375821934039048}
439439
- component: {fileID: 114129450733786412}
440440
m_Layer: 5
441-
m_Name: Startup User Interface
441+
m_Name: '[UXF_UI]'
442442
m_TagString: Untagged
443443
m_Icon: {fileID: 0}
444444
m_NavMeshLayer: 0
@@ -1357,8 +1357,9 @@ GameObject:
13571357
- component: {fileID: 114324480150258046}
13581358
- component: {fileID: 114155219626309100}
13591359
- component: {fileID: 114908171941659672}
1360+
- component: {fileID: 114291432593817218}
13601361
m_Layer: 0
1361-
m_Name: ExperimentWithUI
1362+
m_Name: '[UXF_Rig]'
13621363
m_TagString: Untagged
13631364
m_Icon: {fileID: 0}
13641365
m_NavMeshLayer: 0
@@ -1891,8 +1892,6 @@ MonoBehaviour:
18911892
m_Script: {fileID: 11500000, guid: 325d8bc56dfbdf4439627ee58ed3a5a4, type: 3}
18921893
m_Name:
18931894
m_EditorClassIdentifier:
1894-
session: {fileID: 114916036141644208}
1895-
fileIOManager: {fileID: 114324480150258046}
18961895
--- !u!114 &114164683737562590
18971896
MonoBehaviour:
18981897
m_ObjectHideFlags: 1
@@ -2464,6 +2463,19 @@ MonoBehaviour:
24642463
m_Calls: []
24652464
m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0,
24662465
Culture=neutral, PublicKeyToken=null
2466+
--- !u!114 &114291432593817218
2467+
MonoBehaviour:
2468+
m_ObjectHideFlags: 1
2469+
m_PrefabParentObject: {fileID: 0}
2470+
m_PrefabInternal: {fileID: 100100000}
2471+
m_GameObject: {fileID: 1970900254558334}
2472+
m_Enabled: 1
2473+
m_EditorHideFlags: 0
2474+
m_Script: {fileID: 11500000, guid: 4c3ebbdce86e7024d8e94ef506b33b5b, type: 3}
2475+
m_Name:
2476+
m_EditorClassIdentifier:
2477+
eventSystemPrefab: {fileID: 1601148747235938, guid: e558e6a724cb5824ca99dd67064d4563,
2478+
type: 2}
24672479
--- !u!114 &114294998942013986
24682480
MonoBehaviour:
24692481
m_ObjectHideFlags: 1
@@ -2773,14 +2785,10 @@ MonoBehaviour:
27732785
m_Script: {fileID: 11500000, guid: 67303b59714ae6141976cebbe8c7d961, type: 3}
27742786
m_Name:
27752787
m_EditorClassIdentifier:
2776-
quickStartMode: 1
2788+
quickStartMode: 0
27772789
saveDataLocation: example_output
27782790
experimentSettingsName: basic_example_1.json
2779-
_participantDataPoints:
2780-
- displayName: Age
2781-
internalName: age
2782-
dataType: 2
2783-
dropDownValues: []
2791+
_participantDataPoints: []
27842792
maxNumSessions: 10
27852793
settingsSearchPattern: '*.json'
27862794
newParticipantName: <i><color=grey>+ New participant</color></i>
@@ -4560,51 +4568,16 @@ MonoBehaviour:
45604568
m_EditorClassIdentifier:
45614569
endOnDestroy: 1
45624570
settingsToLog: []
4563-
customHeaders:
4564-
- some_variable
4565-
trackedObjects:
4566-
- {fileID: 0}
4571+
customHeaders: []
4572+
trackedObjects: []
45674573
onSessionBegin:
45684574
m_PersistentCalls:
4569-
m_Calls:
4570-
- m_Target: {fileID: 0}
4571-
m_MethodName: GenerateExperiment
4572-
m_Mode: 0
4573-
m_Arguments:
4574-
m_ObjectArgument: {fileID: 0}
4575-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
4576-
m_IntArgument: 0
4577-
m_FloatArgument: 0
4578-
m_StringArgument:
4579-
m_BoolArgument: 0
4580-
m_CallState: 2
4581-
- m_Target: {fileID: 114916036141644208}
4582-
m_MethodName: BeginNextTrial
4583-
m_Mode: 1
4584-
m_Arguments:
4585-
m_ObjectArgument: {fileID: 0}
4586-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
4587-
m_IntArgument: 0
4588-
m_FloatArgument: 0
4589-
m_StringArgument:
4590-
m_BoolArgument: 0
4591-
m_CallState: 2
4575+
m_Calls: []
45924576
m_TypeName: UXF.SessionEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
45934577
PublicKeyToken=null
45944578
onTrialBegin:
45954579
m_PersistentCalls:
4596-
m_Calls:
4597-
- m_Target: {fileID: 0}
4598-
m_MethodName: PresentStimulus
4599-
m_Mode: 0
4600-
m_Arguments:
4601-
m_ObjectArgument: {fileID: 0}
4602-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
4603-
m_IntArgument: 0
4604-
m_FloatArgument: 0
4605-
m_StringArgument:
4606-
m_BoolArgument: 0
4607-
m_CallState: 2
4580+
m_Calls: []
46084581
m_TypeName: UXF.TrialEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
46094582
PublicKeyToken=null
46104583
onTrialEnd:
@@ -4618,8 +4591,6 @@ MonoBehaviour:
46184591
number: 0
46194592
currentTrialNum: 0
46204593
currentBlockNum: 0
4621-
fileIOManager: {fileID: 114324480150258046}
4622-
logger: {fileID: 114155219626309100}
46234594
--- !u!114 &114922365913132848
46244595
MonoBehaviour:
46254596
m_ObjectHideFlags: 1

Assets/UXF/Prefabs/ExperimentWithUI.prefab.meta renamed to Assets/UXF/Prefabs/[UXF_Rig].prefab.meta

File renamed without changes.

‎Assets/UXF/Scripts/EventSystemFallback.cs.meta‎

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

‎example_output/unit_test/test_trials/S001/log.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
timestamp,log_type,message
2-
0.8184061,Log,Managing action: UXF.Session+<WriteDictToSessionFolder>c__AnonStorey2.<>m__0
3-
0.9732285,Log,Managing action: UXF.Session+<SaveResults>c__AnonStorey3.<>m__0
4-
0.9732285,Log,Managing action: UXF.SessionLogger+<Finalise>c__AnonStorey0.<>m__0
2+
19.82911,Log,Managing action: UXF.Session+<WriteDictToSessionFolder>c__AnonStorey2.<>m__0
3+
19.9862,Log,Managing action: UXF.Session+<SaveResults>c__AnonStorey3.<>m__0
4+
19.9862,Log,Managing action: UXF.SessionLogger+<Finalise>c__AnonStorey0.<>m__0

‎example_output/unit_test/test_trials/S001/trial_results.csv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
experiment,ppid,session_num,trial_num,block_num,trial_num_in_block,start_time,end_time,observation
2-
unit_test,test_trials,1,1,1,1,0.9732285,0.9732285,1
3-
unit_test,test_trials,1,2,1,2,0.9732285,0.9732285,2
4-
unit_test,test_trials,1,3,2,1,0.9732285,0.9732285,3
5-
unit_test,test_trials,1,4,2,2,0.9732285,0.9732285,4
6-
unit_test,test_trials,1,5,2,3,0.9732285,0.9732285,5
2+
unit_test,test_trials,1,1,1,1,19.9862,19.9862,1
3+
unit_test,test_trials,1,2,1,2,19.9862,19.9862,2
4+
unit_test,test_trials,1,3,2,1,19.9862,19.9862,3
5+
unit_test,test_trials,1,4,2,2,19.9862,19.9862,4
6+
unit_test,test_trials,1,5,2,3,19.9862,19.9862,5

0 commit comments

Comments
 (0)