Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-14 14:59:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1937 from ousttrue/fix10/fix_openxr_rig

Browse Source 
Fix10/fix openxr rig
This commit is contained in:
ousttrue
2022-11-29 19:32:05 +09:00
committed by GitHub
parent 8022372c72 432dfb60f0
commit bd65b5f805
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/VRM10/Runtime/Components/Vrm10Runtime/ControlRig/Rigs/XR_EXT_hand_tracking.cs
View File

@@ -9,14 +9,13 @@ namespace UniVRM10
/// * https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#_conventions_of_hand_joints
/// * https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_vrm-1.0/tpose.ja.md
///
/// OpenXR は右手系なのに対して Unityは左手系です。
/// この Rig が期待するボーンの値は、XR_EXT_hand_tracking の Joint の値を Z軸反転で座標変換したものです。
/// </summary>
public static class XR_EXT_hand_tracking
{
/// <summary>
/// up vector と forward vector の外積により空間を算出して、回転を得ます。
///
/// OpenXR は右手系なのに対して Unityは左手系です。
/// 結果として、X軸が反転することに注意してください。
/// </summary>
/// <param name="up"></param>
/// <param name="forward"></param>
@@ -34,12 +33,12 @@ namespace UniVRM10
/// <summary>
/// 親指は XZ 平面45度です。
/// </summary>
public static Quaternion LeftThumb = GetRotation((Vector3.forward + Vector3.left).normalized, (Vector3.right + Vector3.forward).normalized);
public static Quaternion LeftThumb = GetRotation((Vector3.forward + Vector3.right).normalized, (Vector3.left + Vector3.forward).normalized);
/// <summary>
/// 親指は XZ 平面45度です。
/// </summary>
public static Quaternion RightThumb = GetRotation((Vector3.forward + Vector3.right).normalized, (Vector3.left + Vector3.forward).normalized);
public static Quaternion RightThumb = GetRotation((Vector3.forward + Vector3.left).normalized, (Vector3.right + Vector3.forward).normalized);
/// <summary>
/// VRM-1.0 の T-Pose の定義から各指はX軸と並行です。親指はXZ平面に45度です。

3
Assets/VRM10/Runtime/Components/Vrm10Runtime/ControlRig/Vrm10ControlBone.cs
View File

@@ -92,8 +92,7 @@ namespace UniVRM10
{
get
{
var delta = Quaternion.Inverse(_initialControlBoneGlobalRotation) * ControlBone.localRotation * _initialControlBoneGlobalRotation;
return InitialControlBoneLocalRotation * delta;
return _initialControlBoneGlobalRotation * Quaternion.Inverse(InitialControlBoneLocalRotation) * ControlBone.localRotation * Quaternion.Inverse(_initialControlBoneGlobalRotation);
}
}