fix(automaticHandSetup): Automatic rig mapping once slave fingers arr…

…ay is reordered
jorgejgnz · Oct 26, 2020 · b6d9ffd · b6d9ffd
1 parent 3277be8
commit b6d9ffd
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 19 deletions.
diff --git a/Runtime/Components/AutomaticHandSetup.cs b/Runtime/Components/AutomaticHandSetup.cs
@@ -533,20 +533,6 @@ void SetupSlaveHandModel(SlaveHandModel handModel, Transform slaveWrist)
                 SlaveBoneModel slaveBone = boneModelObj.AddComponent<SlaveBoneModel>();
                 slaveBone.transformRef = fingerTransforms[b];
 
-                /* SLAVE BONE MODEL SPECIFIC
-                 */
-
-                // Simple automatic rig mapping
-                if (f > handModel.proxyHand.master.fingers.Length - 1)
-                    Debug.LogError("Trying to access a non-existing finger!");
-                else if (b > handModel.proxyHand.master.fingers[f].bones.Length - 1)
-                    Debug.LogError("Trying to access a non-existing bone!");
-                else if (handModel.proxyHand.master.fingers[f] != null && handModel.proxyHand.master.fingers[f].bones[b] != null)
-                    slaveBone.masterBone = handModel.proxyHand.master.fingers[f].bones[b] as MasterBoneModel;
-
-                /* 
-                */
-
                 bones.Add(slaveBone);
             }
 
@@ -607,6 +593,32 @@ void SetupSlaveHandModel(SlaveHandModel handModel, Transform slaveWrist)
         if (handModel.pinky) fingers.Add(handModel.pinky);
 
         handModel.fingers = fingers.ToArray();
+
+        // Operations that depends on having master.fingers and slave.fingers in the correct order
+        for (f = 0; f < handModel.fingers.Length; f++)
+        {
+            for (int b = 0; b < handModel.fingers[f].bones.Length; b++)
+            {
+                /* SLAVE BONE MODEL SPECIFIC
+                */
+
+                SlaveBoneModel slaveBone = handModel.fingers[f].bones[b] as SlaveBoneModel;
+
+                // Simple automatic rig mapping
+                if (f > handModel.proxyHand.master.fingers.Length - 1)
+                    Debug.LogError("Trying to access a non-existing finger!");
+
+                else if (b > handModel.proxyHand.master.fingers[f].bones.Length - 1)
+                    Debug.LogError("Trying to access a non-existing bone!");
+
+                else if (handModel.proxyHand.master.fingers[f] != null && handModel.proxyHand.master.fingers[f].bones[b] != null)
+                    slaveBone.masterBone = handModel.proxyHand.master.fingers[f].bones[b] as MasterBoneModel;
+
+                /* 
+                */
+            }
+        }
+
     }
 
     void SetupGhostHandModel(HandModel handModel, Transform ghostWrist)

diff --git a/Runtime/Debug/FromHandToArmature.cs b/Runtime/Debug/FromHandToArmature.cs
@@ -11,10 +11,18 @@
 public class FromHandToArmature : MonoBehaviour
 {
     public bool onDrawGizmos = true;
+    public bool onUpdate = true;
+
     public HandModel hand;
 
     public Space space;
 
+    void Update()
+    {
+        if (onUpdate)
+            ApplyToArmature();
+    }
+
     public void ApplyToArmature()
     {
         if (!hand)
@@ -75,7 +83,7 @@ public void ApplyToArmature()
 
     private void OnDrawGizmos()
     {
-        if (!onDrawGizmos)
+        if (!onDrawGizmos || onUpdate)
             return;
 
         ApplyToArmature();

diff --git a/Runtime/Modules/Avatar/AvatarController.cs b/Runtime/Modules/Avatar/AvatarController.cs
@@ -26,7 +26,7 @@ private void Start()
 
         private void Update()
         {
-            if (model.followsCamera && core.model.trackedCamera)
+            if (model.followsCamera && core.model.trackedCamera && model.headSight)
             {
                 model.headSight.position = core.model.trackedCamera.position;
                 model.headSight.rotation = core.model.trackedCamera.rotation;

diff --git a/Runtime/Modules/Avatar/AvatarModel.cs b/Runtime/Modules/Avatar/AvatarModel.cs
@@ -43,11 +43,14 @@ public class AvatarModel : HPTKModel
         private void Awake()
         {
             // Array
-            hands = new ProxyHandModel[2] { leftHand, rightHand };
+            List<ProxyHandModel> handsList = new List<ProxyHandModel>();
+            if (leftHand) handsList.Add(leftHand);
+            if (rightHand) handsList.Add(rightHand);
+            hands = handsList.ToArray();
 
             // Shoulder tips
-            leftHand.shoulderTip = shoulderLeft;
-            rightHand.shoulderTip = shoulderRight;
+            if (leftHand) leftHand.shoulderTip = shoulderLeft;
+            if (rightHand) rightHand.shoulderTip = shoulderRight;
 
             // Referrences to parent
             for (int i = 0; i < hands.Length; i++)