Skip to content

Commit 5eceefa

Browse files
authored
Fix an OIP compatibility issue (#11212)
1 parent 79aa540 commit 5eceefa

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Assets/MRTK/Examples/Demos/UX/BoundingBox/Scripts/BoundingBoxExampleTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Text;
88
using TMPro;
99
using UnityEngine;
10+
using MRTKObjectManipulator = Microsoft.MixedReality.Toolkit.UI.ObjectManipulator;
1011

1112
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
1213
{
@@ -64,7 +65,7 @@ private IEnumerator Sequence()
6465
bbox.HideElementsInInspector = false;
6566
bbox.BoundingBoxActivation = BoundingBox.BoundingBoxActivationType.ActivateOnStart;
6667
var cm = cube.AddComponent<ConstraintManager>();
67-
var om = cube.AddComponent<ObjectManipulator>();
68+
var om = cube.AddComponent<MRTKObjectManipulator>();
6869
yield return WaitForSpeechCommand();
6970

7071
SetStatus("Set Target bounds override");

Assets/MRTK/Examples/Demos/UX/BoundsControl/Scripts/BoundsControlRuntimeExample.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Text;
1010
using TMPro;
1111
using UnityEngine;
12+
using MRTKObjectManipulator = Microsoft.MixedReality.Toolkit.UI.ObjectManipulator;
1213

1314
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
1415
{
@@ -68,7 +69,7 @@ private IEnumerator Sequence()
6869
boundsControl.HideElementsInInspector = false;
6970
boundsControl.BoundsControlActivation = BoundsControlActivationType.ActivateOnStart;
7071
var cm = cube.AddComponent<ConstraintManager>();
71-
var om = cube.AddComponent<ObjectManipulator>();
72+
var om = cube.AddComponent<MRTKObjectManipulator>();
7273
yield return WaitForSpeechCommand();
7374

7475
SetStatus("Set Target bounds override");

Assets/MRTK/Examples/Demos/UX/ManipulationHandler/Scripts/ChangeManipulation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using Microsoft.MixedReality.Toolkit.UI;
55
using UnityEngine;
6+
using MRTKObjectManipulator = Microsoft.MixedReality.Toolkit.UI.ObjectManipulator;
67

78
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
89
{
@@ -41,7 +42,7 @@ public void TryStopManipulation()
4142

4243
manipulatedObject.GetComponent<ConstraintManager>();
4344
var manipulationHandler = manipulatedObject.GetComponent<ManipulationHandler>();
44-
var objectManipulator = manipulatedObject.GetComponent<ObjectManipulator>();
45+
var objectManipulator = manipulatedObject.GetComponent<MRTKObjectManipulator>();
4546
if (manipulationHandler != null || objectManipulator != null)
4647
{
4748
if (manipulationHandler != null)

0 commit comments

Comments
 (0)