From aafee8ff8699e6cd0d684f07e962aab0c30b913b Mon Sep 17 00:00:00 2001 From: Chris Midkiff Date: Thu, 29 Nov 2018 19:18:09 -0500 Subject: [PATCH] Added done text --- Assets/Prefabs/Canvas.prefab | 82 +++++++++++++++++++- Assets/Scenes/Experiment-Cardboard.unity | 25 ++++++ Assets/Scenes/Experiment-Oculus.unity | 96 ++++++++---------------- Assets/Scripts/ExperimentController.cs | 18 ++++- 4 files changed, 152 insertions(+), 69 deletions(-) diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index 2977ee9..f5b6df6 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -11,6 +11,23 @@ Prefab: m_SourcePrefab: {fileID: 0} m_RootGameObject: {fileID: 1222106366571780} m_IsPrefabAsset: 1 +--- !u!1 &1174000147509922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 224125546604673008} + - component: {fileID: 222840005648762544} + - component: {fileID: 114202282782100084} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1222106366571780 GameObject: m_ObjectHideFlags: 0 @@ -609,6 +626,39 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114202282782100084 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1174000147509922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: DONE --- !u!114 &114220740655690362 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2154,6 +2204,13 @@ CanvasRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1599297577028528} m_CullTransparentMesh: 0 +--- !u!222 &222840005648762544 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1174000147509922} + m_CullTransparentMesh: 0 --- !u!222 &222857092804060624 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2195,6 +2252,24 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!224 &224125546604673008 +RectTransform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1174000147509922} + m_LocalRotation: {x: 5.6290715e-11, y: 1, z: -4.6566123e-10, w: -0.0000000016645936} + m_LocalPosition: {x: 0, y: 0, z: 1300} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224720632774813148} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -50, y: 680} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224209426894857326 RectTransform: m_ObjectHideFlags: 1 @@ -2382,8 +2457,8 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1222106366571780} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 5.7} - m_LocalScale: {x: 0.0057666996, y: 0.0057666996, z: 0.0057666996} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.006794902, y: 0.006794902, z: 0.006794902} m_Children: - {fileID: 224266039085603778} - {fileID: 224346185028377882} @@ -2398,12 +2473,13 @@ RectTransform: - {fileID: 224558075776258700} - {fileID: 224578468027682140} - {fileID: 224999135438588286} + - {fileID: 224125546604673008} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -9.98, y: -18.68} + m_AnchoredPosition: {x: -12.4, y: -21.3} m_SizeDelta: {x: 3731.68, y: 5511.43} m_Pivot: {x: 0, y: 0} --- !u!224 &224762053255112640 diff --git a/Assets/Scenes/Experiment-Cardboard.unity b/Assets/Scenes/Experiment-Cardboard.unity index 1454eea..47a5293 100644 --- a/Assets/Scenes/Experiment-Cardboard.unity +++ b/Assets/Scenes/Experiment-Cardboard.unity @@ -835,6 +835,31 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 224125546604673008, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224125546604673008, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224125546604673008, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224125546604673008, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224125546604673008, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 58377436786480712, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} diff --git a/Assets/Scenes/Experiment-Oculus.unity b/Assets/Scenes/Experiment-Oculus.unity index c7b2ef4..df2f193 100644 --- a/Assets/Scenes/Experiment-Oculus.unity +++ b/Assets/Scenes/Experiment-Oculus.unity @@ -378,11 +378,6 @@ Camera: m_CorrespondingSourceObject: {fileID: 20888543910458868, guid: 3d0ed8ddd4ae30547a37f12335d8a28e, type: 2} m_PrefabInternal: {fileID: 807211327} ---- !u!4 &1759931873 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4127641868092796, guid: 3d0ed8ddd4ae30547a37f12335d8a28e, - type: 2} - m_PrefabInternal: {fileID: 807211327} --- !u!1001 &1797062444 Prefab: m_ObjectHideFlags: 0 @@ -480,36 +475,11 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + - target: {fileID: 223347616292351244, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: m_Camera value: - objectReference: {fileID: 246886986} - - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} - - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} - - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} - - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} - - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} + objectReference: {fileID: 935471317} - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -520,46 +490,46 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 246886986} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 246886986} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 246886986} - - target: {fileID: 223347616292351244, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_Camera - value: - objectReference: {fileID: 935471317} - - target: {fileID: 114072125749358940, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: trackingSpace - value: - objectReference: {fileID: 1759931873} - - target: {fileID: 114072125749358940, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: onPrimarySelect.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 246886986} - - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_LocalScale.x - value: 0.006794902 - objectReference: {fileID: 0} - - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_LocalScale.y - value: 0.006794902 - objectReference: {fileID: 0} - - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, - type: 2} - propertyPath: m_LocalScale.z - value: 0.006794902 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} m_IsPrefabAsset: 0 diff --git a/Assets/Scripts/ExperimentController.cs b/Assets/Scripts/ExperimentController.cs index 391678b..6134d6c 100644 --- a/Assets/Scripts/ExperimentController.cs +++ b/Assets/Scripts/ExperimentController.cs @@ -17,6 +17,7 @@ public class ExperimentController : MonoBehaviour { List dots = new List(); Stopwatch stopwatch = new Stopwatch(); GameObject playerCamera; + GameObject text; DataSet dataSet = new DataSet(); string platform; // Use this for initialization @@ -30,6 +31,7 @@ public class ExperimentController : MonoBehaviour { #if UNITY_STANDALONE_WIN platform = "oculus"; #endif + UnityEngine.Debug.Log(platform); string response = ""; using (WebClient client = new WebClient()) { @@ -47,6 +49,8 @@ public class ExperimentController : MonoBehaviour { dots.Add(go); Hide(go); }; + text = GameObject.Find("Text"); + text.SetActive(false); } @@ -86,9 +90,17 @@ public class ExperimentController : MonoBehaviour { trialDotIndex = 0; dataSet.SaveDataSet(); dataSet.Samples.Clear(); - nextDot = FindDot(participant.trials[trialIndex][trialDotIndex]); - Show(nextDot); - Hide(startDot); + if (trialIndex < participant.trials.Length) + { + nextDot = FindDot(participant.trials[trialIndex][trialDotIndex]); + Show(nextDot); + Hide(startDot); + + } + else + { + text.SetActive(true); + } } else {