From 40690aed39abd89a81578e5e57810e2dc496b96f Mon Sep 17 00:00:00 2001
From: Chris Midkiff <chrismidkiff15@gmail.com>
Date: Thu, 18 Oct 2018 15:53:03 -0400
Subject: [PATCH] moved some stuff around

---
 Assets/FittsLawVR.meta                        |  8 -------
 Assets/FittsLawVR/Prefabs.meta                |  8 -------
 Assets/{FittsLawVR => }/Prefabs/Canvas.prefab |  0
 .../Prefabs/Canvas.prefab.meta                |  0
 Assets/Prefabs/DotWrapper.cs                  | 22 -------------------
 Assets/Prefabs/DotWrapper.cs.meta             | 11 ----------
 Assets/{FittsLawVR => }/Prefabs/Oculus.prefab |  4 +++-
 .../Prefabs/Oculus.prefab.meta                |  0
 Assets/Scripts/ExperimentController.cs        |  1 -
 9 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 Assets/FittsLawVR.meta
 delete mode 100644 Assets/FittsLawVR/Prefabs.meta
 rename Assets/{FittsLawVR => }/Prefabs/Canvas.prefab (100%)
 rename Assets/{FittsLawVR => }/Prefabs/Canvas.prefab.meta (100%)
 delete mode 100644 Assets/Prefabs/DotWrapper.cs
 delete mode 100644 Assets/Prefabs/DotWrapper.cs.meta
 rename Assets/{FittsLawVR => }/Prefabs/Oculus.prefab (99%)
 rename Assets/{FittsLawVR => }/Prefabs/Oculus.prefab.meta (100%)

diff --git a/Assets/FittsLawVR.meta b/Assets/FittsLawVR.meta
deleted file mode 100644
index fd5e179..0000000
--- a/Assets/FittsLawVR.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 62d3a01001b36e5458fdd69d42454965
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/FittsLawVR/Prefabs.meta b/Assets/FittsLawVR/Prefabs.meta
deleted file mode 100644
index cecd55c..0000000
--- a/Assets/FittsLawVR/Prefabs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d31c8fb2741a8b4bb15554eee798a44
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/FittsLawVR/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab
similarity index 100%
rename from Assets/FittsLawVR/Prefabs/Canvas.prefab
rename to Assets/Prefabs/Canvas.prefab
diff --git a/Assets/FittsLawVR/Prefabs/Canvas.prefab.meta b/Assets/Prefabs/Canvas.prefab.meta
similarity index 100%
rename from Assets/FittsLawVR/Prefabs/Canvas.prefab.meta
rename to Assets/Prefabs/Canvas.prefab.meta
diff --git a/Assets/Prefabs/DotWrapper.cs b/Assets/Prefabs/DotWrapper.cs
deleted file mode 100644
index d5939b1..0000000
--- a/Assets/Prefabs/DotWrapper.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class DotWrapper : MonoBehaviour
-{
-    private ExperimentController experimentController;
-    void Awake()
-    {
-        experimentController = GameObject.Find("GameManager").GetComponent<ExperimentController>();
-    }
-
-    public void NextDot()
-    {
-        experimentController.NextDot();
-    }
-
-    public void BackToStart()
-    {
-        experimentController.BackToStart();
-    }
-}
\ No newline at end of file
diff --git a/Assets/Prefabs/DotWrapper.cs.meta b/Assets/Prefabs/DotWrapper.cs.meta
deleted file mode 100644
index 076eff7..0000000
--- a/Assets/Prefabs/DotWrapper.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9213a906c4bf7e743a6a93cd31e56ae8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/FittsLawVR/Prefabs/Oculus.prefab b/Assets/Prefabs/Oculus.prefab
similarity index 99%
rename from Assets/FittsLawVR/Prefabs/Oculus.prefab
rename to Assets/Prefabs/Oculus.prefab
index 5288052..6433c43 100644
--- a/Assets/FittsLawVR/Prefabs/Oculus.prefab
+++ b/Assets/Prefabs/Oculus.prefab
@@ -2050,6 +2050,8 @@ MonoBehaviour:
   enableAdaptiveResolution: 0
   minRenderScale: 0.7
   maxRenderScale: 1
+  _headPoseRelativeOffsetRotation: {x: 0, y: 0, z: 0}
+  _headPoseRelativeOffsetTranslation: {x: 0, y: 0, z: 0}
   expandMixedRealityCapturePropertySheet: 0
   enableMixedReality: 0
   compositionMethod: 0
@@ -3278,6 +3280,6 @@ SpriteRenderer:
   m_Size: {x: 19.2, y: 10.8}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
diff --git a/Assets/FittsLawVR/Prefabs/Oculus.prefab.meta b/Assets/Prefabs/Oculus.prefab.meta
similarity index 100%
rename from Assets/FittsLawVR/Prefabs/Oculus.prefab.meta
rename to Assets/Prefabs/Oculus.prefab.meta
diff --git a/Assets/Scripts/ExperimentController.cs b/Assets/Scripts/ExperimentController.cs
index 08bdd6d..4735217 100644
--- a/Assets/Scripts/ExperimentController.cs
+++ b/Assets/Scripts/ExperimentController.cs
@@ -53,7 +53,6 @@ public class ExperimentController : MonoBehaviour {
     public void BackToStart()
     {
         Hide(nextDot);
-        //nextDot = GameObject.Find(participant.trials[trialIndex][trialDotIndex]);
         Show(startDot);
 
     }