1
0
mirror of https://github.com/originalnicodr/CinematicUnityExplorer.git synced 2025-07-18 17:38:01 +08:00

Replaced Array.IndexOf by a manual iteration because it wasn't working for some reason. Also polished some vertical spaces.

This commit is contained in:
originalnicodr
2025-06-20 18:08:15 -03:00
parent 676f412a60
commit 8c2c06aff4

View File

@ -138,10 +138,9 @@ namespace UnityExplorer.UI.Panels
private static Camera GetTargetCamera() private static Camera GetTargetCamera()
{ {
Camera currentMain = Camera.main;
if (!ConfigManager.Advanced_Freecam_Selection.Value && !targetCameraDropdown) if (!ConfigManager.Advanced_Freecam_Selection.Value && !targetCameraDropdown)
{ {
return currentMain; return Camera.main;
} }
Camera[] cameras = GetAvailableCameras(); Camera[] cameras = GetAvailableCameras();
@ -166,7 +165,14 @@ namespace UnityExplorer.UI.Panels
// If couldn't find the user selected camera default to the main camera // If couldn't find the user selected camera default to the main camera
if (selectedCameraTargetIndex == -1) if (selectedCameraTargetIndex == -1)
{ {
selectedCameraTargetIndex = Array.IndexOf(cameras, Camera.main); for (int i = 0; i < cameras.Length; i++)
{
if (cameras[i] == Camera.main)
{
selectedCameraTargetIndex = i;
break;
}
}
} }
SetTargetDropdownValueWithoutNotify(selectedCameraTargetIndex); SetTargetDropdownValueWithoutNotify(selectedCameraTargetIndex);
@ -327,12 +333,6 @@ namespace UnityExplorer.UI.Panels
internal static void EndFreecam() internal static void EndFreecam()
{ {
if (ourCamera == null)
{
ExplorerCore.LogWarning("EndFreecam called but ourCamera is null, returning.");
return;
}
inFreeCamMode = false; inFreeCamMode = false;
connector?.UpdateFreecamStatus(false); connector?.UpdateFreecamStatus(false);
@ -363,8 +363,8 @@ namespace UnityExplorer.UI.Panels
MaybeToggleOrthographic(true); MaybeToggleOrthographic(true);
ToggleCustomComponents(true); ToggleCustomComponents(true);
MethodInfo resetCullingMatrixMethod = typeof(Camera).GetMethod("ResetCullingMatrix", new Type[] {}); MethodInfo resetCullingMatrixMethod = typeof(Camera).GetMethod("ResetCullingMatrix", new Type[] {});
resetCullingMatrixMethod.Invoke(ourCamera, null); resetCullingMatrixMethod.Invoke(ourCamera, null);
ourCamera.ResetWorldToCameraMatrix(); ourCamera.ResetWorldToCameraMatrix();
ourCamera.ResetProjectionMatrix(); ourCamera.ResetProjectionMatrix();
ourCamera = null; ourCamera = null;
@ -565,7 +565,6 @@ namespace UnityExplorer.UI.Panels
UIFactory.SetLayoutElement(TargetCamLabel.gameObject, minWidth: 75, minHeight: 25); UIFactory.SetLayoutElement(TargetCamLabel.gameObject, minWidth: 75, minHeight: 25);
GameObject targetCameraDropdownObj = UIFactory.CreateDropdown(CameraModeRow, "TargetCamera_Dropdown", out targetCameraDropdown, null, 14, null); GameObject targetCameraDropdownObj = UIFactory.CreateDropdown(CameraModeRow, "TargetCamera_Dropdown", out targetCameraDropdown, null, 14, null);
targetCameraDropdown.onValueChanged.AddListener(UpdateTargetCameraAction); targetCameraDropdown.onValueChanged.AddListener(UpdateTargetCameraAction);
try { try {