Skip to content

Commit 7218aba

Browse files
committed
CSV experiment builder feature
1 parent 28c3ada commit 7218aba

32 files changed

+2665
-4
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"trial_specification_name": "spaceshuttle_specification.csv"
3+
}

Assets/StreamingAssets/csv_spaceshuttle.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.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"trial_specification_name": "spaceshuttle_specification_blocked.csv"
3+
}

Assets/StreamingAssets/csv_spaceshuttle_blocked.json.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
size,thrust
2+
1.00,0.50
3+
2.00,1.50
4+
5.00,2.00
5+
1.00,1.00
6+
4.00,0.50

Assets/StreamingAssets/spaceshuttle_specification.csv.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.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
block_num,size,thrust
2+
1,1.00,0.50
3+
1,2.00,1.50
4+
1,5.00,2.00
5+
1,1.00,1.00
6+
1,4.00,0.50
7+
2,1.00,0.50
8+
2,2.00,1.50
9+
2,5.00,2.00
10+
2,1.00,1.00
11+
2,4.00,0.50

Assets/StreamingAssets/spaceshuttle_specification_blocked.csv.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/1a_SpaceShuttle/Example_BasicExampleScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ of an ExperimentSession component as .settings */
4646
// if we dont supply a settings profile (e.g. when running in a web browser, or Oculus Quest) it will revert to valueIfNotFound (10)
4747
int numMainTrials = session.settings.GetInt("n_trials", valueIfNotFound: 10);
4848
// create the block
49-
Block mainBlock = session.CreateBlock(numMainTrials); // block 2
49+
Block mainBlock = session.CreateBlock(numMainTrials);
5050

5151
// here we set a setting for the 2nd trial of the main block as an example.
5252
// all other trials will have whatever value is set in the session settings (basic_example_*.json file)

Assets/UXF/Examples/1b_SpaceShuttle_ManualStart/SpaceShuttleManualStartExample.unity

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ PrefabInstance:
19381938
- target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
19391939
type: 3}
19401940
propertyPath: m_AnchoredPosition.y
1941-
value: 5330
1941+
value: 5460
19421942
objectReference: {fileID: 0}
19431943
- target: {fileID: 2897568975779925122, guid: 0a3b6392f04558844bd340e68ced1ff9,
19441944
type: 3}
@@ -2008,7 +2008,7 @@ PrefabInstance:
20082008
- target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
20092009
type: 3}
20102010
propertyPath: m_AnchoredPosition.y
2011-
value: 9840
2011+
value: 10080
20122012
objectReference: {fileID: 0}
20132013
- target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
20142014
type: 3}
@@ -2150,6 +2150,41 @@ PrefabInstance:
21502150
propertyPath: m_SizeDelta.y
21512151
value: 0
21522152
objectReference: {fileID: 0}
2153+
- target: {fileID: 7839017981507438752, guid: 0a3b6392f04558844bd340e68ced1ff9,
2154+
type: 3}
2155+
propertyPath: m_Text
2156+
value:
2157+
objectReference: {fileID: 0}
2158+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2159+
type: 3}
2160+
propertyPath: m_AnchorMin.y
2161+
value: 0
2162+
objectReference: {fileID: 0}
2163+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2164+
type: 3}
2165+
propertyPath: m_AnchorMax.y
2166+
value: 0
2167+
objectReference: {fileID: 0}
2168+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2169+
type: 3}
2170+
propertyPath: m_AnchoredPosition.x
2171+
value: 0
2172+
objectReference: {fileID: 0}
2173+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2174+
type: 3}
2175+
propertyPath: m_AnchoredPosition.y
2176+
value: 0
2177+
objectReference: {fileID: 0}
2178+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2179+
type: 3}
2180+
propertyPath: m_SizeDelta.x
2181+
value: 0
2182+
objectReference: {fileID: 0}
2183+
- target: {fileID: 7948667913022628418, guid: 0a3b6392f04558844bd340e68ced1ff9,
2184+
type: 3}
2185+
propertyPath: m_SizeDelta.y
2186+
value: 0
2187+
objectReference: {fileID: 0}
21532188
- target: {fileID: 8307715182677704244, guid: 0a3b6392f04558844bd340e68ced1ff9,
21542189
type: 3}
21552190
propertyPath: m_AnchorMax.x

Assets/UXF/Examples/1c_SpaceShuttle_BuildFromCSV.meta

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

0 commit comments

Comments
 (0)