From 50841fd69b599851fcab5cc0673266815a99c019 Mon Sep 17 00:00:00 2001 From: Chris Midkiff Date: Fri, 30 Nov 2018 15:04:39 -0500 Subject: [PATCH] Last minute stuff --- Assets/Scenes/Experiment-Cardboard.unity | 4 ++-- Assets/Scenes/Experiment-Oculus.unity | 30 ++++++++++++++++++++++++ Assets/Scripts/DataSet.cs | 7 +++--- Assets/Scripts/ExperimentController.cs | 1 - 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Experiment-Cardboard.unity b/Assets/Scenes/Experiment-Cardboard.unity index 47a5293..3cb3869 100644 --- a/Assets/Scenes/Experiment-Cardboard.unity +++ b/Assets/Scenes/Experiment-Cardboard.unity @@ -233,12 +233,12 @@ Prefab: - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_AnchoredPosition.x - value: -9.98 + value: -11.96 objectReference: {fileID: 0} - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} propertyPath: m_AnchoredPosition.y - value: -18.68 + value: -21.84 objectReference: {fileID: 0} - target: {fileID: 224720632774813148, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} diff --git a/Assets/Scenes/Experiment-Oculus.unity b/Assets/Scenes/Experiment-Oculus.unity index df2f193..d299513 100644 --- a/Assets/Scenes/Experiment-Oculus.unity +++ b/Assets/Scenes/Experiment-Oculus.unity @@ -530,6 +530,36 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 246886986} + - target: {fileID: 114496915892972470, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - 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: 114109528806814276, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - 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: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 246886986} + - target: {fileID: 114110466022003668, guid: 49f39d13b583ef54c853f20f5179b584, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToStart + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49f39d13b583ef54c853f20f5179b584, type: 2} m_IsPrefabAsset: 0 diff --git a/Assets/Scripts/DataSet.cs b/Assets/Scripts/DataSet.cs index 8227053..806292a 100644 --- a/Assets/Scripts/DataSet.cs +++ b/Assets/Scripts/DataSet.cs @@ -42,8 +42,8 @@ namespace Assets.Scripts client.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded"; string ud = "userStudyId=" + name + "&userStudyData=" + data; - string response = client.UploadString(endpoint, ud); - UnityEngine.Debug.Log("Received Response: " + response); + client.UploadStringAsync(new Uri(endpoint), ud); + } } @@ -70,8 +70,7 @@ namespace Assets.Scripts using (var client = new WebClient()) { client.Headers[HttpRequestHeader.ContentType] = "application/json"; - var resp = client.UploadString("http://home.superpichu.org:9009", body.ToString()); - UnityEngine.Debug.Log("Recv: " + resp); + client.UploadStringAsync(new Uri("http://home.superpichu.org:9009"), body.ToString()); } } } diff --git a/Assets/Scripts/ExperimentController.cs b/Assets/Scripts/ExperimentController.cs index 6134d6c..2ccd722 100644 --- a/Assets/Scripts/ExperimentController.cs +++ b/Assets/Scripts/ExperimentController.cs @@ -85,7 +85,6 @@ public class ExperimentController : MonoBehaviour { } else if(trialIndex < participant.trials.Length) { - // NEXT TRIAL SHIT trialIndex++; trialDotIndex = 0; dataSet.SaveDataSet();