From 31a54e2b023a24d9ba6ffc41a8701b1c97681d43 Mon Sep 17 00:00:00 2001
From: "florian.hassler" <florian.hassler@etu.hesge.ch>
Date: Mon, 3 Jun 2019 17:57:44 +0200
Subject: [PATCH] minor update
---
.../Assets/Scenes/MainMultiplayer.unity | 27 ++++++++++++++++---
.../Scripts/testTouch/ReferencePoint.cs | 13 ---------
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/test_vr_unity/Assets/Scenes/MainMultiplayer.unity b/test_vr_unity/Assets/Scenes/MainMultiplayer.unity
index 25f3a64..07d4814 100644
--- a/test_vr_unity/Assets/Scenes/MainMultiplayer.unity
+++ b/test_vr_unity/Assets/Scenes/MainMultiplayer.unity
@@ -2241,7 +2241,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalPosition.z
@@ -2249,7 +2249,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: 0.38268343
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalRotation.y
@@ -2261,7 +2261,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0.92387956
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_RootOrder
@@ -2269,7 +2269,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0
+ value: 45
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
@@ -2293,6 +2293,25 @@ Camera:
type: 3}
m_PrefabInstance: {fileID: 2127732919}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2127732922 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 100004, guid: 126d619cf4daa52469682f85c1378b4a,
+ type: 3}
+ m_PrefabInstance: {fileID: 2127732919}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2127732923
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2127732922}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6c77b574a57c2104c8a74ba9fc611dbb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ player: {fileID: 0}
--- !u!1001 &4382820208367757842
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs b/test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
index fc96381..58bced7 100644
--- a/test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
+++ b/test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
@@ -8,23 +8,10 @@ public class ReferencePoint : MonoBehaviour
bool TouchedOnce = false;
private void OnTriggerEnter(Collider other)
{
- // Debug.Log("TriggerEnter");
if (!TouchedOnce && other.gameObject.tag == "gesture")
{
HandController.instance.IncrementCorrectPoint();
-
TouchedOnce = true;
}
}
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
}
--
GitLab