From be755323fcd744da8c31b8fae787c4dec6bd0852 Mon Sep 17 00:00:00 2001 From: dldydtn9755-crypto Date: Thu, 23 Jul 2026 17:58:02 +0900 Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Hischool_Chapter3.unity | 4 +- .../Chapter3/Chapter3_Carnotaurus1.dlg | 182 +++++++++++++++++- .../Quality URP Config.asset | 2 +- .../1.7.3/HandVisualizer/HandVisualizer.unity | 3 - .../HandVisualizer/Materials/AxisMesh.asset | 3 - .../1.7.3/HandVisualizer/Prefabs/Joint.prefab | 3 - .../Prefabs/Left Hand Tracking.prefab | 3 - .../Prefabs/Right Hand Tracking.prefab | 3 - .../Prefabs/VelocityPrefab.prefab | 3 - .../XR Hands/{1.7.3.meta => 1.8.0.meta} | 2 +- .../{1.7.3 => 1.8.0}/HandVisualizer.meta | 2 +- .../1.8.0/HandVisualizer/HandVisualizer.unity | 3 + .../HandVisualizer/HandVisualizer.unity.meta | 0 .../HandVisualizer/Materials.meta | 0 .../HandVisualizer/Materials/AxisMesh.asset | 3 + .../Materials/AxisMesh.asset.meta | 0 .../Materials/HandsDefaultMaterial.mat | 0 .../Materials/HandsDefaultMaterial.mat.meta | 0 .../HandVisualizer/Materials/HighFidelity.mat | 0 .../Materials/HighFidelity.mat.meta | 0 .../HandVisualizer/Materials/HighFidelity.png | 0 .../Materials/HighFidelity.png.meta | 24 +-- .../Materials/MaterialPipelineHandler.asset | 3 + .../MaterialPipelineHandler.asset.meta | 8 + .../Materials/TransparentRed.mat | 0 .../Materials/TransparentRed.mat.meta | 0 .../Materials/TransparentRed.png | 0 .../Materials/TransparentRed.png.meta | 24 +-- .../HandVisualizer/Models.meta | 0 .../HandVisualizer/Models/LeftHand.fbx | 0 .../HandVisualizer/Models/LeftHand.fbx.meta | 2 + .../Models/LeftHandAndroidXR.fbx | 0 .../Models/LeftHandAndroidXR.fbx.meta | 2 + .../HandVisualizer/Models/RightHand.fbx | 0 .../HandVisualizer/Models/RightHand.fbx.meta | 2 + .../Models/RightHandAndroidXR.fbx | 0 .../Models/RightHandAndroidXR.fbx.meta | 2 + .../HandVisualizer/Prefabs.meta | 0 .../Prefabs/Hand Debug Visualizer.prefab | 3 + .../Prefabs/Hand Debug Visualizer.prefab.meta | 7 + .../1.8.0/HandVisualizer/Prefabs/Joint.prefab | 3 + .../HandVisualizer/Prefabs/Joint.prefab.meta | 0 .../Prefabs/Left Hand Tracking.prefab | 3 + .../Prefabs/Left Hand Tracking.prefab.meta | 0 .../Prefabs/Right Hand Tracking.prefab | 3 + .../Prefabs/Right Hand Tracking.prefab.meta | 0 .../Prefabs/VelocityPrefab.prefab | 3 + .../Prefabs/VelocityPrefab.prefab.meta | 0 .../{1.7.3 => 1.8.0}/HandVisualizer/README.md | 0 .../HandVisualizer/README.md.meta | 0 .../HandVisualizer/Scripts.meta | 0 .../HandVisualizer/Scripts/HandProcessor.cs | 0 .../Scripts/HandProcessor.cs.meta | 0 .../HandVisualizer/Scripts/HandVisualizer.cs | 25 ++- .../Scripts/HandVisualizer.cs.meta | 0 .../HandVisualizer/Scripts/JointVisualizer.cs | 0 .../Scripts/JointVisualizer.cs.meta | 0 .../Scripts/MaterialPipelineHandler.cs | 46 ++++- .../Scripts/MaterialPipelineHandler.cs.meta | 0 ...y.XR.Hands.Samples.VisualizerSample.asmdef | 0 ...Hands.Samples.VisualizerSample.asmdef.meta | 0 .../XR/Settings/OpenXR Package Settings.asset | 4 +- 62 files changed, 304 insertions(+), 76 deletions(-) delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab delete mode 100644 Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab rename Assets/Samples/XR Hands/{1.7.3.meta => 1.8.0.meta} (77%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer.meta (77%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/HandVisualizer.unity.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials.meta (100%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/AxisMesh.asset.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HandsDefaultMaterial.mat (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HighFidelity.mat (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HighFidelity.mat.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HighFidelity.png (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/HighFidelity.png.meta (86%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset.meta rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/TransparentRed.mat (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/TransparentRed.mat.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/TransparentRed.png (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Materials/TransparentRed.png.meta (86%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/LeftHand.fbx (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/LeftHand.fbx.meta (98%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/LeftHandAndroidXR.fbx (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta (99%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/RightHand.fbx (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/RightHand.fbx.meta (98%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/RightHandAndroidXR.fbx (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Models/RightHandAndroidXR.fbx.meta (99%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Prefabs.meta (100%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab.meta create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Prefabs/Joint.prefab.meta (100%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta (100%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta (100%) create mode 100644 Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/README.md (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/README.md.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/HandProcessor.cs (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/HandProcessor.cs.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/HandVisualizer.cs (96%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/HandVisualizer.cs.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/JointVisualizer.cs (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/JointVisualizer.cs.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/MaterialPipelineHandler.cs (88%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Scripts/MaterialPipelineHandler.cs.meta (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef (100%) rename Assets/Samples/XR Hands/{1.7.3 => 1.8.0}/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta (100%) diff --git a/Assets/01_Scenes/Hischool_Chapter3.unity b/Assets/01_Scenes/Hischool_Chapter3.unity index ff5ae89f..70a639da 100644 --- a/Assets/01_Scenes/Hischool_Chapter3.unity +++ b/Assets/01_Scenes/Hischool_Chapter3.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8f27f8535ee229869e66f43f0173f957bb8ff60fd5414ca9bc0d0b70e1926c3 -size 41023695 +oid sha256:04e7d3c7895bd3cfa9d4963dc0f4b08cbef9b297ca6362db8ba2ff7dca832a17 +size 41019037 diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg index 93d7e0df..9912bd8b 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg @@ -56,7 +56,7 @@ MonoBehaviour: x: 139 y: -396 width: 1843 - height: 1975 + height: 2086 m_GraphElementMetaData: - m_Guid: m_Value0: 3953896658662454792 @@ -260,6 +260,11 @@ MonoBehaviour: - Choice1Code - Choice2Text - Choice2Code + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -285,6 +290,11 @@ MonoBehaviour: - rid: 8016363832598855965 - rid: 8016363832598856026 - rid: 8016363832598856027 + - rid: 8016363865578406431 + - rid: 8016363865578406432 + - rid: 8016363865578406433 + - rid: 8016363865578406479 + - rid: 8016363865578406480 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -465,6 +475,11 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 8016363832598855968 - rid: 8016363832598855969 @@ -483,6 +498,11 @@ MonoBehaviour: - rid: 8016363832598855982 - rid: 8016363832598855983 - rid: 8016363832598855984 + - rid: 8016363865578406434 + - rid: 8016363865578406435 + - rid: 8016363865578406436 + - rid: 8016363865578406481 + - rid: 8016363865578406482 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -639,6 +659,11 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 8016363832598855988 - rid: 8016363832598855989 @@ -657,6 +682,11 @@ MonoBehaviour: - rid: 8016363832598856002 - rid: 8016363832598856003 - rid: 8016363832598856004 + - rid: 8016363865578406437 + - rid: 8016363865578406438 + - rid: 8016363865578406439 + - rid: 8016363865578406483 + - rid: 8016363865578406484 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -813,6 +843,11 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 8016363832598856008 - rid: 8016363832598856009 @@ -831,6 +866,11 @@ MonoBehaviour: - rid: 8016363832598856022 - rid: 8016363832598856023 - rid: 8016363832598856024 + - rid: 8016363865578406440 + - rid: 8016363865578406441 + - rid: 8016363865578406442 + - rid: 8016363865578406485 + - rid: 8016363865578406486 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -996,6 +1036,11 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 8016363832598856030 - rid: 8016363832598856031 @@ -1014,6 +1059,11 @@ MonoBehaviour: - rid: 8016363832598856044 - rid: 8016363832598856045 - rid: 8016363832598856046 + - rid: 8016363865578406443 + - rid: 8016363865578406444 + - rid: 8016363865578406445 + - rid: 8016363865578406487 + - rid: 8016363865578406488 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1138,6 +1188,11 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 8016363859357991072 - rid: 8016363859357991073 @@ -1156,6 +1211,11 @@ MonoBehaviour: - rid: 8016363859357991086 - rid: 8016363859357991087 - rid: 8016363859357991088 + - rid: 8016363865578406446 + - rid: 8016363865578406447 + - rid: 8016363865578406448 + - rid: 8016363865578406489 + - rid: 8016363865578406490 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1308,3 +1368,123 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: + - rid: 8016363865578406431 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406432 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406433 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406434 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406435 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406436 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406437 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406438 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406439 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406440 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406441 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406442 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406443 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406444 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406445 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406446 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406447 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406448 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363865578406479 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406480 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406481 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406482 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406483 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 1 + - rid: 8016363865578406484 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406485 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406486 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406487 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406488 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406489 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363865578406490 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 diff --git a/Assets/99_Settings/Project Configuration/Quality URP Config.asset b/Assets/99_Settings/Project Configuration/Quality URP Config.asset index 603308eb..476ef42d 100644 --- a/Assets/99_Settings/Project Configuration/Quality URP Config.asset +++ b/Assets/99_Settings/Project Configuration/Quality URP Config.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:257a2de55fdbb951ed8279164d00fb581cacae479cc538fd02b3e17702810a11 +oid sha256:c2ebcfcc9eeb4b5f83296e9fd6297ed823514d8d721d36fa7fd22d75e359d87c size 4625 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity deleted file mode 100644 index 7bcd3cb9..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ba5aed0ee2ad4078a922bfa14b9fc0c1589a4d521fa2b1b514e52f00e3dc94b -size 19605 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset deleted file mode 100644 index 7513573e..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f129b6a626f4c9c2b37e27f1962663cf0590880480d4fcbbc94a1f46e0cf2635 -size 14550 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab deleted file mode 100644 index a223756e..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bb3c5f17e5742ad7c4c95eab00fdac9ca227cd15a140d037d16addcad9b7d1d -size 6883 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab deleted file mode 100644 index d98bee07..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64909c57b5f18f803f9d6422fcdf483fbef15d834efdb38887e7ca04278ade7e -size 15486 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab deleted file mode 100644 index 35827b63..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39c0e53c40f9c7ba6e553a24ffc7dcc05949aa56b53f17cc8b6613e9cb6c2a12 -size 15309 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab b/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab deleted file mode 100644 index 5c40917f..00000000 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66c0ba1b6572dd622806b0d913c45891ed98a331e6c6076f1c210925c86da74a -size 3592 diff --git a/Assets/Samples/XR Hands/1.7.3.meta b/Assets/Samples/XR Hands/1.8.0.meta similarity index 77% rename from Assets/Samples/XR Hands/1.7.3.meta rename to Assets/Samples/XR Hands/1.8.0.meta index 7f212352..a0651fc6 100644 --- a/Assets/Samples/XR Hands/1.7.3.meta +++ b/Assets/Samples/XR Hands/1.8.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f700f5d9e372c94785bf583ebcfcca0 +guid: f5bb6bc142720604d917bab67223e7d1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer.meta similarity index 77% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer.meta index 31abddea..90f28c47 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2338e4f6802bdb845a01bd8b4c3da77d +guid: bec4576b1ba9ede4db6fba9bafc7a05a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity new file mode 100644 index 00000000..f8693578 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:162cbd168dec9a54a20eb106348d1049db984750826761b41cb07ca40f1a28d5 +size 24203 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/HandVisualizer.unity.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/HandVisualizer.unity.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials.meta diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset new file mode 100644 index 00000000..5ee8e218 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0736622d81546bf4bd2a77676f328210bca49c04c74bd8dd77df12998ac78cd7 +size 14546 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/AxisMesh.asset.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/AxisMesh.asset.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HandsDefaultMaterial.mat b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HandsDefaultMaterial.mat similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HandsDefaultMaterial.mat rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HandsDefaultMaterial.mat diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.mat b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.mat similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.mat rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.mat diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.mat.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.mat.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.mat.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.png b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.png similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.png rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.png diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.png.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.png.meta similarity index 86% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.png.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.png.meta index 91180cb7..c4df327f 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/HighFidelity.png.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/HighFidelity.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,24 +119,10 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: VisionOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -146,8 +132,6 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset new file mode 100644 index 00000000..19a8891e --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11f86f23080e9f74e482317f6203f55c5d2306ed7a93b70e32862e678cbbb8f9 +size 1454 diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset.meta new file mode 100644 index 00000000..7e377e59 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/MaterialPipelineHandler.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e22d037d5d9286644b4b81a8b91b5ee5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.mat b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.mat similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.mat rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.mat diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.mat.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.mat.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.mat.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.png b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.png similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.png rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.png diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.png.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.png.meta similarity index 86% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.png.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.png.meta index fb6e2eb1..42ab35a3 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Materials/TransparentRed.png.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Materials/TransparentRed.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,24 +119,10 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: VisionOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -146,8 +132,6 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHand.fbx b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHand.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHand.fbx rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHand.fbx diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHand.fbx.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHand.fbx.meta similarity index 98% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHand.fbx.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHand.fbx.meta index 20debb91..cbb817ee 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHand.fbx.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHand.fbx.meta @@ -16,6 +16,8 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHandAndroidXR.fbx b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHandAndroidXR.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHandAndroidXR.fbx rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHandAndroidXR.fbx diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta similarity index 99% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta index 3b97badb..61b7ed9f 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/LeftHandAndroidXR.fbx.meta @@ -16,6 +16,8 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHand.fbx b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHand.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHand.fbx rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHand.fbx diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHand.fbx.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHand.fbx.meta similarity index 98% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHand.fbx.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHand.fbx.meta index 2df6a650..e92f18c0 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHand.fbx.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHand.fbx.meta @@ -16,6 +16,8 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHandAndroidXR.fbx b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHandAndroidXR.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHandAndroidXR.fbx rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHandAndroidXR.fbx diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHandAndroidXR.fbx.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHandAndroidXR.fbx.meta similarity index 99% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHandAndroidXR.fbx.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHandAndroidXR.fbx.meta index 4cbeabce..16cb5442 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Models/RightHandAndroidXR.fbx.meta +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Models/RightHandAndroidXR.fbx.meta @@ -16,6 +16,8 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs.meta diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab new file mode 100644 index 00000000..4da47bdc --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c74d662e2820f748f5895c10d0e052d804e3d21724b45b176f809d6cfb6342d6 +size 3079 diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab.meta new file mode 100644 index 00000000..782901d3 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Hand Debug Visualizer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c8146e7694b9541089b8dbaa8a7d59d9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab new file mode 100644 index 00000000..69c8350a --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:875c2ee97d93f260c750041bbf0525ea34c45dd4b3a4d7ae1987ad7ecb2d009f +size 6663 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Joint.prefab.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Joint.prefab.meta diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab new file mode 100644 index 00000000..8ff5e4b2 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f3296f1807f7dea77492c7efb325766e7e5a265935168d3de2aae00fa3f9a9 +size 15484 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab new file mode 100644 index 00000000..f34a1a1b --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f55f5e6ccae6a3b2fc19fde4d72161fbd0520d3288c2fc1c390ba062783437e +size 15307 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta diff --git a/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab new file mode 100644 index 00000000..fa07fbc7 --- /dev/null +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:617ee28ce428aaaa17cb47b056ba5a38fa18f4f92a7fbef594c15e64d43fc73b +size 3482 diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/README.md b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/README.md similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/README.md rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/README.md diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/README.md.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/README.md.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/README.md.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/README.md.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandProcessor.cs b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandProcessor.cs similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandProcessor.cs rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandProcessor.cs diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandProcessor.cs.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandProcessor.cs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandProcessor.cs.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandProcessor.cs.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandVisualizer.cs b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandVisualizer.cs similarity index 96% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandVisualizer.cs rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandVisualizer.cs index 7d94269e..cd543426 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandVisualizer.cs +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandVisualizer.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using UnityEngine.Serialization; @@ -114,9 +115,18 @@ public VelocityType velocityType } XRHandSubsystem m_Subsystem; + public XRHandSubsystem subsystem + { + get => m_Subsystem; + } + HandGameObjects m_LeftHandGameObjects; HandGameObjects m_RightHandGameObjects; + public Action subsystemSubscribed; + public Action subsystemUnsubscribed; + XRHandSubsystem.UpdateSuccessFlags m_CombinedSuccessFlags; + static readonly List s_SubsystemsReuse = new List(); /// @@ -254,6 +264,9 @@ void SubscribeHandSubsystem() m_Subsystem.trackingAcquired += OnTrackingAcquired; m_Subsystem.trackingLost += OnTrackingLost; m_Subsystem.updatedHands += OnUpdatedHands; + + if (subsystemSubscribed != null) + subsystemSubscribed.Invoke(m_Subsystem); } void UnsubscribeHandSubsystem() @@ -261,6 +274,9 @@ void UnsubscribeHandSubsystem() if (m_Subsystem == null) return; + if (subsystemUnsubscribed != null) + subsystemUnsubscribed.Invoke(m_Subsystem); + m_Subsystem.trackingAcquired -= OnTrackingAcquired; m_Subsystem.trackingLost -= OnTrackingLost; m_Subsystem.updatedHands -= OnUpdatedHands; @@ -309,6 +325,7 @@ void OnUpdatedHands(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlag // We have no game logic depending on the Transforms, so early out here // (add game logic before this return here, directly querying from // subsystem.leftHand and subsystem.rightHand using GetJoint on each hand) + m_CombinedSuccessFlags |= updateSuccessFlags; if (updateType == XRHandSubsystem.UpdateType.Dynamic) return; @@ -338,15 +355,19 @@ void OnUpdatedHands(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlag m_LeftHandGameObjects.UpdateJoints( subsystem.leftHand, - (updateSuccessFlags & XRHandSubsystem.UpdateSuccessFlags.LeftHandJoints) != 0, + (m_CombinedSuccessFlags & XRHandSubsystem.UpdateSuccessFlags.LeftHandJoints) != 0, m_DebugDrawJoints, m_VelocityType); m_RightHandGameObjects.UpdateJoints( subsystem.rightHand, - (updateSuccessFlags & XRHandSubsystem.UpdateSuccessFlags.RightHandJoints) != 0, + (m_CombinedSuccessFlags & XRHandSubsystem.UpdateSuccessFlags.RightHandJoints) != 0, m_DebugDrawJoints, m_VelocityType); + + // Reset the combined flags after the BeforeRender phase + if (updateType == XRHandSubsystem.UpdateType.BeforeRender) + m_CombinedSuccessFlags = XRHandSubsystem.UpdateSuccessFlags.None; } class HandGameObjects diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandVisualizer.cs.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandVisualizer.cs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/HandVisualizer.cs.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/HandVisualizer.cs.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/JointVisualizer.cs b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/JointVisualizer.cs similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/JointVisualizer.cs rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/JointVisualizer.cs diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/JointVisualizer.cs.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/JointVisualizer.cs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/JointVisualizer.cs.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/JointVisualizer.cs.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/MaterialPipelineHandler.cs b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/MaterialPipelineHandler.cs similarity index 88% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/MaterialPipelineHandler.cs rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/MaterialPipelineHandler.cs index 8281fb46..e058aa69 100644 --- a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/MaterialPipelineHandler.cs +++ b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/MaterialPipelineHandler.cs @@ -1,5 +1,6 @@ using UnityEngine.Rendering; using System.Collections.Generic; + #if UNITY_EDITOR using UnityEditor; #endif @@ -10,16 +11,23 @@ namespace UnityEngine.XR.Hands.Samples.VisualizerSample [InitializeOnLoad] static class RenderPipelineValidation { + /// + /// Manually refreshes all Material Pipeline Handler scriptable objects. + /// + static void RefreshMaterialPipelineHandlers() + { + foreach (var pipelineHandler in GetAllInstances()) + { + pipelineHandler.AutoRefreshPipelineShaders(); + } + } + static RenderPipelineValidation() { // Use delayCall to ensure this runs after the editor is fully initialized and all assets are imported. // Without delayCall, this script may execute before new assets (such as newly imported samples) // are registered in the AssetDatabase, so they won't be found or converted. - EditorApplication.delayCall += () => - { - foreach (var pipelineHandler in GetAllInstances()) - pipelineHandler.AutoRefreshPipelineShaders(); - }; + EditorApplication.delayCall += () => RefreshMaterialPipelineHandlers(); } static List GetAllInstances() @@ -72,6 +80,8 @@ public class MaterialPipelineHandler : ScriptableObject [Tooltip("If true, the shaders will be refreshed automatically when the editor opens and when this scriptable object instance is enabled.")] bool m_AutoRefreshShaders = true; + bool m_SaveAssetsPending; + #if UNITY_EDITOR void OnEnable() { @@ -92,12 +102,16 @@ public void AutoRefreshPipelineShaders() /// public void SetPipelineShaders() { + // Already updated materials, waiting on the save to finish. + if (m_SaveAssetsPending) + return; + if (m_ShaderContainers == null) return; bool isBuiltinRenderPipeline = GraphicsSettings.currentRenderPipeline == null; - bool isModified = false; + int modifiedCount = 0; foreach (var info in m_ShaderContainers) { @@ -123,6 +137,7 @@ public void SetPipelineShaders() info.material.SetColor("_Color", originalColor); MarkMaterialModified(info.material); isModified = true; + modifiedCount++; } else if (!isBuiltinRenderPipeline && srpShader != null && currentShader != srpShader) { @@ -130,19 +145,34 @@ public void SetPipelineShaders() info.material.SetColor("_BaseColor", originalColor); MarkMaterialModified(info.material); isModified = true; + modifiedCount++; } } if (isModified) { #if UNITY_EDITOR - // This ensures the material changes are saved immediately, + Debug.Log($"Material Pipeline Handlers have updated {modifiedCount} material asset(s).", this); + + // Invoking `AssetDatabase.SaveAssets` ensures the material changes are saved immediately, // otherwise they won't be saved until the next domain reload. - AssetDatabase.SaveAssets(); + // Calls to AssetDatabase.SaveAssets are restricted during asset importing, + // so schedule it for the next Editor frame. + m_SaveAssetsPending = true; + EditorApplication.delayCall -= OnDelayCall; + EditorApplication.delayCall += OnDelayCall; #endif } } +#if UNITY_EDITOR + void OnDelayCall() + { + m_SaveAssetsPending = false; + AssetDatabase.SaveAssets(); + } +#endif + static void MarkMaterialModified(Material material) { #if UNITY_EDITOR diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/MaterialPipelineHandler.cs.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/MaterialPipelineHandler.cs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Scripts/MaterialPipelineHandler.cs.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Scripts/MaterialPipelineHandler.cs.meta diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef diff --git a/Assets/Samples/XR Hands/1.7.3/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta b/Assets/Samples/XR Hands/1.8.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta similarity index 100% rename from Assets/Samples/XR Hands/1.7.3/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta rename to Assets/Samples/XR Hands/1.8.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index d2937814..c421a5ef 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7811274b3c80fa3a39a8f8485192e3349401b2ac6eea8c4bfa2b8f97fd5c08d1 -size 93980 +oid sha256:b438d070ea1bd6b1b8c1e568987576722e950d7e37865bb0a2c591fc10aefa62 +size 42264