From 07971489c4312a3f69f2abb782c23aa0ee318a96 Mon Sep 17 00:00:00 2001 From: originalnicodr Date: Sat, 30 Nov 2024 12:57:02 -0300 Subject: [PATCH] Added checks to avoid the look-at feature from getting in the way of the connector commands. --- src/UI/Panels/FreeCamPanel.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/UI/Panels/FreeCamPanel.cs b/src/UI/Panels/FreeCamPanel.cs index 88035d7..17b8504 100644 --- a/src/UI/Panels/FreeCamPanel.cs +++ b/src/UI/Panels/FreeCamPanel.cs @@ -734,6 +734,11 @@ namespace UnityExplorer.UI.Panels UpdateClippingPlanes(); } + public static bool IsConnectorActive() + { + return FreeCamPanel.connector != null && FreeCamPanel.connector.IsActive; + } + public static bool ShouldOverrideInput(){ return inFreeCamMode && blockGamesInputOnFreecamToggle.isOn; } @@ -849,17 +854,17 @@ namespace UnityExplorer.UI.Panels FreeCamPanel.followObjectLastRotation = FreeCamPanel.followObject.transform.rotation; } + if (FreeCamPanel.lookAtObject != null && !FreeCamPanel.IsConnectorActive()) + { + movingTransform.LookAt(FreeCamPanel.lookAtObject.transform); + } + UpdateRelativeMatrix(); UpdateRealCamera(); FreeCamPanel.connector?.ExecuteCameraCommand(FreeCamPanel.GetFreecam()); FreeCamPanel.UpdatePositionInput(); - - if (FreeCamPanel.lookAtObject != null) - { - movingTransform.LookAt(FreeCamPanel.lookAtObject.transform); - } } }