From 16f6d72219c79d4bb193d53faac99010d635aae4 Mon Sep 17 00:00:00 2001
From: Pascal Serrarens <pse@pale.blue>
Date: Fri, 1 Jul 2022 17:08:16 +0200
Subject: [PATCH] Fixed for hand tracking

---
 .../Extensions/UnityXR/UnityXR_Editor.cs      | 26 +++++++++++--------
 .../Scripts/Extensions/UnityXR/UnityXRHand.cs | 10 +++----
 Samples.meta                                  |  8 ------
 3 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 Samples.meta

diff --git a/Editor/HumanoidControl/Extensions/UnityXR/UnityXR_Editor.cs b/Editor/HumanoidControl/Extensions/UnityXR/UnityXR_Editor.cs
index 5e3fe2c..deb8e76 100644
--- a/Editor/HumanoidControl/Extensions/UnityXR/UnityXR_Editor.cs
+++ b/Editor/HumanoidControl/Extensions/UnityXR/UnityXR_Editor.cs
@@ -62,19 +62,23 @@ namespace Passer.Humanoid {
             }
 
             protected virtual void CheckQuestManifest() {
-                string manifestPath = Application.dataPath + "/Plugins/Android/AndroidManifest.xml";
-                FileInfo fileInfo = new FileInfo(manifestPath);
-                fileInfo.Directory.Create();
-                bool manifestAvailable = File.Exists(manifestPath);
-                if (manifestAvailable)
+                try {
+                    string manifestPath = Application.dataPath + "/Plugins/Android/AndroidManifest.xml";
+                    FileInfo fileInfo = new FileInfo(manifestPath);
+                    fileInfo.Directory.Create();
+                    bool manifestAvailable = File.Exists(manifestPath);
+                    if (manifestAvailable)
+                        return;
+
+                    string humanoidPath = Configuration_Editor.FindHumanoidFolder();
+                    string questManifestPath = Application.dataPath + humanoidPath + "Extensions/Oculus/QuestManifest.xml";
+                    File.Copy(questManifestPath, manifestPath);
+                }
+                catch (System.Exception _) {
                     return;
-
-                string humanoidPath = Configuration_Editor.FindHumanoidFolder();
-                string questManifestPath = Application.dataPath + humanoidPath + "Extensions/Oculus/QuestManifest.xml";
-                File.Copy(questManifestPath, manifestPath);
+                }
             }
 
-
             protected void ViveHandTrackingInspector(HumanoidControl humanoid) {
 #if hVIVEHAND
                 GUIContent labelText = new GUIContent(
@@ -146,7 +150,7 @@ namespace Passer.Humanoid {
             public HandTargetProps(SerializedObject serializedObject, HandTarget handTarget)
                 : base(serializedObject, handTarget.unityXR, handTarget, "unityXR") {
 
-                controllerProp = serializedObject.FindProperty("unityXR.controller");
+                controllerProp = serializedObject.FindProperty("unityXR.sensorComponent");
             }
 
             public override void Inspector() {
diff --git a/Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXRHand.cs b/Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXRHand.cs
index 8f3c7bc..81982c0 100644
--- a/Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXRHand.cs
+++ b/Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXRHand.cs
@@ -8,7 +8,7 @@ namespace Passer.Humanoid {
 #if pUNITYXR
         public override string name => "Unity XR";
 
-        public override HumanoidTracker tracker => humanoid.unityXR;
+        public new UnityXRTracker tracker => humanoid.unityXR;
         protected UnityXR unityXR => humanoid.unityXR.trackerComponent as UnityXR;
 
         #region Manage
@@ -72,12 +72,12 @@ namespace Passer.Humanoid {
             SetSensor2Target();
 
 #if UNITY_ANDROID && hOCHAND
-            if (unityXR.oculusHandTracking)
-                handSkeleton = OculusHandSkeleton.Get(unityXR.trackerComponent.transform, handTarget.isLeft);
+            if (tracker.oculusHandTracking)
+                handSkeleton = OculusHandSkeleton.Get(unityXR.transform, handTarget.isLeft);
 #endif
 #if hVIVEHAND
-            if (unityXR.viveHandTracking)
-                handSkeleton = ViveHandSkeleton.Get(unityXR.trackerComponent.transform, handTarget.isLeft);
+            if (tracker.viveHandTracking)
+                handSkeleton = ViveHandSkeleton.Get(unityXR.transform, handTarget.isLeft);
 #endif
         }
 
diff --git a/Samples.meta b/Samples.meta
deleted file mode 100644
index 9783454..0000000
--- a/Samples.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 915fef2fbd335ba4bb0f1d9d5e983783
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: