From 499f1e4850dc67e8c2471c86e36b0220a59923eb Mon Sep 17 00:00:00 2001 From: Chris Midkiff Date: Tue, 30 Oct 2018 19:07:29 -0400 Subject: [PATCH] fixed cardboard and started data entry --- Assets/Scenes/Experiment-Cardboard.unity | 525 ++++++++++++++++++++++- Assets/Scripts/ExperimentController.cs | 43 ++ ProjectSettings/ProjectSettings.asset | 1 + 3 files changed, 568 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Experiment-Cardboard.unity b/Assets/Scenes/Experiment-Cardboard.unity index c954a81..1454eea 100644 --- a/Assets/Scenes/Experiment-Cardboard.unity +++ b/Assets/Scenes/Experiment-Cardboard.unity @@ -120,6 +120,76 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114825931014251334, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_LocalPosition.x @@ -340,7 +410,433 @@ Prefab: propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1619469917} - m_RemovedComponents: [] + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 223347616292351244, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_Camera + value: + objectReference: {fileID: 260400463} + - target: {fileID: 114711430282168920, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: NextDot + objectReference: {fileID: 0} + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114656590209892184, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114327655318793558, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114327655318793558, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114427657142467702, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114427657142467702, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114682893582648666, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114682893582648666, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114442419339711302, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114442419339711302, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114104847305733648, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114104847305733648, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114703897890460048, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114703897890460048, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114326993718974894, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114326993718974894, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114435037069425800, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114435037069425800, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114651311813405366, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114651311813405366, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114668198501123830, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114668198501123830, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114528895426791830, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114528895426791830, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114220740655690362, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CardboardWrapper + objectReference: {fileID: 0} + - target: {fileID: 114220740655690362, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: OnPointerClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114620956565508940, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114718433689096176, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114935916494048452, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114912380756086876, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114086189665095470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114825931014251334, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114825931014251334, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114825931014251334, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114825931014251334, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114281474708013094, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114062093851758520, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} + - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114531434077155296, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 58377436786480712, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} m_IsPrefabAsset: 0 --- !u!1 &99160178 @@ -456,6 +952,28 @@ Prefab: propertyPath: m_LocalPosition.y value: 1.37 objectReference: {fileID: 0} + - target: {fileID: 114855450908423216, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + propertyPath: overridePointerCamera + value: + objectReference: {fileID: 260400463} + - target: {fileID: 114501065152772058, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + propertyPath: vrModeOnly + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1983655756840764, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_TagString + value: GameController + objectReference: {fileID: 0} + - target: {fileID: 1655486884145648, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_TagString + value: MainCamera + objectReference: {fileID: 0} + - target: {fileID: 1534288903135148, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} m_IsPrefabAsset: 0 @@ -479,6 +997,11 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 maxRaycastHits: 64 +--- !u!20 &260400463 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 20501644528040130, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + m_PrefabInternal: {fileID: 260400458} --- !u!1 &534664144 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ExperimentController.cs b/Assets/Scripts/ExperimentController.cs index 4735217..d789b30 100644 --- a/Assets/Scripts/ExperimentController.cs +++ b/Assets/Scripts/ExperimentController.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Text; using UnityEngine; +using UnityEngine.EventSystems; public class ExperimentController : MonoBehaviour { @@ -11,6 +13,8 @@ public class ExperimentController : MonoBehaviour { int trialDotIndex; Participant participant; List dots = new List(); + Stopwatch stopwatch = new Stopwatch(); + GameObject playerCamera; // Use this for initialization void Start () { //FOR THE LOVE OF GOD FUCKING DELETE THIS, SERIOUSLY CHRIS DON'T YOU DARE FORGET @@ -20,6 +24,7 @@ public class ExperimentController : MonoBehaviour { UnityEngine.Debug.Log(decodedText); participant = new Participant(decodedText); startDot = GameObject.Find("StartButton"); + playerCamera = GameObject.FindGameObjectsWithTag("MainCamera")[0]; trialIndex = 0; trialDotIndex = 0; foreach (GameObject go in GameObject.FindGameObjectsWithTag("Dot")) @@ -42,6 +47,17 @@ public class ExperimentController : MonoBehaviour { public void NextDot() { + if (stopwatch.IsRunning) + { + stopwatch.Stop(); + double time = stopwatch.Elapsed.TotalSeconds; + stopwatch.Reset(); + + } + else + { + stopwatch.Start(); + } nextDot = FindDot(participant.trials[trialIndex][trialDotIndex]); trialDotIndex++; Show(nextDot); @@ -52,9 +68,36 @@ public class ExperimentController : MonoBehaviour { public void BackToStart() { + stopwatch.Stop(); + double time = stopwatch.Elapsed.TotalSeconds; + stopwatch.Reset(); + double angle = Vector3.Angle(nextDot.transform.position, playerCamera.transform.position); + double arcDistance = angle * (float)(Math.PI / 180) * 10; Hide(nextDot); Show(startDot); + + } + + public void CardboardWrapper(GameObject go, PointerEventData eventData) + { + UnityEngine.Debug.Log(eventData.pointerPressRaycast.worldPosition); + if (go != null) + { + UnityEngine.Debug.Log(go.name); + if (go.name == "StartButton") + { + NextDot(); + } + else + { + BackToStart(); + } + } + else + { + UnityEngine.Debug.Log("Missed"); + } } // Update is called once per frame diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4615dc6..8a3ea09 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -395,6 +395,7 @@ PlayerSettings: m_Enabled: 1 m_Devices: - cardboard + - None m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0