From f39eac82c5e11e626350597bd0c4d65fcdee563d Mon Sep 17 00:00:00 2001 From: Guerra24 Date: Tue, 18 Jun 2024 23:25:35 -0600 Subject: [PATCH] Fix hand angle --- Assets/Scenes/Main.unity | 58 ++++++++++----------- Assets/Scripts/AvatarLoader.cs | 2 + Assets/UI/Menu/Settings/TrackingPage.prefab | 31 ++--------- Packages/manifest.json | 6 +-- Packages/packages-lock.json | 18 +++---- 5 files changed, 47 insertions(+), 68 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 995f6f3..8b2b236 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -702,13 +702,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147298075} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: -0.53729963, w: 0.8433914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.266, y: 0.622, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -65} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &200403184 GameObject: m_ObjectHideFlags: 0 @@ -1397,22 +1397,22 @@ PrefabInstance: - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.x - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.x - value: -250 + value: 0 objectReference: {fileID: 0} - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: -304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3183264326573952452, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -1582,32 +1582,32 @@ PrefabInstance: - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.x - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.y - value: -17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.x - value: -250 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: 304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6974992526447935581, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -1622,17 +1622,17 @@ PrefabInstance: - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.y - value: -17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: 304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8211928304835922972, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -5876,17 +5876,17 @@ PrefabInstance: - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.x - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: -304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3183264326573952452, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -6056,27 +6056,27 @@ PrefabInstance: - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.x - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.y - value: -17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: 304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6974992526447935581, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -6091,22 +6091,22 @@ PrefabInstance: - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_SizeDelta.y - value: -17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.x - value: 250 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} propertyPath: m_LocalPosition.y - value: 304 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8211928304835922972, guid: d2bf08666f6585c4fb2de39208019ae2, type: 3} @@ -10363,13 +10363,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1662831905} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0.53729963, w: 0.8433915} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.266, y: 0.622, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 65} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1667170598 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AvatarLoader.cs b/Assets/Scripts/AvatarLoader.cs index 08c2ce9..728012e 100644 --- a/Assets/Scripts/AvatarLoader.cs +++ b/Assets/Scripts/AvatarLoader.cs @@ -319,6 +319,8 @@ private void OnFirstFrame() } ApplicationPersistence.Save(); Driver.InitExpressionMap(); + LeftWristTarget.rotation = Quaternion.Euler(0, 0, 65); + RightWristTarget.rotation = Quaternion.Euler(0, 0, -65); } public void BuildAnimationMapping(GameObject avatar) diff --git a/Assets/UI/Menu/Settings/TrackingPage.prefab b/Assets/UI/Menu/Settings/TrackingPage.prefab index 53e8db6..e6e47ad 100644 --- a/Assets/UI/Menu/Settings/TrackingPage.prefab +++ b/Assets/UI/Menu/Settings/TrackingPage.prefab @@ -1047,7 +1047,7 @@ PrefabInstance: - target: {fileID: 4213744415970196551, guid: 140fb93c0f759954ab4f2469c05eec41, type: 3} propertyPath: m_Size - value: 0.8653001 + value: 0.7101025 objectReference: {fileID: 0} - target: {fileID: 4213744415970196551, guid: 140fb93c0f759954ab4f2469c05eec41, type: 3} @@ -2846,11 +2846,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7198157510826461519, guid: c6864c8a1c4511d4ebe8c473c2a49164, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6989486517732340840} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6864c8a1c4511d4ebe8c473c2a49164, type: 3} --- !u!114 &1162285540573042441 stripped MonoBehaviour: @@ -2858,7 +2854,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 3947078984640387547} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6134511215624933524} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3} @@ -2870,25 +2866,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3947078984640387547} m_PrefabAsset: {fileID: 0} ---- !u!1 &6134511215624933524 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7198157510826461519, guid: c6864c8a1c4511d4ebe8c473c2a49164, - type: 3} - m_PrefabInstance: {fileID: 3947078984640387547} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6989486517732340840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6134511215624933524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3499ee317da2e4244a890d95b059143a, type: 3} - m_Name: - m_EditorClassIdentifier: - Platforms: 0700000002000000 --- !u!1001 &4159791408305111947 PrefabInstance: m_ObjectHideFlags: 0 @@ -4435,7 +4412,7 @@ PrefabInstance: - target: {fileID: 5917283288401401515, guid: adf8ad31abbd8d742834c7a426520334, type: 3} propertyPath: m_AnchoredPosition.x - value: -17.24942 + value: -17.445892 objectReference: {fileID: 0} - target: {fileID: 6332600843900379313, guid: adf8ad31abbd8d742834c7a426520334, type: 3} diff --git a/Packages/manifest.json b/Packages/manifest.json index d884ace..0142a1d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -15,9 +15,9 @@ "com.unity.test-framework": "1.4.4", "com.unity.timeline": "1.8.7", "com.unity.ugui": "2.0.0", - "com.vrmc.gltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.122.0", - "com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.122.0", - "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.122.0", + "com.vrmc.gltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.123.0", + "com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.123.0", + "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.123.0", "jp.keijiro.klak.spout": "2.0.3", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5a2563d..b52e59a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -190,34 +190,34 @@ } }, "com.vrmc.gltf": { - "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.122.0", + "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.123.0", "depth": 0, "source": "git", "dependencies": { - "com.vrmc.vrmshaders": "0.122.0", + "com.vrmc.vrmshaders": "0.123.0", "com.unity.modules.animation": "1.0.0" }, - "hash": "326bab7fe44856f3a9b8008bbcd561cc9778e0a4" + "hash": "3104b4c75511032765a21ca4365e2d3fe78030fc" }, "com.vrmc.univrm": { - "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.122.0", + "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.123.0", "depth": 0, "source": "git", "dependencies": { - "com.vrmc.vrmshaders": "0.122.0", - "com.vrmc.gltf": "0.122.0", + "com.vrmc.vrmshaders": "0.123.0", + "com.vrmc.gltf": "0.123.0", "com.unity.ugui": "1.0.0" }, - "hash": "326bab7fe44856f3a9b8008bbcd561cc9778e0a4" + "hash": "3104b4c75511032765a21ca4365e2d3fe78030fc" }, "com.vrmc.vrmshaders": { - "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.122.0", + "version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.123.0", "depth": 0, "source": "git", "dependencies": { "com.unity.modules.imageconversion": "1.0.0" }, - "hash": "326bab7fe44856f3a9b8008bbcd561cc9778e0a4" + "hash": "3104b4c75511032765a21ca4365e2d3fe78030fc" }, "jp.keijiro.klak.spout": { "version": "2.0.3",