Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated MRTK3's minimum supported XRI version XRI 2.3 #11452

Merged
merged 11 commits into from
Apr 6, 2023
Merged

Updated MRTK3's minimum supported XRI version XRI 2.3 #11452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e48f183
Add TransformExtensions class
shaynie Mar 22, 2023
1c2971d
Add TransformExtension class and unit tests
shaynie Mar 28, 2023
cb15cbd
Merge branch 'microsoft:mrtk3' into mrtk3
shaynie Mar 28, 2023
3eb7886
Fix comment new line, change test method names to resemble exiting un…
shaynie Mar 28, 2023
b405e20
Merge branch 'mrtk3' of https://github.com/shaynie/MixedRealityToolki…
shaynie Mar 28, 2023
90cf268
Add GetChildRecursiveTest
shaynie Mar 28, 2023
1f5a4c0
Move comment to line above code
shaynie Mar 28, 2023
4e90634
Upgrade to XRI 2.3
shaynie Apr 6, 2023
f833353
Merge branch 'mrtk3' of https://github.com/shaynie/MRTKFork into user…
shaynie Apr 6, 2023
46d71ba
Merge branch 'mrtk3' into user/shaynie/xri2.3
shaynie Apr 6, 2023
ec40f31
Fix sporadically failing unit tests
shaynie Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UnityProjects/MRTKDevTemplate/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arcore": "4.1.12",
"com.unity.xr.interaction.toolkit": "2.2.0",
"com.unity.xr.interaction.toolkit": "2.3.0",
"com.unity.xr.management": "4.2.1",
"com.unity.xr.openxr": "1.6.0",
"com.unity.modules.ai": "1.0.0",
Expand Down
11 changes: 6 additions & 5 deletions UnityProjects/MRTKDevTemplate/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.core-utils": {
"version": "2.1.0",
"version": "2.2.0",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -402,14 +402,15 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.2.0",
"version": "2.3.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.3.0",
"com.unity.inputsystem": "1.4.4",
"com.unity.mathematics": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.xr.core-utils": "2.2.0",
"com.unity.xr.legacyinputhelpers": "2.1.10",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.physics": "1.0.0"
Expand Down
2 changes: 2 additions & 0 deletions com.microsoft.mrtk.input/Tests/Runtime/BasicInputTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ public IEnumerator InteractableDisabledDuringInteraction()
yield return rightHand.Show(InputTestUtilities.InFrontOfUser());

yield return rightHand.MoveTo(cube.transform.position);
yield return RuntimeTestUtilities.WaitForUpdates();
yield return rightHand.SetHandshape(HandshapeId.Pinch);
yield return RuntimeTestUtilities.WaitForUpdates();

Expand Down Expand Up @@ -515,6 +516,7 @@ public IEnumerator UntrackedControllerNearInteractions()

// First ensure that the interactor can interact with a cube normally
yield return rightHand.MoveTo(cube.transform.position);
yield return RuntimeTestUtilities.WaitForUpdates();
yield return rightHand.SetHandshape(HandshapeId.Pinch);
yield return RuntimeTestUtilities.WaitForUpdates();

Expand Down
3 changes: 2 additions & 1 deletion com.microsoft.mrtk.uxcomponents.noncanvas/Tests/Runtime/SliderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ public IEnumerator TestAssembleTouchNoSnapSlider()
Assert.AreEqual(0.5f, slider.Value, "Slider shouldn't have snapped to the finger point when SnapToPosition = false");

yield return rightHand.MoveTo(Vector3.zero, 60);
yield return RuntimeTestUtilities.WaitForUpdates();

Vector3 middlePoint = Vector3.Lerp(slider.SliderStart.position, slider.SliderEnd.position, 0.5f);
yield return rightHand.MoveTo(middlePoint, 60);
Expand All @@ -379,7 +380,7 @@ public IEnumerator TestAssembleTouchNoSnapSlider()
interactionUpdated = false;

yield return rightHand.MoveTo(firstPoint, 60);
yield return RuntimeTestUtilities.WaitForUpdates();
yield return RuntimeTestUtilities.WaitForFixedUpdates(frameCount:40);

Assert.IsTrue(slider.IsPokeSelected, "Slider should still be poked.");
Assert.IsTrue(interactionUpdated, "Slider didn't invoke OnValueUpdated when we dragged the handle");
Expand Down