Skip to content

Teleport.cs: Check for existence of controllers before accessing them #906

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

Open
docquantum wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Teleport.cs: Check for existence of controllers before accessing them #906

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0be55c
Teleport.cs: Check for existence of controllers before accessing them
docquantum Feb 3, 2021
d479c8f
Teleport.cs: Fix whitespace discrepency
docquantum Feb 4, 2021
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
14 changes: 7 additions & 7 deletions Assets/SteamVR/InteractionSystem/Teleport/Scripts/Teleport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ private void PlayAudioClip( AudioSource source, AudioClip clip )
//-------------------------------------------------
private void PlayPointerHaptic( bool validLocation )
{
if ( pointerHand != null )
if ( pointerHand != null && pointerHand.noSteamVRFallbackCamera == null )
{
if ( validLocation )
{
Expand Down Expand Up @@ -895,12 +895,12 @@ private void TeleportPlayer()
{
Vector3 playerFeetOffset = player.trackingOriginTransform.position - player.feetPositionGuess;
player.trackingOriginTransform.position = teleportPosition + playerFeetOffset;

if (player.leftHand.currentAttachedObjectInfo.HasValue)
player.leftHand.ResetAttachedTransform(player.leftHand.currentAttachedObjectInfo.Value);
if (player.rightHand.currentAttachedObjectInfo.HasValue)
player.rightHand.ResetAttachedTransform(player.rightHand.currentAttachedObjectInfo.Value);
}
if (player.leftHand != null && player.leftHand.currentAttachedObjectInfo.HasValue)
player.leftHand.ResetAttachedTransform(player.leftHand.currentAttachedObjectInfo.Value);
if (player.rightHand != null && player.rightHand.currentAttachedObjectInfo.HasValue)
player.rightHand.ResetAttachedTransform(player.rightHand.currentAttachedObjectInfo.Value);
}
else
{
teleportingToMarker.TeleportPlayer( pointedAtPosition );
Expand Down