Skip to content

Commit 54e2c79

Browse files
De-PantherDe-Panther
authored
PR fix - indentation
1 parent eb70442 commit 54e2c79

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

‎Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void SetUseCollidersForHandJoints(bool value)
193193
{
194194
if (handModelJoints[i].TryGetComponent<Collider>(out var collider))
195195
{
196-
collider.enabled = useCollidersForHandJoints;
196+
collider.enabled = useCollidersForHandJoints;
197197
}
198198
}
199199
#endif
@@ -259,14 +259,14 @@ private void SetInputProfileModelPose(bool alwaysUseGrip)
259259
{
260260
#if UNITY_2022_3_OR_NEWER
261261
inputProfileModelParent.transform.SetLocalPositionAndRotation(alwaysUseGrip ? Vector3.zero : controller.gripPosition,
262-
alwaysUseGrip ? Quaternion.identity : controller.gripRotation);
262+
alwaysUseGrip ? Quaternion.identity : controller.gripRotation);
263263
#else
264264
inputProfileModelParent.transform.localPosition = alwaysUseGrip ? Vector3.zero : controller.gripPosition;
265265
inputProfileModelParent.transform.localRotation = alwaysUseGrip ? Quaternion.identity : controller.gripRotation;
266266
#endif
267-
}
267+
}
268268

269-
private void SetHandJointsVisible(bool visible)
269+
private void SetHandJointsVisible(bool visible)
270270
{
271271
if (handJointsVisible != visible)
272272
{
@@ -337,7 +337,7 @@ private void OnHandUpdate(WebXRHandData handData)
337337
handJoints[i].localPosition = rotationOffset * (handData.joints[i].position - handData.joints[0].position);
338338
handJoints[i].localRotation = rotationOffset * handData.joints[i].rotation;
339339
#endif
340-
if (handData.joints[i].radius != handJoints[i].localScale.x && handData.joints[i].radius > 0)
340+
if (handData.joints[i].radius != handJoints[i].localScale.x && handData.joints[i].radius > 0)
341341
{
342342
handJoints[i].localScale = new Vector3(handData.joints[i].radius, handData.joints[i].radius, handData.joints[i].radius);
343343
}

‎Packages/webxr-interactions/Runtime/Scripts/SceneHitTest.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ void Update()
7878
private void HandleOnXRChange(WebXRState state, int viewsCount, Rect leftRect, Rect rightRect)
7979
{
8080
#if UNITY_2022_3_OR_NEWER
81-
WebXRManager.Instance.transform.SetLocalPositionAndRotation(originPosition, originRotation);
81+
WebXRManager.Instance.transform.SetLocalPositionAndRotation(originPosition, originRotation);
8282
#else
83-
WebXRManager.Instance.transform.localPosition = originPosition;
83+
WebXRManager.Instance.transform.localPosition = originPosition;
8484
WebXRManager.Instance.transform.localRotation = originRotation;
8585
#endif
8686
isFollowing = false;
@@ -133,7 +133,6 @@ void FollowByViewRotation(WebXRHitPoseData hitPoseData)
133133
WebXRManager.Instance.transform.localPosition = rotationOffset * (originPosition - hitPoseData.position);
134134
WebXRManager.Instance.transform.localRotation = rotationOffset;
135135
#endif
136-
137-
}
138136
}
137+
}
139138
}

‎Packages/webxr/Runtime/Scripts/WebXRCamera.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private void UpdateFollower()
9191
case WebXRState.AR:
9292
#if UNITY_2022_3_OR_NEWER
9393
cameraFollower.SetLocalPositionAndRotation(viewsCount > 1 ? (cameraARL.transform.localPosition + cameraARR.transform.localPosition) * 0.5f : cameraARL.transform.localPosition,
94-
cameraARL.transform.localRotation);
94+
cameraARL.transform.localRotation);
9595
#else
9696
cameraFollower.localPosition = viewsCount > 1 ? (cameraARL.transform.localPosition + cameraARR.transform.localPosition) * 0.5f : cameraARL.transform.localPosition;
9797
cameraFollower.localRotation = cameraARL.transform.localRotation;
@@ -100,19 +100,19 @@ private void UpdateFollower()
100100
case WebXRState.VR:
101101
#if UNITY_2022_3_OR_NEWER
102102
cameraFollower.SetLocalPositionAndRotation((cameraL.transform.localPosition + cameraR.transform.localPosition) * 0.5f,
103-
cameraL.transform.localRotation);
103+
cameraL.transform.localRotation);
104104
#else
105105
cameraFollower.localPosition = (cameraL.transform.localPosition + cameraR.transform.localPosition) * 0.5f;
106106
cameraFollower.localRotation = cameraL.transform.localRotation;
107107
#endif
108108
return;
109109
}
110110
#if UNITY_2022_3_OR_NEWER
111-
cameraFollower.SetLocalPositionAndRotation(cameraMain.transform.localPosition,
112-
cameraMain.transform.localRotation);
111+
cameraFollower.SetLocalPositionAndRotation(cameraMain.transform.localPosition,
112+
cameraMain.transform.localRotation);
113113
#else
114-
cameraFollower.localRotation = cameraMain.transform.localRotation;
115-
cameraFollower.localPosition = cameraMain.transform.localPosition;
114+
cameraFollower.localRotation = cameraMain.transform.localRotation;
115+
cameraFollower.localPosition = cameraMain.transform.localPosition;
116116
#endif
117117
}
118118

@@ -178,7 +178,7 @@ private void OnHeadsetUpdate(
178178
Vector3 rightPosition)
179179
{
180180
if (xrState == WebXRState.VR)
181-
{
181+
{
182182
#if UNITY_2022_3_OR_NEWER
183183
cameraL.transform.SetLocalPositionAndRotation(leftPosition, leftRotation);
184184
#else
@@ -196,7 +196,7 @@ private void OnHeadsetUpdate(
196196
cameraR.projectionMatrix = rightProjectionMatrix;
197197
}
198198
else if (xrState == WebXRState.AR)
199-
{
199+
{
200200
#if UNITY_2022_3_OR_NEWER
201201
cameraARL.transform.SetLocalPositionAndRotation(leftPosition, leftRotation);
202202
#else

‎Packages/webxr/Runtime/Scripts/WebXRController.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
373373
{
374374
#if UNITY_2022_3_OR_NEWER
375375
transform.SetLocalPositionAndRotation(controllerData.rotation * (controllerData.position + controllerData.gripPosition),
376-
controllerData.rotation * controllerData.gripRotation);
376+
controllerData.rotation * controllerData.gripRotation);
377377
#else
378378
transform.localRotation = controllerData.rotation * controllerData.gripRotation;
379379
transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);
@@ -383,7 +383,7 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
383383
{
384384
#if UNITY_2022_3_OR_NEWER
385385
transform.SetLocalPositionAndRotation(controllerData.position,
386-
controllerData.rotation);
386+
controllerData.rotation);
387387
#else
388388
transform.localRotation = controllerData.rotation;
389389
transform.localPosition = controllerData.position;
@@ -440,7 +440,7 @@ private void HandleOculusLinkBug(WebXRControllerData controllerData)
440440
{
441441
#if UNITY_2022_3_OR_NEWER
442442
transform.SetLocalPositionAndRotation(controllerData.rotation * (controllerData.position + controllerData.gripPosition),
443-
controllerData.rotation * controllerData.gripRotation);
443+
controllerData.rotation * controllerData.gripRotation);
444444
#else
445445
transform.localRotation = controllerData.rotation * controllerData.gripRotation;
446446
transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);
@@ -450,7 +450,7 @@ private void HandleOculusLinkBug(WebXRControllerData controllerData)
450450
{
451451
#if UNITY_2022_3_OR_NEWER
452452
transform.SetLocalPositionAndRotation(controllerData.position,
453-
controllerData.rotation * oculusOffsetRay);
453+
controllerData.rotation * oculusOffsetRay);
454454
#else
455455
transform.localRotation = controllerData.rotation * oculusOffsetRay;
456456
transform.localPosition = controllerData.position;
@@ -490,7 +490,7 @@ private void OnHandUpdateInternal(WebXRHandData handData)
490490
SetHandActive(true);
491491
#if UNITY_2022_3_OR_NEWER
492492
transform.SetLocalPositionAndRotation(handData.joints[0].position,
493-
handData.joints[0].rotation);
493+
handData.joints[0].rotation);
494494
#else
495495
transform.localPosition = handData.joints[0].position;
496496
transform.localRotation = handData.joints[0].rotation;

0 commit comments

Comments
 (0)