Merge pull request #9494 from CDiaz-MS/leap_4.6.0

Leap Motion Unity Modules Support for version 4.6.0, 4.7.0 and 4.7.1

Author: CDiaz-MS

Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionConfigurationChecker.cs

@@ -30,14 +30,23 @@ static class LeapMotionConfigurationChecker
         private static bool isLeapRecognizedByMRTK = false;
 
         // The current supported Leap Core Assets version numbers.
-        private static string[] leapCoreAssetsVersionsSupported = new string[] { "4.5.0", "4.5.1" };
+        private static string[] leapCoreAssetsVersionsSupported = new string[] { "4.5.0", "4.5.1", "4.6.0", "4.7.0", "4.7.1" };
 
         // The current Leap Core Assets version in this project
         private static string currentLeapCoreAssetsVersion = "";
 
         // The path difference between the root of assets and the root of the Leap Motion Core Assets.
         private static string pathDifference = "";
 
+        // The Leap Unity Modules version 4.7.1 already contains a LeapMotion.asmdef file at this path
+        private static string leapAsmDefPath_471 = "LeapMotion/Core/Scripts/LeapMotion.asmdef";
+
+        // This path is used to determine if the Leap Motion Unity Modules is version 4.7.0
+        private static string leapTestsPath_470 = "LeapMotion/Core/Editor/Tests";
+
+        // This path is used to determine if the Leap Motion Unity Modules is version 4.6.0 or 4.5.1
+        private static string leapXRPath_460 = "LeapMotion/Core/Scripts/XR/LeapXRPinchLocomotion.cs";
+
         // Array of paths to Leap Motion testing directories that will be removed from the project.
         // Make sure each test directory ends with '/'
         // These paths only need to be deleted if the Leap Core Assets version is 4.4.0
@@ -123,6 +132,8 @@ private static void ConfigureLeapMotion(bool isLeapInProject)
 
                 if (isLeapCoreAssetsVersionSupported)
                 {
+                    Debug.Log($"Integrating the Leap Motion Unity Modules Version {currentLeapCoreAssetsVersion} with MRTK");
+
                     RemoveTestingFolders();
                     AddAndUpdateAsmDefs();
                     AddLeapEditorAsmDefs();
@@ -158,6 +169,32 @@ private static bool LeapCoreAssetsVersionSupport()
                         if (line.Contains(versionNumberSupported))
                         {
                             currentLeapCoreAssetsVersion = versionNumberSupported;
+
+                            // The Leap Motion Unity modules Version.txt has remained 4.5.1 across versions 4.6.0, 4.7.0 and 4.7.1, check for the presence
+                            // of certain paths to infer the version number.
+
+                            // This path is only present in 4.7.1
+                            string leap471Path = Path.Combine(Application.dataPath, pathDifference, leapAsmDefPath_471);
+
+                            // This path is present in versions 4.7.0 and 4.7.1
+                            string testDirectoryPath = Path.Combine(Application.dataPath, pathDifference, leapTestsPath_470);
+
+                            // This path is present in 4.6.0 and not 4.5.1
+                            string xrPath = Path.Combine(Application.dataPath, pathDifference, leapXRPath_460);
+
+                            if (File.Exists(leap471Path))
+                            {
+                                currentLeapCoreAssetsVersion = "4.7.1";
+                            }
+                            else if (!File.Exists(leap471Path) && Directory.Exists(testDirectoryPath))
+                            {
+                                currentLeapCoreAssetsVersion = "4.7.0";
+                            }
+                            else if (!File.Exists(leap471Path) && !Directory.Exists(testDirectoryPath) && File.Exists(xrPath))
+                            {
+                                currentLeapCoreAssetsVersion = "4.6.0";
+                            }
+
                             return true;
                         }
                     }
@@ -214,6 +251,12 @@ private static void AddAndUpdateAsmDefs()
         {
             string leapCoreAsmDefPath = Path.Combine(Application.dataPath, pathDifference, "LeapMotion", "LeapMotion.asmdef");
 
+            // If the Leap Unity Modules version is 4.7.1, the LeapMotion.asmdef file does not need to be created
+            if (currentLeapCoreAssetsVersion == "4.7.1")
+            {
+                return;
+            }
+
             // If the asmdef has already been created then do not create another one
             if (!File.Exists(leapCoreAsmDefPath))
             {
@@ -229,9 +272,14 @@ private static void AddAndUpdateAsmDefs()
 
                 // An assembly definition was added to the Leap Core Assets in version 4.5.1
                 // The LeapMotion.LeapCSharp assembly definition is added as a reference at the root of the Core Assets
-                if (currentLeapCoreAssetsVersion == "4.5.1")
+                if (currentLeapCoreAssetsVersion == "4.5.1" || currentLeapCoreAssetsVersion == "4.6.0" || currentLeapCoreAssetsVersion == "4.7.0")
                 {
                     leapAsmDef.AddReference("LeapMotion.LeapCSharp");
+
+                    // If the unity modules version is 4.6.0 or 4.7.0 then add SpatialTracking as a reference
+#if UNITY_2019_3_OR_NEWER
+                    leapAsmDef.AddReference("UnityEngine.SpatialTracking");
+#endif
                 }
 
                 leapAsmDef.Save(leapCoreAsmDefPath);
@@ -271,7 +319,7 @@ private static void AddLeapEditorAsmDefs()
                         };
 
                         // Add the LeapMotion.LeapCSharp assembly definition to the leap motion tests assembly definition
-                        if (currentLeapCoreAssetsVersion == "4.5.1" && leapAsmDef.Key == "LeapMotion.Core.Tests.Editor")
+                        if ((currentLeapCoreAssetsVersion == "4.5.1" || currentLeapCoreAssetsVersion == "4.6.0" || currentLeapCoreAssetsVersion == "4.7.0" || currentLeapCoreAssetsVersion == "4.7.1") && (leapAsmDef.Key == "LeapMotion.Core.Tests.Editor" || leapAsmDef.Key == "LeapMotion.Core.Editor"))
                         {
                             leapEditorAsmDef.AddReference("LeapMotion.LeapCSharp");
                         }