HooverHigh/QuestAppLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

further tweak to oculus integration fix

Browse Source
This commit is contained in:
tverona1
2020-05-03 13:41:00 -07:00
parent d8ce11eccf
commit 030eaf0dfc
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Oculus/VR/Scripts/Util/OVRMesh.cs
+5 -2
View File
@@ -66,7 +66,10 @@ public class OVRMesh : MonoBehaviour
private void Initialize(MeshType meshType)
{
_mesh = new Mesh();
if (null == _mesh)
{
_mesh = new Mesh();
}
var ovrpMesh = new OVRPlugin.Mesh();
if (OVRPlugin.GetMesh((OVRPlugin.MeshType)_meshType, out ovrpMesh))
@@ -122,7 +125,7 @@ public class OVRMesh : MonoBehaviour
private void Update()
{
if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands) && !IsInitialized)
if (!IsInitialized && OVRInput.IsControllerConnected(OVRInput.Controller.Hands))
{
if (_meshType != MeshType.None)
{
Assets/Oculus/VR/Scripts/Util/OVRMeshRenderer.cs
+2 -5
View File
@@ -171,12 +171,9 @@ public class OVRMeshRenderer : MonoBehaviour
}
}
}
else
else if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands))
{
if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands))
{
Initialize();
}
Initialize();
}
}
}
Assets/Oculus/VR/Scripts/Util/OVRSkeleton.cs
+1 -1
View File
@@ -292,7 +292,7 @@ public class OVRSkeleton : MonoBehaviour
private void Update()
{
if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands) && !IsInitialized)
if (!IsInitialized && OVRInput.IsControllerConnected(OVRInput.Controller.Hands))
{
if (_skeletonType != SkeletonType.None)
{
Assets/Oculus/VR/Scripts/Util/OVRSkeletonRenderer.cs
+22 -10
View File
@@ -236,11 +236,26 @@ public class OVRSkeletonRenderer : MonoBehaviour
private void Initialize()
{
_boneVisualizations = new List<BoneVisualization>();
_capsuleVisualizations = new List<CapsuleVisualization>();
_ovrSkeleton = GetComponent<OVRSkeleton>();
_skeletonGO = new GameObject("SkeletonRenderer");
_skeletonGO.transform.SetParent(transform, false);
if (null == _boneVisualizations)
{
_boneVisualizations = new List<BoneVisualization>();
}
if (null == _capsuleVisualizations)
{
_capsuleVisualizations = new List<CapsuleVisualization>();
}
if (null == _ovrSkeleton)
{
_ovrSkeleton = GetComponent<OVRSkeleton>();
}
if (null == _skeletonGO)
{
_skeletonGO = new GameObject("SkeletonRenderer");
_skeletonGO.transform.SetParent(transform, false);
}
if (_skeletonMaterial == null)
{
@@ -331,12 +346,9 @@ public class OVRSkeletonRenderer : MonoBehaviour
_capsuleVisualizations[i].Update(_scale, shouldRender, ShouldUseSystemGestureMaterial, _confidenceBehavior, _systemGestureBehavior);
}
}
else
else if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands))
{
if (OVRInput.IsControllerConnected(OVRInput.Controller.Hands) && !IsInitialized)
{
Initialize();
}
Initialize();
}
}