Merge pull request #3584 from Alexees/mrtk_teleportpointer

keveleigh · web-flow · commit d2b83decd56f · 2019-03-07T10:37:09.000-08:00
MRTK TeleportPointer
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
@@ -375,7 +375,6 @@ public override void OnTeleportRequest(TeleportEventData eventData)
             if (eventData.Pointer.PointerId == PointerId)
             {
                 IsTeleportRequestActive = false;
-                BaseCursor?.SetVisibility(true);
             }
             else
             {
@@ -384,14 +383,6 @@ public override void OnTeleportRequest(TeleportEventData eventData)
             }
         }
 
-        /// <inheritdoc />
-        public override void OnTeleportStarted(TeleportEventData eventData)
-        {
-            // Turn off all pointers while we teleport.
-            IsTeleportRequestActive = true;
-            BaseCursor?.SetVisibility(false);
-        }
-
         /// <inheritdoc />
         public override void OnTeleportCompleted(TeleportEventData eventData)
         {

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,6 @@ public override void OnTeleportRequest(TeleportEventData eventData)`
`375`	`375`	`if (eventData.Pointer.PointerId == PointerId)`
`376`	`376`	`{`
`377`	`377`	`IsTeleportRequestActive = false;`
`378`		`- BaseCursor?.SetVisibility(true);`
`379`	`378`	`}`
`380`	`379`	`else`
`381`	`380`	`{`
`@@ -384,14 +383,6 @@ public override void OnTeleportRequest(TeleportEventData eventData)`
`384`	`383`	`}`
`385`	`384`	`}`
`386`	`385`
`387`		`- /// <inheritdoc />`
`388`		`- public override void OnTeleportStarted(TeleportEventData eventData)`
`389`		`- {`
`390`		`- // Turn off all pointers while we teleport.`
`391`		`- IsTeleportRequestActive = true;`
`392`		`- BaseCursor?.SetVisibility(false);`
`393`		`- }`
`394`		`-`
`395`	`386`	`/// <inheritdoc />`
`396`	`387`	`public override void OnTeleportCompleted(TeleportEventData eventData)`
`397`	`388`	`{`