HumanoidControl/HumanoidControl_Free
HumanoidControl/HumanoidControl_Free
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix controller orientation for OpenXR and Varjo

Browse Source
This commit is contained in:
Pascal Serrarens 2023-08-14 11:05:37 +02:00
parent 64af1d26da
commit 285aefc2ae
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXRController.cs
View File

@ -15,6 +15,7 @@ namespace Passer.Tracking {
None, None,
Oculus, Oculus,
OpenXR, OpenXR,
Varjo,
} }
protected LoadedDeviceType loadedDevice = LoadedDeviceType.None; protected LoadedDeviceType loadedDevice = LoadedDeviceType.None;
public GameObject model; public GameObject model;
@ -141,7 +142,8 @@ namespace Passer.Tracking {
loadedDevice = LoadedDeviceType.Oculus; loadedDevice = LoadedDeviceType.Oculus;
else if (XRSettings.loadedDeviceName == "OpenXR Display") else if (XRSettings.loadedDeviceName == "OpenXR Display")
loadedDevice = LoadedDeviceType.OpenXR; loadedDevice = LoadedDeviceType.OpenXR;
else if (XRSettings.loadedDeviceName == "VarjoDisplay")
loadedDevice = LoadedDeviceType.Varjo;
} }
/// <summary> /// <summary>
@ -200,8 +202,9 @@ namespace Passer.Tracking {
Quaternion rotation; Quaternion rotation;
if (isTracked && device.TryGetFeatureValue(CommonUsages.deviceRotation, out rotation)) { if (isTracked && device.TryGetFeatureValue(CommonUsages.deviceRotation, out rotation)) {
//if (loadedDevice == LoadedDeviceType.OpenXR) if (loadedDevice == LoadedDeviceType.OpenXR ||
// rotation *= Quaternion.AngleAxis(45, Vector3.right); loadedDevice == LoadedDeviceType.Varjo)
rotation *= Quaternion.AngleAxis(45, Vector3.right);
transform.rotation = trackerTransform.rotation * rotation; transform.rotation = trackerTransform.rotation * rotation;
rotationConfidence = 1; rotationConfidence = 1;
status = Tracker.Status.Tracking; status = Tracker.Status.Tracking;