Skip to content

Commit

Permalink
Merge pull request #1622 from ultraleap/feature/UNITY-1505/UNITY-1506…
Browse files Browse the repository at this point in the history
…_RemoveDetectionUtilities

Feature/unity 1505/unity 1506 remove detection utilities
  • Loading branch information
MattGrayUL authored May 31, 2024
2 parents 70ff9d3 + 63e57eb commit 93f9580
Show file tree
Hide file tree
Showing 24 changed files with 253 additions and 1,907 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ namespace Leap.Unity.Preview.Locomotion
/// <summary>
/// Used in conjunction with JumpGemTeleport, a Jump Gem can be pinched, aimed and released in order to teleport
/// </summary>
[RequireComponent(typeof(LightweightPinchDetector))]
[RequireComponent(typeof(PinchDetector))]
public class JumpGem : MonoBehaviour
{
#region Editor Settings

public LeapProvider leapProvider;

[SerializeField, Header("Pinch")]
protected LightweightPinchDetector _pinchDetector = null;
public LightweightPinchDetector PinchDetector => _pinchDetector;
protected PinchDetector _pinchDetector = null;
public PinchDetector PinchDetector => _pinchDetector;

[SerializeField, Tooltip("This dictates the required pinch value and overall size of the visual elements used. " +
"This value is a radius and will be used *0.5 on visual items.")]
Expand Down Expand Up @@ -619,7 +619,7 @@ private void OnValidate()

if (_pinchDetector == null)
{
_pinchDetector = GetComponent<LightweightPinchDetector>();
_pinchDetector = GetComponent<PinchDetector>();
}
if (_pinchDetector != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class PinchToTeleport : TeleportActionBase
private IsFacingObject _isFacingObject;

[SerializeField]
private LightweightPinchDetector _pinchDetector;
private PinchDetector _pinchDetector;

[Tooltip("The chirality which will be used for pinch to teleport. This will update the chirality in the pinch detector and hand ray.")]
public Chirality chirality;
Expand Down Expand Up @@ -194,7 +194,7 @@ private void OnValidate()

if (_pinchDetector == null)
{
_pinchDetector = GetComponentInChildren<LightweightPinchDetector>(true);
_pinchDetector = GetComponentInChildren<PinchDetector>(true);
}
}
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 93f9580

Please sign in to comment.