Backups/CinematicUnityExplorer
1
0
Fork 0
mirror of https://github.com/originalnicodr/CinematicUnityExplorer.git synced 2026-10-10 13:03:15 +08:00
Code Actions Releases Activity

Added settings to optionally render the target camera dropdown and to remember the selected target camera across sessions. Also renamed the CUE camera objects for standardization (and filtering) sake.

Browse Source
This commit is contained in:
originalnicodr
2025-06-16 16:42:29 -03:00
parent f0f5d98922
commit 98fb915be1
3 changed files with 83 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Config/ConfigManager.cs
+11
View File
@@ -33,6 +33,7 @@ namespace UnityExplorer.Config
public static ConfigElement<bool> Auto_Scale_UI;
public static ConfigElement<bool> Reset_Camera_Transform;
public static ConfigElement<float> Arrow_Size;
public static ConfigElement<bool> Advanced_Freecam_Selection;
public static ConfigElement<KeyCode> Pause;
public static ConfigElement<KeyCode> Frameskip;
@@ -63,6 +64,7 @@ namespace UnityExplorer.Config
public static ConfigElement<FreeCamPanel.FreeCameraType> Default_Freecam;
public static ConfigElement<string> Custom_Components_To_Disable;
public static ConfigElement<int> Preferred_Target_Camera;
// internal configs
internal static InternalConfigHandler InternalHandler { get; private set; }
@@ -198,6 +200,10 @@ namespace UnityExplorer.Config
"Cam Paths nodes and Lights Manager lights visualizers' arrow size (must be positive) (needs visualizer toggled to reflect changes).",
1f);
Advanced_Freecam_Selection = new("Advanced Freecam Selection",
"Enables certain advanced settings on the Freecam panel, in case the user can't get the freecam to work properly (requires game reset).",
false);
Pause = new("Pause",
"Toggle the pause of the game.",
KeyCode.PageUp);
@@ -311,6 +317,11 @@ namespace UnityExplorer.Config
Custom_Components_To_Disable = new("Custom components to disable",
"List of custom components to disable when enabling the freecam (gets automatically updated when editing it from the freecam panel).",
"");
Preferred_Target_Camera = new("Preferred Target Camera",
"The camera that will be targeted by the freecam methods.\n" +
"Only used when Advanced Freecam Selection is enabled.",
-1);
}
}
}
src/Loader/Standalone/Editor/ExplorerEditorBehaviour.cs
+5
View File
@@ -31,7 +31,9 @@ namespace UnityExplorer.Loader.Standalone
public bool Reset_Camera_Transform;
public FreeCamPanel.FreeCameraType Default_Freecam;
public string Custom_Components_To_Disable;
public int Preferred_Target_Camera;
public float Arrow_Size = 1f;
public bool Advanced_Freecam_Selection;
public KeyCode Pause;
public KeyCode Frameskip;
@@ -90,7 +92,10 @@ namespace UnityExplorer.Loader.Standalone
ConfigManager.Reset_Camera_Transform.Value = this.Reset_Camera_Transform;
ConfigManager.Default_Freecam.Value = this.Default_Freecam;
ConfigManager.Custom_Components_To_Disable.Value = this.Custom_Components_To_Disable;
ConfigManager.Preferred_Target_Camera.Value = this.Preferred_Target_Camera;
ConfigManager.Arrow_Size.Value = this.Arrow_Size;
ConfigManager.Advanced_Freecam_Selection.Value = this.Advanced_Freecam_Selection;
ConfigManager.Pause.Value = this.Pause;
ConfigManager.Frameskip.Value = this.Frameskip;
src/UI/Panels/FreeCamPanel.cs
+67 -27
View File
@@ -139,10 +139,16 @@ namespace UnityExplorer.UI.Panels
private static Camera GetTargetCamera()
{
Camera currentMain = Camera.main;
Camera[] cameras = GetAvailableCameras();
if (!ConfigManager.Advanced_Freecam_Selection.Value && !targetCameraDropdown)
{
return currentMain;
}
Camera[] cameras = GetAvailableCameras().Where(c => c.name != "CUE Camera").ToArray();
int selectedCameraTargetIndex = -1;
// If the list of camera was updated since the last time we checked, update the dropdown and select the current main camera if available
// Could filter out CUE camera here, but we shouldnt reach a point where the CUE camera is alive at this point
if (!cameras.Select(c => c.name).SequenceEqual(targetCameraDropdown.options.ToArray().Select(c => c.text)))
{
targetCameraDropdown.options.Clear();
@@ -151,12 +157,29 @@ namespace UnityExplorer.UI.Panels
Camera cam = cameras[i];
targetCameraDropdown.options.Add(new Dropdown.OptionData(cam.name));
if (currentMain && cam == currentMain)
{
targetCameraDropdown.value = i;
targetCameraDropdown.captionText.text = cam.name;
// The user selected a target camera at some point, default to that
if (i == ConfigManager.Preferred_Target_Camera.Value) {
selectedCameraTargetIndex = i;
}
}
// If couldn't find the user selected camera default to the main camera
if (selectedCameraTargetIndex == -1)
{
selectedCameraTargetIndex = Array.IndexOf(cameras, Camera.main);
}
#if STANDALONE
// Standalone doesn't have a reference to Dropdown.SetValueWithoutNotify
// Should still check this implementation
targetCameraDropdown.onValueChanged.RemoveListener(UpdateTargetCameraAction);
targetCameraDropdown.value = selectedCameraTargetIndex;
targetCameraDropdown.onValueChanged.AddListener(UpdateTargetCameraAction);
#else
targetCameraDropdown.SetValueWithoutNotify(selectedCameraTargetIndex);
#endif
targetCameraDropdown.captionText.text = cameras[selectedCameraTargetIndex].name;
}
// Fallback to the first camera
@@ -226,7 +249,7 @@ namespace UnityExplorer.UI.Panels
lastMainCamera.enabled = false;
}
ourCamera = new GameObject("UE_Freecam").AddComponent<Camera>();
ourCamera = new GameObject("CUE Camera").AddComponent<Camera>();
ourCamera.gameObject.tag = "MainCamera";
GameObject.DontDestroyOnLoad(ourCamera.gameObject);
ourCamera.gameObject.hideFlags = HideFlags.HideAndDontSave;
@@ -270,7 +293,7 @@ namespace UnityExplorer.UI.Panels
MaybeToggleOrthographic(false);
ToggleCustomComponents(false);
cameraMatrixOverrider = new GameObject("[CUE] Camera Matrix Overrider").AddComponent<Camera>();
cameraMatrixOverrider = new GameObject("CUE Camera").AddComponent<Camera>();
cameraMatrixOverrider.enabled = false;
cameraMatrixOverrider.transform.position = lastMainCamera.transform.position;
cameraMatrixOverrider.transform.rotation = lastMainCamera.transform.rotation;
@@ -285,7 +308,7 @@ namespace UnityExplorer.UI.Panels
// Fallback in case we couldn't find the main camera for some reason
if (!ourCamera)
{
ourCamera = new GameObject("UE_Freecam").AddComponent<Camera>();
ourCamera = new GameObject("CUE Camera").AddComponent<Camera>();
ourCamera.gameObject.tag = "MainCamera";
GameObject.DontDestroyOnLoad(ourCamera.gameObject);
ourCamera.gameObject.hideFlags = HideFlags.HideAndDontSave;
@@ -394,6 +417,12 @@ namespace UnityExplorer.UI.Panels
}
}
internal static void UpdateTargetCameraAction(int newCameraIndex)
{
ConfigManager.Preferred_Target_Camera.Value = newCameraIndex;
MaybeResetFreecam();
}
// Experimental feature to automatically disable cinemachine when turning on the gameplay freecam.
// If it causes problems in some games we should consider removing it or making it a toggle.
// Also, if there are more generic Unity components that control the camera we should include them here.
@@ -510,30 +539,41 @@ namespace UnityExplorer.UI.Panels
UIFactory.SetLayoutElement(cameraTypeDropdownObj, minHeight: 25, minWidth: 150);
cameraTypeDropdown.value = (int)ConfigManager.Default_Freecam.Value;
Text TargetCamLabel = UIFactory.CreateLabel(CameraModeRow, "Target_cam_label", " Target cam:");
UIFactory.SetLayoutElement(TargetCamLabel.gameObject, minWidth: 75, minHeight: 25);
if (ConfigManager.Advanced_Freecam_Selection.Value)
{
Text TargetCamLabel = UIFactory.CreateLabel(CameraModeRow, "Target_cam_label", " Target cam:");
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(delegate {
MaybeResetFreecam();
});
targetCameraDropdown.onValueChanged.AddListener(UpdateTargetCameraAction);
try {
Camera[] cameras = GetAvailableCameras();
foreach (Camera cam in cameras) {
targetCameraDropdown.options.Add(new Dropdown.OptionData(cam.name));
try {
Camera[] cameras = GetAvailableCameras();
foreach (Camera cam in cameras) {
targetCameraDropdown.options.Add(new Dropdown.OptionData(cam.name));
}
if (Camera.main) {
#if STANDALONE
// Standalone doesn't have a reference to Dropdown.SetValueWithoutNotify
// Should still check this implementation
targetCameraDropdown.onValueChanged.RemoveListener(UpdateTargetCameraAction);
targetCameraDropdown.value = Array.IndexOf(cameras, Camera.main);
targetCameraDropdown.onValueChanged.AddListener(UpdateTargetCameraAction);
#else
targetCameraDropdown.SetValueWithoutNotify(Array.IndexOf(cameras, Camera.main));
#endif
targetCameraDropdown.captionText.text = Camera.main.name;
}
}
if (Camera.main) {
targetCameraDropdown.value = Array.IndexOf(cameras, Camera.main);
targetCameraDropdown.captionText.text = Camera.main.name;
catch (Exception ex) {
ExplorerCore.LogWarning(ex);
}
}
catch (Exception ex) {
ExplorerCore.LogWarning(ex);
}
UIFactory.SetLayoutElement(targetCameraDropdownObj, minHeight: 25, minWidth: 150);
UIFactory.SetLayoutElement(targetCameraDropdownObj, minHeight: 25, minWidth: 150);
}
AddSpacer(5);