Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix random object being added to playmode #105

Closed
wants to merge 2 commits into from
Closed

Fix random object being added to playmode #105

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5698421
Fix random object being added to playmode
Happyrobot33 Oct 12, 2023
f30e3cf
Apply suggestions from code review
Happyrobot33 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Packages/com.vrchat.ClientSim/Runtime/CameraStacking/ClientSimStackedVRCameraSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class ClientSimStackedVRCameraSystem : MonoBehaviour
{
[SerializeField]
private ClientSimStackedCamera[] cameraStack;

private bool _isCameraStackingEnabled;
private Camera _mainSceneCamera;
private bool _isInitialized;
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Happyrobot33 marked this conversation as resolved.
Show resolved Hide resolved
Camera cam = cameraObj.AddComponent<Camera>();
XRDevice.DisableAutoXRCameraTracking(cam, true);

Expand All @@ -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);
Happyrobot33 marked this conversation as resolved.
Show resolved Hide resolved
}

private void DestroyCamera(int index)
Expand All @@ -106,4 +110,4 @@ private void DestroyCamera(int index)
Destroy(cam.gameObject);
}
}
}
}