Merge pull request #6992 from HoloSpaces/mrtk_mappingLengthDifference

Added code to handle different mapping sizes

Author: keveleigh

Assets/MixedRealityToolkit/Definitions/Devices/MixedRealityControllerMapping.cs

@@ -140,43 +140,79 @@ internal void SetDefaultInteractionMapping(bool overwrite = false)
 
         internal bool UpdateInteractionSettingsFromDefault()
         {
+            if (interactions == null || interactions.Length == 0) { return false; }
+
+            MixedRealityInteractionMapping[] newDefaultInteractions = GetDefaultInteractionMappings();
+
+            if (newDefaultInteractions == null)
+            {
+                return false;
+            }
+
+            if (interactions.Length != newDefaultInteractions.Length)
+            {
+                interactions = CreateNewMatchedMapping(interactions, newDefaultInteractions);
+                return true;
+            }
+
             bool updatedMappings = false;
 
-            if (interactions?.Length > 0)
+            for (int i = 0; i < newDefaultInteractions.Length; i++)
             {
-                MixedRealityInteractionMapping[] newDefaultInteractions = GetDefaultInteractionMappings();
+                MixedRealityInteractionMapping currentMapping = interactions[i];
+                MixedRealityInteractionMapping currentDefaultMapping = newDefaultInteractions[i];
 
-                if (newDefaultInteractions == null)
+                if (Equals(currentMapping, currentDefaultMapping))
                 {
-                    return updatedMappings;
+                    interactions[i] = new MixedRealityInteractionMapping(currentDefaultMapping)
+                    {
+                        MixedRealityInputAction = currentMapping.MixedRealityInputAction
+                    };
+
+                    updatedMappings = true;
                 }
+            }
 
-                for (int i = 0; i < newDefaultInteractions.Length; i++)
+            return updatedMappings;
+        }
+
+        private MixedRealityInteractionMapping[] CreateNewMatchedMapping(MixedRealityInteractionMapping[] interactions, MixedRealityInteractionMapping[] newDefaultInteractions)
+        {
+            MixedRealityInteractionMapping[] newDefaultMapping = new MixedRealityInteractionMapping[newDefaultInteractions.Length];
+
+            for (int i = 0; i < newDefaultInteractions.Length; i++)
+            {
+                for (int j = 0; j < interactions.Length; j++)
                 {
-                    MixedRealityInteractionMapping currentMapping = interactions[i];
-                    MixedRealityInteractionMapping currentDefaultMapping = newDefaultInteractions[i];
-
-                    if (currentMapping.Id != currentDefaultMapping.Id ||
-                        currentMapping.Description != currentDefaultMapping.Description ||
-                        currentMapping.AxisType != currentDefaultMapping.AxisType ||
-                        currentMapping.InputType != currentDefaultMapping.InputType ||
-                        currentMapping.KeyCode != currentDefaultMapping.KeyCode ||
-                        currentMapping.AxisCodeX != currentDefaultMapping.AxisCodeX ||
-                        currentMapping.AxisCodeY != currentDefaultMapping.AxisCodeY ||
-                        currentMapping.InvertXAxis != currentDefaultMapping.InvertXAxis ||
-                        currentMapping.InvertYAxis != currentDefaultMapping.InvertYAxis)
+                    if (Equals(interactions[j], newDefaultInteractions[i]))
                     {
-                        interactions[i] = new MixedRealityInteractionMapping(currentDefaultMapping)
+                        newDefaultMapping[i] = new MixedRealityInteractionMapping(newDefaultInteractions[i])
                         {
-                            MixedRealityInputAction = currentMapping.MixedRealityInputAction
+                            MixedRealityInputAction = interactions[j].MixedRealityInputAction
                         };
-
-                        updatedMappings = true;
+                        break;
                     }
                 }
+
+                if (newDefaultMapping[i] == null)
+                {
+                    newDefaultMapping[i] = new MixedRealityInteractionMapping(newDefaultInteractions[i]);
+                }
             }
 
-            return updatedMappings;
+            return newDefaultMapping;
+        }
+
+        private bool Equals(MixedRealityInteractionMapping a, MixedRealityInteractionMapping b)
+        {
+            return !(a.Description != b.Description ||
+                        a.AxisType != b.AxisType ||
+                        a.InputType != b.InputType ||
+                        a.KeyCode != b.KeyCode ||
+                        a.AxisCodeX != b.AxisCodeX ||
+                        a.AxisCodeY != b.AxisCodeY ||
+                        a.InvertXAxis != b.InvertXAxis ||
+                        a.InvertYAxis != b.InvertYAxis);
         }
 
         private MixedRealityInteractionMapping[] GetDefaultInteractionMappings()