Skip to content

Commit 77410be

Browse files
committed
transform.SetPositionAndRotation is always available these days
1 parent 4498f06 commit 77410be

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -587,26 +587,26 @@ protected virtual void SetLocalTransform(Vector3 newPosition, Quaternion newRota
587587
var positionValid = m_IgnoreTrackingState || (m_CurrentTrackingState & TrackingStates.Position) != 0;
588588
var rotationValid = m_IgnoreTrackingState || (m_CurrentTrackingState & TrackingStates.Rotation) != 0;
589589

590-
#if HAS_SET_LOCAL_POSITION_AND_ROTATION
591-
if (m_TrackingType == TrackingType.RotationAndPosition && rotationValid && positionValid)
590+
switch (m_TrackingType)
592591
{
593-
transform.SetLocalPositionAndRotation(newPosition, newRotation);
594-
return;
595-
}
596-
#endif
597-
598-
if (rotationValid &&
599-
(m_TrackingType == TrackingType.RotationAndPosition ||
600-
m_TrackingType == TrackingType.RotationOnly))
601-
{
602-
transform.localRotation = newRotation;
603-
}
604-
605-
if (positionValid &&
606-
(m_TrackingType == TrackingType.RotationAndPosition ||
607-
m_TrackingType == TrackingType.PositionOnly))
608-
{
609-
transform.localPosition = newPosition;
592+
case TrackingType.RotationAndPosition:
593+
if (rotationValid && positionValid)
594+
transform.SetLocalPositionAndRotation(newPosition, newRotation);
595+
else if (rotationValid)
596+
transform.localRotation = newRotation;
597+
else
598+
transform.localPosition = newPosition;
599+
break;
600+
601+
case TrackingType.PositionOnly:
602+
if (positionValid)
603+
transform.localPosition = newPosition;
604+
break;
605+
606+
case TrackingType.RotationOnly:
607+
if (rotationValid)
608+
transform.localRotation = newRotation;
609+
break;
610610
}
611611
}
612612

Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,6 @@
5252
"expression": "1.0.0",
5353
"define": "UNITY_INPUT_SYSTEM_ENABLE_UI"
5454
},
55-
{
56-
"name": "Unity",
57-
"expression": "[2021.3.11,2022.1)",
58-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
59-
},
60-
{
61-
"name": "Unity",
62-
"expression": "[2022.1.19,2022.2)",
63-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
64-
},
65-
{
66-
"name": "Unity",
67-
"expression": "2022.2",
68-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
69-
},
7055
{
7156
"name": "Unity",
7257
"expression": "2022.3",

0 commit comments

Comments
 (0)