fix(proxyHandModule): Fix for redundant hand/finger view models

jorgejgnz · Nov 22, 2020 · 6cefe80 · 6cefe80
1 parent ba428a0
commit 6cefe80
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/Runtime/Modules/ProxyHand/ProxyHandController.cs b/Runtime/Modules/ProxyHand/ProxyHandController.cs
@@ -49,6 +49,7 @@ private void Update()
         {
             if (model.configuration != null)
             {
+                /*
                 for (int h = 0; h < model.hands.Length; h++)
                 {
                     if (model.hands[h] == model.master && !model.updateValuesForMaster)
@@ -62,6 +63,10 @@ private void Update()
 
                     UpdateHand(model.hands[h], viewModel.hands[h], model.configuration);
                 }
+                */
+
+                UpdateHand(model.master, viewModel.master, model.configuration);
+                UpdateHand(model.slave, viewModel.slave, model.configuration);
 
                 if (model.slave)
                 {

diff --git a/Runtime/Modules/ProxyHand/ProxyHandHandler.cs b/Runtime/Modules/ProxyHand/ProxyHandHandler.cs
@@ -77,7 +77,19 @@ HandViewModel[] GetHandViewModelsArray()
                 for (int h = 0; h < model.hands.Length; h++)
                 {
                     if (model.hands[h] != null)
-                        handViewModelsList.Add(new HandViewModel(model.hands[h]));
+                    {
+                        if (model.hands[h] == model.master)
+                            handViewModelsList.Add(master);
+
+                        else if (model.hands[h] == model.slave)
+                            handViewModelsList.Add(slave);
+
+                        else if (model.hands[h] == model.ghost)
+                            handViewModelsList.Add(ghost);
+
+                        else
+                            handViewModelsList.Add(new HandViewModel(model.hands[h]));
+                    }
                 }
 
                 return handViewModelsList.ToArray();
@@ -227,7 +239,25 @@ FingerViewModel[] GetFingerViewModelsArray()
                 for (int f = 0; f < model.fingers.Length; f++)
                 {
                     if (model.fingers[f] != null)
-                        fingerViewModelsList.Add(new FingerViewModel(model.fingers[f]));
+                    {
+                        if (model.fingers[f] == model.thumb)
+                            fingerViewModelsList.Add(thumb);
+
+                        else if (model.fingers[f] == model.index)
+                            fingerViewModelsList.Add(index);
+
+                        else if (model.fingers[f] == model.middle)
+                            fingerViewModelsList.Add(middle);
+
+                        else if (model.fingers[f] == model.ring)
+                            fingerViewModelsList.Add(ring);
+
+                        else if (model.fingers[f] == model.pinky)
+                            fingerViewModelsList.Add(pinky);
+
+                        else
+                            fingerViewModelsList.Add(new FingerViewModel(model.fingers[f]));
+                    }
                 }
 
                 return fingerViewModelsList.ToArray();