Skip to content

Commit 53b0df8

Browse files
fixed an issue with animations.
1 parent efacac6 commit 53b0df8

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Cursors/TeleportCursor.prefab

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Animator:
267267
m_PrefabParentObject: {fileID: 0}
268268
m_PrefabInternal: {fileID: 100100000}
269269
m_GameObject: {fileID: 1466073170848862}
270-
m_Enabled: 1
270+
m_Enabled: 0
271271
m_Avatar: {fileID: 9000000, guid: 6e9e603a0869edf45a8a4fea496c6d9b, type: 3}
272272
m_Controller: {fileID: 9100000, guid: 65931ac36f624f549a6fe2c27af849ab, type: 2}
273273
m_CullingMode: 0
@@ -341,11 +341,11 @@ MonoBehaviour:
341341
- name: Valid
342342
cursorState: 1
343343
parameter:
344-
parameterType: 0
344+
parameterType: 4
345345
defaultInt: 0
346346
defaultFloat: 0
347347
defaultBool: 0
348-
name:
348+
name: Valid
349349
inputEnabledParameter:
350350
parameterType: 0
351351
defaultInt: 0

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixed
8383
/// </summary>
8484
/// <remarks>This <see cref="GameObject"/> must have a <see cref="IMixedRealityCursor"/> attached to it.</remarks>
8585
/// <param name="newCursor"></param>
86-
public void SetCursor(GameObject newCursor = null)
86+
public virtual void SetCursor(GameObject newCursor = null)
8787
{
8888
if (cursorInstance != null)
8989
{

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ protected override void OnEnable()
7575
BaseCursor?.SetVisibility(false);
7676
}
7777

78+
/// <inheritdoc />
79+
public override void SetCursor(GameObject newCursor = null)
80+
{
81+
base.SetCursor(newCursor);
82+
BaseCursor?.SetVisibility(false);
83+
}
7884
#region IMixedRealityPointer Implementation
7985

8086
/// <inheritdoc />
@@ -287,22 +293,32 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
287293
/// <inheritdoc />
288294
public override void OnTeleportRequest(TeleportEventData eventData)
289295
{
296+
// Only turn off the pointer if we're not the one sending the request
290297
if (eventData.Pointer.PointerId == PointerId)
291298
{
299+
IsTeleportRequestActive = false;
292300
BaseCursor?.SetVisibility(true);
293301
}
302+
else
303+
{
304+
IsTeleportRequestActive = true;
305+
BaseCursor?.SetVisibility(false);
306+
}
294307
}
295308

296309
/// <inheritdoc />
297310
public override void OnTeleportStarted(TeleportEventData eventData)
298311
{
299-
base.OnTeleportStarted(eventData);
312+
// Turn off all pointers while we teleport.
313+
IsTeleportRequestActive = true;
314+
BaseCursor?.SetVisibility(false);
300315
}
301316

302317
/// <inheritdoc />
303318
public override void OnTeleportCompleted(TeleportEventData eventData)
304319
{
305320
IsTeleportRequestActive = false;
321+
BaseCursor?.SetVisibility(false);
306322
}
307323

308324
/// <inheritdoc />

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ MonoBehaviour:
3636
boundarySystemType:
3737
reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
3838
Microsoft.MixedReality.Toolkit.SDK
39-
enablePlatformBoundaryRendering: 1
39+
boundaryHeight: 3
40+
boundaryVisualizationProfile: {fileID: 11400000, guid: c1f4aa213e301a446aca3858e6f4ad17,
41+
type: 2}
4042
enableTeleportSystem: 1
4143
teleportSystemType:
4244
reference: Microsoft.MixedReality.Toolkit.SDK.Teleportation.MixedRealityTeleportManager,
4345
Microsoft.MixedReality.Toolkit.SDK
44-
boundaryVisualizationProfile: {fileID: 11400000, guid: c1f4aa213e301a446aca3858e6f4ad17,
45-
type: 2}
46+
teleportDuration: 0.25

0 commit comments

Comments
 (0)