charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(PlayerCamera): Improved cleanup

Browse Source 
- avoids error in editor
This commit is contained in:
MrGadget 2024-11-02 18:29:05 -04:00
parent bb97db4eaa
commit e9a8e02a40
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Assets/Mirror/Examples/_Common/Scripts/PlayerCamera.cs
View File

@ -19,11 +19,6 @@ void Awake()
mainCam = Camera.main; mainCam = Camera.main;
} }
void OnDisable()
{
//Debug.Log("PlayerCamera.OnDisable");
}
public override void OnStartLocalPlayer() public override void OnStartLocalPlayer()
{ {
if (mainCam != null) if (mainCam != null)
@ -38,16 +33,46 @@ public override void OnStartLocalPlayer()
Debug.LogWarning("PlayerCamera: Could not find a camera in scene with 'MainCamera' tag."); Debug.LogWarning("PlayerCamera: Could not find a camera in scene with 'MainCamera' tag.");
} }
void OnApplicationQuit()
{
//Debug.Log("PlayerCamera.OnApplicationQuit");
ReleaseCamera();
}
public override void OnStopLocalPlayer() public override void OnStopLocalPlayer()
{
//Debug.Log("PlayerCamera.OnStopLocalPlayer");
ReleaseCamera();
}
void OnDisable()
{
//Debug.Log("PlayerCamera.OnDisable");
ReleaseCamera();
}
void OnDestroy()
{
//Debug.Log("PlayerCamera.OnDestroy");
ReleaseCamera();
}
void ReleaseCamera()
{ {
if (mainCam != null && mainCam.transform.parent == transform) if (mainCam != null && mainCam.transform.parent == transform)
{ {
//Debug.Log("PlayerCamera.ReleaseCamera");
mainCam.transform.SetParent(null); mainCam.transform.SetParent(null);
SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
mainCam.orthographic = true; mainCam.orthographic = true;
mainCam.orthographicSize = 15f; mainCam.orthographicSize = 15f;
mainCam.transform.localPosition = new Vector3(0f, 70f, 0f); mainCam.transform.localPosition = new Vector3(0f, 70f, 0f);
mainCam.transform.localEulerAngles = new Vector3(90f, 0f, 0f); mainCam.transform.localEulerAngles = new Vector3(90f, 0f, 0f);
if (mainCam.gameObject.scene != SceneManager.GetActiveScene())
SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
mainCam = null;
} }
} }
} }