Skip to content

Commit 7a18ce1

Browse files
authored
Merge pull request #282 from Lokarian/add_MainCamera_tag_to_currently_active_camera
add main camera tagging to the camera script
2 parents 2c2c766 + ad0d46e commit 7a18ce1

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

Packages/webxr/Runtime/Scripts/WebXRCamera.cs

Lines changed: 24 additions & 0 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,6 +66,12 @@ private void SwitchXRState()
6066
cameraARL.rect = leftRect;
6167
cameraARR.enabled = viewsCount > 1;
6268
cameraARR.rect = rightRect;
69+
if (updateCameraTag)
70+
{
71+
cameraMain.tag = untaggedTag;
72+
cameraL.tag = untaggedTag;
73+
cameraARL.tag = mainCameraTag;
74+
}
6375
break;
6476
case WebXRState.VR:
6577
cameraMain.enabled = false;
@@ -69,13 +81,25 @@ private void SwitchXRState()
6981
cameraR.rect = rightRect;
7082
cameraARL.enabled = false;
7183
cameraARR.enabled = false;
84+
if (updateCameraTag)
85+
{
86+
cameraMain.tag = untaggedTag;
87+
cameraL.tag = mainCameraTag;
88+
cameraARL.tag = untaggedTag;
89+
}
7290
break;
7391
case WebXRState.NORMAL:
7492
cameraMain.enabled = true;
7593
cameraL.enabled = false;
7694
cameraR.enabled = false;
7795
cameraARL.enabled = false;
7896
cameraARR.enabled = false;
97+
if (updateCameraTag)
98+
{
99+
cameraMain.tag = mainCameraTag;
100+
cameraL.tag = untaggedTag;
101+
cameraARL.tag = untaggedTag;
102+
}
79103
break;
80104
}
81105
}

0 commit comments

Comments
 (0)