Skip to content

Commit ad0d46e

Browse files
authored
Added updateCameraTag option to WebXRCamera
1 parent 19ae430 commit ad0d46e

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

Packages/webxr/Runtime/Scripts/WebXRCamera.cs

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ public enum CameraID
1414
RightAR
1515
}
1616

17+
private static readonly string mainCameraTag = "MainCamera";
18+
private static readonly string untaggedTag = "Untagged";
19+
1720
[SerializeField]
1821
private Camera cameraMain = null, cameraL = null, cameraR = null, cameraARL = null, cameraARR = null;
1922
[SerializeField]
@@ -26,6 +29,9 @@ public enum CameraID
2629

2730
private bool hasFollower = false;
2831

32+
[SerializeField]
33+
private bool updateCameraTag = false;
34+
2935
private void OnEnable()
3036
{
3137
WebXRManager.OnXRChange += OnXRChange;
@@ -60,10 +66,12 @@ private void SwitchXRState()
6066
cameraARL.rect = leftRect;
6167
cameraARR.enabled = viewsCount > 1;
6268
cameraARR.rect = rightRect;
63-
64-
cameraMain.tag = "Untagged";
65-
cameraL.tag = "Untagged";
66-
cameraARL.tag = "MainCamera";
69+
if (updateCameraTag)
70+
{
71+
cameraMain.tag = untaggedTag;
72+
cameraL.tag = untaggedTag;
73+
cameraARL.tag = mainCameraTag;
74+
}
6775
break;
6876
case WebXRState.VR:
6977
cameraMain.enabled = false;
@@ -73,21 +81,25 @@ private void SwitchXRState()
7381
cameraR.rect = rightRect;
7482
cameraARL.enabled = false;
7583
cameraARR.enabled = false;
76-
77-
cameraMain.tag = "Untagged";
78-
cameraARL.tag = "Untagged";
79-
cameraL.tag = "MainCamera";
84+
if (updateCameraTag)
85+
{
86+
cameraMain.tag = untaggedTag;
87+
cameraL.tag = mainCameraTag;
88+
cameraARL.tag = untaggedTag;
89+
}
8090
break;
8191
case WebXRState.NORMAL:
8292
cameraMain.enabled = true;
8393
cameraL.enabled = false;
8494
cameraR.enabled = false;
8595
cameraARL.enabled = false;
8696
cameraARR.enabled = false;
87-
88-
cameraL.tag = "Untagged";
89-
cameraARL.tag = "Untagged";
90-
cameraMain.tag = "MainCamera";
97+
if (updateCameraTag)
98+
{
99+
cameraMain.tag = mainCameraTag;
100+
cameraL.tag = untaggedTag;
101+
cameraARL.tag = untaggedTag;
102+
}
91103
break;
92104
}
93105
}

0 commit comments

Comments
 (0)