From 5698421b78bc55ce65d7497f8361cf8478e3fe17 Mon Sep 17 00:00:00 2001 From: Happyrobot33 Date: Thu, 12 Oct 2023 09:01:14 -0400 Subject: [PATCH 1/2] Fix random object being added to playmode Closes #96 --- .../ClientSimStackedVRCameraSystem.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs b/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs index 53fa853..dd13d38 100644 --- a/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs +++ b/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs @@ -8,7 +8,7 @@ public class ClientSimStackedVRCameraSystem : MonoBehaviour { [SerializeField] private ClientSimStackedCamera[] cameraStack; - + private bool _isCameraStackingEnabled; private Camera _mainSceneCamera; private bool _isInitialized; @@ -26,13 +26,13 @@ public void Ready() { _isReady = true; } - + void Update() { - if(!_isReady) return; + if (!_isReady) return; if (!_isInitialized) { InitializeStackedSystem(); } } - + void OnDisable() { if (_mainSceneCamera != null) @@ -72,7 +72,8 @@ private void DestroyCameraStack() private void AddCamera(int index) { - GameObject cameraObj = Instantiate(new GameObject(), _mainSceneCamera.transform); + GameObject dummyObject = new GameObject(); + GameObject cameraObj = Instantiate(dummyObject, _mainSceneCamera.transform); Camera cam = cameraObj.AddComponent(); XRDevice.DisableAutoXRCameraTracking(cam, true); @@ -94,6 +95,9 @@ private void AddCamera(int index) // Set the ClientSim UI canvas to use this camera _clientSimMenu.SetCanvasCamera(cam); + + //Cleanup dummy object + Destroy(dummyObject); } private void DestroyCamera(int index) @@ -106,4 +110,4 @@ private void DestroyCamera(int index) Destroy(cam.gameObject); } } -} \ No newline at end of file +} From f30e3cfbc08d3f09fafa031a162144d803933c0a Mon Sep 17 00:00:00 2001 From: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com> Date: Fri, 13 Oct 2023 07:12:43 -0400 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Fairplex <31825109+Fairpl3x@users.noreply.github.com> --- .../CameraStacking/ClientSimStackedVRCameraSystem.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs b/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs index dd13d38..6821c73 100644 --- a/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs +++ b/Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs @@ -72,8 +72,8 @@ private void DestroyCameraStack() private void AddCamera(int index) { - GameObject dummyObject = new GameObject(); - GameObject cameraObj = Instantiate(dummyObject, _mainSceneCamera.transform); + GameObject cameraObj = new GameObject(); + cameraObj.transform.SetParent(_mainSceneCamera.transform); Camera cam = cameraObj.AddComponent(); XRDevice.DisableAutoXRCameraTracking(cam, true); @@ -95,9 +95,6 @@ private void AddCamera(int index) // Set the ClientSim UI canvas to use this camera _clientSimMenu.SetCanvasCamera(cam); - - //Cleanup dummy object - Destroy(dummyObject); } private void DestroyCamera(int index)