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

Make the cinemachine component disable itself when using the gameplaycamera and put the follow and release object buttons on the same row.

Browse Source
This commit is contained in:
originalnicodr
2024-01-14 11:22:17 -03:00
parent ba10a10ffc
commit 06bf0536bb
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/UI/Panels/FreeCamPanel.cs
+30 -4
View File
@@ -51,6 +51,7 @@ namespace UnityExplorer.UI.Panels
static InputFieldRef moveSpeedInput;
static Text followObjectLabel;
static ButtonRef inspectButton;
static bool disabledCinemachine;
public static GameObject followObject = null;
internal static void BeginFreecam()
@@ -97,6 +98,7 @@ namespace UnityExplorer.UI.Panels
{
usingGameCamera = true;
ourCamera = lastMainCamera;
MaybeToggleCinemachine(false);
}
}
@@ -132,6 +134,8 @@ namespace UnityExplorer.UI.Panels
if (usingGameCamera)
{
MaybeToggleCinemachine(true);
ourCamera = null;
if (lastMainCamera)
@@ -156,6 +160,28 @@ namespace UnityExplorer.UI.Panels
lastMainCamera.enabled = true;
}
// 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.
// Not sure if a cinemachine can be inside another gameobject and not in the maincamera component, but we should take that in mind if this doesn't work in some games.
static void MaybeToggleCinemachine(bool enable){
// If we want to enable cinemachine but never disabled don't even look for it
if(enable && !disabledCinemachine)
return;
if (ourCamera){
IEnumerable<Behaviour> comps = ourCamera.GetComponents<Behaviour>();
foreach (Behaviour comp in comps)
{
if (comp.GetType().ToString() == "Cinemachine.CinemachineBrain"){
comp.enabled = enable;
disabledCinemachine = !enable;
break;
}
}
}
}
static void SetCameraPosition(Vector3 pos)
{
if (!ourCamera || lastSetCameraPosition == pos)
@@ -212,13 +238,13 @@ namespace UnityExplorer.UI.Panels
followObjectLabel = UIFactory.CreateLabel(ContentRoot, "CurrentFollowObject", "Not following any object.");
UIFactory.SetLayoutElement(followObjectLabel.gameObject, minWidth: 100, minHeight: 25);
ButtonRef followButton = UIFactory.CreateButton(ContentRoot, "FollowButton", "Make camera Follow GameObject");
GameObject followObjectRow = UIFactory.CreateHorizontalGroup(ContentRoot, $"FollowObjectRow", false, false, true, true, 3, default, new(1, 1, 1, 0));
ButtonRef followButton = UIFactory.CreateButton(followObjectRow, "FollowButton", "Follow GameObject");
UIFactory.SetLayoutElement(followButton.GameObject, minWidth: 150, minHeight: 25, flexibleWidth: 9999);
followButton.OnClick += FollowButton_OnClick;
AddSpacer(5);
ButtonRef releaseFollowButton = UIFactory.CreateButton(ContentRoot, "ReleaseFollowButton", "Release Follow GameObject");
ButtonRef releaseFollowButton = UIFactory.CreateButton(followObjectRow, "ReleaseFollowButton", "Release Follow GameObject");
UIFactory.SetLayoutElement(releaseFollowButton.GameObject, minWidth: 150, minHeight: 25, flexibleWidth: 9999);
releaseFollowButton.OnClick += ReleaseFollowButton_OnClick;