Skip to content

Commit c4bf328

Browse files
author
David Kline
authored
Merge pull request #9877 from CDiaz-MS/leap_4.8.0
Add support for the Leap Motion 4.8.0 Unity Modules
2 parents 687ea6b + 92288b3 commit c4bf328

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static class LeapMotionConfigurationChecker
3030
private static bool isLeapRecognizedByMRTK = false;
3131

3232
// The current supported Leap Core Assets version numbers.
33-
private static string[] leapCoreAssetsVersionsSupported = new string[] { "4.5.0", "4.5.1", "4.6.0", "4.7.0", "4.7.1" };
33+
private static string[] leapCoreAssetsVersionsSupported = new string[] { "4.5.0", "4.5.1", "4.6.0", "4.7.0", "4.7.1", "4.8.0" };
3434

3535
// The current Leap Core Assets version in this project
3636
private static string currentLeapCoreAssetsVersion = "";
@@ -132,7 +132,14 @@ private static void ConfigureLeapMotion(bool isLeapInProject)
132132

133133
if (isLeapCoreAssetsVersionSupported)
134134
{
135-
Debug.Log($"Integrating the Leap Motion Unity Modules Version {currentLeapCoreAssetsVersion} with MRTK");
135+
if (currentLeapCoreAssetsVersion == "4.7.1")
136+
{
137+
Debug.Log($"Integrating the Leap Motion Unity Modules Version {currentLeapCoreAssetsVersion} or 4.8.0 with MRTK");
138+
}
139+
else
140+
{
141+
Debug.Log($"Integrating the Leap Motion Unity Modules Version {currentLeapCoreAssetsVersion} with MRTK");
142+
}
136143

137144
RemoveTestingFolders();
138145
AddAndUpdateAsmDefs();
@@ -170,7 +177,7 @@ private static bool LeapCoreAssetsVersionSupport()
170177
{
171178
currentLeapCoreAssetsVersion = versionNumberSupported;
172179

173-
// 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
180+
// The Leap Motion Unity modules Version.txt has remained 4.5.1 across versions 4.6.0, 4.7.0, 4.7.1, and 4.8.0 check for the presence
174181
// of certain paths to infer the version number.
175182

176183
// This path is only present in 4.7.1
@@ -184,6 +191,9 @@ private static bool LeapCoreAssetsVersionSupport()
184191

185192
if (File.Exists(leap471Path))
186193
{
194+
// The Leap Motion Unity modules Core package version 4.7.1 is identical to the version 4.8.0
195+
// Core package. Due to the lack of differences between the two versions, the modules will be marked as 4.7.1 even
196+
// if they are version 4.8.0.
187197
currentLeapCoreAssetsVersion = "4.7.1";
188198
}
189199
else if (!File.Exists(leap471Path) && Directory.Exists(testDirectoryPath))

0 commit comments

Comments
 (0)