Skip to content

Commit 14f2875

Browse files
committed
examples cleanup
1 parent cc3edc9 commit 14f2875

25 files changed

+467
-681
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Assets/UXF/Examples/1a_SpaceShuttle/BasicExample.unity renamed to Assets/UXF/Examples/1a_SpaceShuttle/SpaceShuttleExample.unity

Lines changed: 30 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ PrefabInstance:
734734
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
735735
type: 3}
736736
propertyPath: settingsSearchPattern
737-
value: basic*.json
737+
value: spaceshuttle*.json
738738
objectReference: {fileID: 0}
739739
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
740740
type: 3}
@@ -784,7 +784,7 @@ PrefabInstance:
784784
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
785785
type: 3}
786786
propertyPath: settingsMode
787-
value: 2
787+
value: 0
788788
objectReference: {fileID: 0}
789789
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
790790
type: 3}
@@ -796,6 +796,11 @@ PrefabInstance:
796796
propertyPath: ppidMode
797797
value: 1
798798
objectReference: {fileID: 0}
799+
- target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
800+
type: 3}
801+
propertyPath: termsAndConditions
802+
value: Please tick if you understand the instructions.<color=red>*</color>
803+
objectReference: {fileID: 0}
799804
- target: {fileID: 759169902625461607, guid: 0a3b6392f04558844bd340e68ced1ff9,
800805
type: 3}
801806
propertyPath: m_AnchorMin.y
@@ -1464,7 +1469,7 @@ PrefabInstance:
14641469
- target: {fileID: 2896031059644693069, guid: 0a3b6392f04558844bd340e68ced1ff9,
14651470
type: 3}
14661471
propertyPath: m_IsActive
1467-
value: 0
1472+
value: 1
14681473
objectReference: {fileID: 0}
14691474
- target: {fileID: 2897568975779925056, guid: 0a3b6392f04558844bd340e68ced1ff9,
14701475
type: 3}
@@ -1634,32 +1639,32 @@ PrefabInstance:
16341639
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16351640
type: 3}
16361641
propertyPath: m_AnchorMin.y
1637-
value: 1
1642+
value: 0
16381643
objectReference: {fileID: 0}
16391644
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16401645
type: 3}
16411646
propertyPath: m_AnchorMax.y
1642-
value: 1
1647+
value: 0
16431648
objectReference: {fileID: 0}
16441649
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16451650
type: 3}
16461651
propertyPath: m_AnchoredPosition.x
1647-
value: 128
1652+
value: 0
16481653
objectReference: {fileID: 0}
16491654
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16501655
type: 3}
16511656
propertyPath: m_AnchoredPosition.y
1652-
value: -10
1657+
value: 0
16531658
objectReference: {fileID: 0}
16541659
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16551660
type: 3}
16561661
propertyPath: m_SizeDelta.x
1657-
value: 236
1662+
value: 0
16581663
objectReference: {fileID: 0}
16591664
- target: {fileID: 3110759810348992417, guid: 0a3b6392f04558844bd340e68ced1ff9,
16601665
type: 3}
16611666
propertyPath: m_SizeDelta.y
1662-
value: 60
1667+
value: 0
16631668
objectReference: {fileID: 0}
16641669
- target: {fileID: 3158675881645616829, guid: 0a3b6392f04558844bd340e68ced1ff9,
16651670
type: 3}
@@ -2874,9 +2879,19 @@ PrefabInstance:
28742879
- target: {fileID: 8563684494448067901, guid: 0a3b6392f04558844bd340e68ced1ff9,
28752880
type: 3}
28762881
propertyPath: m_Text
2877-
value: In this example you just watch a space shuttle launch multiple times,
2878-
with different "thrust" values. We measure the "altitude" of flight on each
2879-
trial.
2882+
value: "In this example you just watch a space shuttle launch multiple times,
2883+
with different \"thrust\" values. We measure the \"altitude\" of flight on
2884+
each trial. This is a non-interactive experiment, just for demonstration purposes.
2885+
\n\nA script Example_BasicExampleScript has been written and attached to the
2886+
MyExampleExperiment GameObject, which controls the experiment.\n\nIt contains
2887+
several methods:\n\nGenerateExperiment - after the Session has been initialised,
2888+
we generate the blocks and trials we want in our experiment with any associated
2889+
settings.\n\nPresentStimulus - when a trial begins, we can setup the scene
2890+
using the settings from our trials (i.e. thrust). We also then use Invoke
2891+
to end the trial after a fixed time.\n\nNotice, in the inspector of our Session
2892+
component (attached to the [UXF_Rig] GameObject), in the Events tab, several
2893+
Events have been created which call functions from ourExample_BasicExampleScript
2894+
component."
28802895
objectReference: {fileID: 0}
28812896
- target: {fileID: 8611383805388721271, guid: 0a3b6392f04558844bd340e68ced1ff9,
28822897
type: 3}
@@ -3534,7 +3549,7 @@ RectTransform:
35343549
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35353550
m_AnchorMin: {x: 0, y: 1}
35363551
m_AnchorMax: {x: 0, y: 1}
3537-
m_AnchoredPosition: {x: 128, y: -90}
3552+
m_AnchoredPosition: {x: 128, y: -170}
35383553
m_SizeDelta: {x: 236, y: 60}
35393554
m_Pivot: {x: 0.5, y: 1}
35403555
--- !u!114 &735256498
@@ -3996,7 +4011,6 @@ RectTransform:
39964011
m_LocalPosition: {x: 0, y: 0, z: 0}
39974012
m_LocalScale: {x: 0, y: 0, z: 0}
39984013
m_Children:
3999-
- {fileID: 1740691193}
40004014
- {fileID: 2027959983}
40014015
m_Father: {fileID: 0}
40024016
m_RootOrder: 4
@@ -4223,94 +4237,6 @@ Transform:
42234237
m_Father: {fileID: 0}
42244238
m_RootOrder: 3
42254239
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4226-
--- !u!1 &1335906553
4227-
GameObject:
4228-
m_ObjectHideFlags: 0
4229-
m_CorrespondingSourceObject: {fileID: 0}
4230-
m_PrefabInstance: {fileID: 0}
4231-
m_PrefabAsset: {fileID: 0}
4232-
serializedVersion: 6
4233-
m_Component:
4234-
- component: {fileID: 1335906554}
4235-
- component: {fileID: 1335906556}
4236-
- component: {fileID: 1335906555}
4237-
m_Layer: 5
4238-
m_Name: Text
4239-
m_TagString: Untagged
4240-
m_Icon: {fileID: 0}
4241-
m_NavMeshLayer: 0
4242-
m_StaticEditorFlags: 0
4243-
m_IsActive: 1
4244-
--- !u!224 &1335906554
4245-
RectTransform:
4246-
m_ObjectHideFlags: 0
4247-
m_CorrespondingSourceObject: {fileID: 0}
4248-
m_PrefabInstance: {fileID: 0}
4249-
m_PrefabAsset: {fileID: 0}
4250-
m_GameObject: {fileID: 1335906553}
4251-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4252-
m_LocalPosition: {x: 0, y: 0, z: 0}
4253-
m_LocalScale: {x: 1, y: 1, z: 1}
4254-
m_Children: []
4255-
m_Father: {fileID: 1740691193}
4256-
m_RootOrder: 0
4257-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4258-
m_AnchorMin: {x: 0, y: 0}
4259-
m_AnchorMax: {x: 1, y: 1}
4260-
m_AnchoredPosition: {x: 0, y: 0}
4261-
m_SizeDelta: {x: -10, y: -10}
4262-
m_Pivot: {x: 0.5, y: 0.5}
4263-
--- !u!114 &1335906555
4264-
MonoBehaviour:
4265-
m_ObjectHideFlags: 0
4266-
m_CorrespondingSourceObject: {fileID: 0}
4267-
m_PrefabInstance: {fileID: 0}
4268-
m_PrefabAsset: {fileID: 0}
4269-
m_GameObject: {fileID: 1335906553}
4270-
m_Enabled: 1
4271-
m_EditorHideFlags: 0
4272-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
4273-
m_Name:
4274-
m_EditorClassIdentifier:
4275-
m_Material: {fileID: 0}
4276-
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
4277-
m_RaycastTarget: 1
4278-
m_OnCullStateChanged:
4279-
m_PersistentCalls:
4280-
m_Calls: []
4281-
m_FontData:
4282-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
4283-
m_FontSize: 14
4284-
m_FontStyle: 0
4285-
m_BestFit: 0
4286-
m_MinSize: 10
4287-
m_MaxSize: 40
4288-
m_Alignment: 3
4289-
m_AlignByGeometry: 0
4290-
m_RichText: 1
4291-
m_HorizontalOverflow: 0
4292-
m_VerticalOverflow: 0
4293-
m_LineSpacing: 1
4294-
m_Text: "In this example, a pace shuttle will fly upwards, depending on an independant
4295-
variable called thrust. We want to measure the altitude of flight. This is a non-interactive
4296-
experiment, just for demonstration purposes. \nA script Example_BasicExampleScript
4297-
has been written and attached to the MyExampleExperiment GameObject, which controls
4298-
the experiment.\n\nIt contains several methods:\n\nGenerateExperiment - after
4299-
the Session has been initialised, we generate the blocks and trials we want in
4300-
our experiment with any associated settings.\n\nPresentStimulus - when a trial
4301-
begins, we can setup the scene using the settings from our trials (i.e. thrust).
4302-
We also then use Invoke to end the trial after a fixed time.\n\nNotice, in the
4303-
inspector of our Session component (attached to the [UXF_Rig] GameObject), in
4304-
the Events tab, several Events have been created which call functions from ourExample_BasicExampleScript
4305-
component."
4306-
--- !u!222 &1335906556
4307-
CanvasRenderer:
4308-
m_ObjectHideFlags: 0
4309-
m_CorrespondingSourceObject: {fileID: 0}
4310-
m_PrefabInstance: {fileID: 0}
4311-
m_PrefabAsset: {fileID: 0}
4312-
m_GameObject: {fileID: 1335906553}
4313-
m_CullTransparentMesh: 0
43144240
--- !u!1 &1364851350
43154241
GameObject:
43164242
m_ObjectHideFlags: 0
@@ -4779,7 +4705,7 @@ RectTransform:
47794705
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
47804706
m_AnchorMin: {x: 0, y: 1}
47814707
m_AnchorMax: {x: 0, y: 1}
4782-
m_AnchoredPosition: {x: 128, y: -170}
4708+
m_AnchoredPosition: {x: 128, y: -250}
47834709
m_SizeDelta: {x: 236, y: 60}
47844710
m_Pivot: {x: 0.5, y: 1}
47854711
--- !u!114 &1729214257
@@ -4842,79 +4768,6 @@ MonoBehaviour:
48424768
m_FlexibleWidth: -1
48434769
m_FlexibleHeight: -1
48444770
m_LayoutPriority: 1
4845-
--- !u!1 &1740691192
4846-
GameObject:
4847-
m_ObjectHideFlags: 0
4848-
m_CorrespondingSourceObject: {fileID: 0}
4849-
m_PrefabInstance: {fileID: 0}
4850-
m_PrefabAsset: {fileID: 0}
4851-
serializedVersion: 6
4852-
m_Component:
4853-
- component: {fileID: 1740691193}
4854-
- component: {fileID: 1740691195}
4855-
- component: {fileID: 1740691194}
4856-
m_Layer: 5
4857-
m_Name: Info
4858-
m_TagString: Untagged
4859-
m_Icon: {fileID: 0}
4860-
m_NavMeshLayer: 0
4861-
m_StaticEditorFlags: 0
4862-
m_IsActive: 1
4863-
--- !u!224 &1740691193
4864-
RectTransform:
4865-
m_ObjectHideFlags: 0
4866-
m_CorrespondingSourceObject: {fileID: 0}
4867-
m_PrefabInstance: {fileID: 0}
4868-
m_PrefabAsset: {fileID: 0}
4869-
m_GameObject: {fileID: 1740691192}
4870-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4871-
m_LocalPosition: {x: 0, y: 0, z: 0}
4872-
m_LocalScale: {x: 1, y: 1, z: 1}
4873-
m_Children:
4874-
- {fileID: 1335906554}
4875-
m_Father: {fileID: 984028293}
4876-
m_RootOrder: 0
4877-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4878-
m_AnchorMin: {x: 0, y: 1}
4879-
m_AnchorMax: {x: 0, y: 1}
4880-
m_AnchoredPosition: {x: 5, y: -5}
4881-
m_SizeDelta: {x: 340, y: 439.2}
4882-
m_Pivot: {x: 0, y: 1}
4883-
--- !u!114 &1740691194
4884-
MonoBehaviour:
4885-
m_ObjectHideFlags: 0
4886-
m_CorrespondingSourceObject: {fileID: 0}
4887-
m_PrefabInstance: {fileID: 0}
4888-
m_PrefabAsset: {fileID: 0}
4889-
m_GameObject: {fileID: 1740691192}
4890-
m_Enabled: 1
4891-
m_EditorHideFlags: 0
4892-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
4893-
m_Name:
4894-
m_EditorClassIdentifier:
4895-
m_Material: {fileID: 0}
4896-
m_Color: {r: 1, g: 1, b: 1, a: 1}
4897-
m_RaycastTarget: 1
4898-
m_OnCullStateChanged:
4899-
m_PersistentCalls:
4900-
m_Calls: []
4901-
m_Sprite: {fileID: 0}
4902-
m_Type: 0
4903-
m_PreserveAspect: 0
4904-
m_FillCenter: 1
4905-
m_FillMethod: 4
4906-
m_FillAmount: 1
4907-
m_FillClockwise: 1
4908-
m_FillOrigin: 0
4909-
m_UseSpriteMesh: 0
4910-
--- !u!222 &1740691195
4911-
CanvasRenderer:
4912-
m_ObjectHideFlags: 0
4913-
m_CorrespondingSourceObject: {fileID: 0}
4914-
m_PrefabInstance: {fileID: 0}
4915-
m_PrefabAsset: {fileID: 0}
4916-
m_GameObject: {fileID: 1740691192}
4917-
m_CullTransparentMesh: 0
49184771
--- !u!1 &1750029552
49194772
GameObject:
49204773
m_ObjectHideFlags: 0
@@ -5314,7 +5167,7 @@ RectTransform:
53145167
m_Children:
53155168
- {fileID: 2093355494}
53165169
m_Father: {fileID: 984028293}
5317-
m_RootOrder: 1
5170+
m_RootOrder: 0
53185171
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
53195172
m_AnchorMin: {x: 0.5, y: 0.5}
53205173
m_AnchorMax: {x: 0.5, y: 0.5}

Assets/UXF/Examples/1a_SpaceShuttle/BasicExample.unity.meta renamed to Assets/UXF/Examples/1a_SpaceShuttle/SpaceShuttleExample.unity.meta

File renamed without changes.

0 commit comments

Comments
 (0)