vr ready buttons

This commit is contained in:
2022-11-28 19:37:18 +01:00
parent 8c495fd953
commit 6106cdc544
16 changed files with 526 additions and 176 deletions

View File

@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 419816427646908935}
- component: {fileID: 419816427646908929}
- component: {fileID: 419816427646908928}
- component: {fileID: 7423186386015115176}
m_Layer: 0
m_Name: XR Origin
m_TagString: Untagged
@@ -78,6 +79,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7423186386015115176
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816427646908932}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5bd3e7129c8849acbfc4468a14bddf7a, type: 3}
m_Name:
m_EditorClassIdentifier:
camera: {fileID: 419816428804372198}
leftEye: {fileID: 419816428871882043}
rightEye: {fileID: 419816428230682310}
leftHand: {fileID: 419816429261119717}
rightHand: {fileID: 419816429507230469}
--- !u!1 &419816428170395207
GameObject:
m_ObjectHideFlags: 0
@@ -228,7 +246,6 @@ GameObject:
- component: {fileID: 419816428804372199}
- component: {fileID: 419816428804372196}
- component: {fileID: 419816428804372197}
- component: {fileID: 419816428804372193}
- component: {fileID: 419816428804372192}
- component: {fileID: 419816428804372195}
- component: {fileID: 419816428804372194}
@@ -417,7 +434,7 @@ MonoBehaviour:
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_RenderPostProcessing: 1
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
@@ -427,21 +444,6 @@ MonoBehaviour:
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!114 &419816428804372193
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816428804372187}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b2ceb62217b416743baa8beee7109cfb, type: 3}
m_Name:
m_EditorClassIdentifier:
camera: {fileID: 419816428804372198}
leftEye: {fileID: 419816428871882043}
rightEye: {fileID: 419816428230682310}
--- !u!114 &419816428804372192
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -638,6 +640,7 @@ GameObject:
- component: {fileID: 419816429261119706}
- component: {fileID: 419816429261119716}
- component: {fileID: 419816429261119717}
- component: {fileID: 8778856249964231161}
m_Layer: 0
m_Name: Left Hand
m_TagString: Untagged
@@ -925,11 +928,27 @@ SphereCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816429261119704}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.1
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &8778856249964231161
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816429261119704}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &419816429471595190
GameObject:
m_ObjectHideFlags: 0
@@ -1008,6 +1027,7 @@ GameObject:
- component: {fileID: 419816429507230714}
- component: {fileID: 419816429507230468}
- component: {fileID: 419816429507230469}
- component: {fileID: 7268346571948368084}
m_Layer: 0
m_Name: Right Hand
m_TagString: Untagged
@@ -1295,8 +1315,24 @@ SphereCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816429507230712}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.1
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &7268346571948368084
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419816429507230712}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0

View File

@@ -0,0 +1,28 @@
using NaughtyAttributes;
using UnityEngine;
namespace EscapeRoomEngine.VR.Runtime
{
public class Player : MonoBehaviour
{
public static Player Current
{
get
{
if (_foundPlayer == null)
{
_foundPlayer = FindObjectOfType<Player>();
}
return _foundPlayer;
}
}
private static Player _foundPlayer;
[BoxGroup("Internal")] public new Camera camera;
[BoxGroup("Internal")] [SerializeField] private Transform leftEye, rightEye;
[BoxGroup("Internal")] [SerializeField] private Collider leftHand, rightHand;
public Transform GetEye(Camera.StereoscopicEye eye) =>
eye == Camera.StereoscopicEye.Left ? leftEye : rightEye;
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 5bd3e7129c8849acbfc4468a14bddf7a
timeCreated: 1669641195

View File

@@ -1,13 +0,0 @@
using UnityEngine;
namespace EscapeRoomEngine.VR.Runtime
{
public class PlayerCamera : MonoBehaviour
{
public new Camera camera;
[SerializeField] private Transform leftEye, rightEye;
public Transform GetEyeTransform(Camera.StereoscopicEye eye) =>
eye == Camera.StereoscopicEye.Left ? leftEye : rightEye;
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b2ceb62217b416743baa8beee7109cfb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -2,6 +2,7 @@
"name": "VR",
"rootNamespace": "EscapeRoomEngine",
"references": [
"GUID:fe685ec1767f73d42b749ea8045bfe43",
"GUID:776d03a35f1b52c4a9aed9f56d7b4229"
],
"includePlatforms": [],