Bugfix: short freeze when transitioning between freeLooks

Author: glabute

Base/Editor/Editors/CinemachineVirtualCameraBaseEditor.cs

@@ -150,10 +150,10 @@ protected void DrawCameraStatusInInspector()
             float labelWidth = 0;
             GUIContent updateText = GUIContent.none;
             CinemachineCore.UpdateFilter updateMode = CinemachineCore.Instance.GetVcamUpdateStatus(Target);
-            if (updateMode != CinemachineCore.UpdateFilter.Any && Application.isPlaying)
+            if (Application.isPlaying)
             {
                 updateText = new GUIContent(
-                    updateMode == CinemachineCore.UpdateFilter.Fixed ? " Fixed Update" : " Late Update");
+                    updateMode < CinemachineCore.UpdateFilter.Late ? " Fixed Update" : " Late Update");
                 var textDimensions = GUI.skin.label.CalcSize(updateText);
                 labelWidth = textDimensions.x;
             }

Base/Runtime/Behaviours/CinemachineBrain.cs

@@ -335,7 +335,7 @@ private void OnDisable()
 
         private void Start()
         {
-            UpdateVirtualCameras(CinemachineCore.UpdateFilter.Any, -1f);
+            UpdateVirtualCameras(CinemachineCore.UpdateFilter.Late, -1f);
 
             // We check in after the physics system has had a chance to move things
             StartCoroutine(AfterPhysics());
@@ -386,7 +386,7 @@ private IEnumerator AfterPhysics()
                     else
                     {
                         AddSubframe(); // FixedUpdate can be called multiple times per frame
-                        UpdateVirtualCameras(CinemachineCore.UpdateFilter.Any, GetEffectiveDeltaTime(true));
+                        UpdateVirtualCameras(CinemachineCore.UpdateFilter.ForcedFixed, GetEffectiveDeltaTime(true));
                     }
                 }
             }
@@ -398,7 +398,7 @@ private void LateUpdate()
             if (m_UpdateMethod == UpdateMethod.SmartUpdate)
                 UpdateVirtualCameras(CinemachineCore.UpdateFilter.Late, deltaTime);
             else if (m_UpdateMethod == UpdateMethod.LateUpdate)
-                UpdateVirtualCameras(CinemachineCore.UpdateFilter.Any, deltaTime);
+                UpdateVirtualCameras(CinemachineCore.UpdateFilter.ForcedLate, deltaTime);
 
             // Choose the active vcam and apply it to the Unity camera
             ProcessActiveCamera(GetEffectiveDeltaTime(false));
@@ -416,7 +416,7 @@ private void OnPreCull()
                 // to be painted one frame out of sync.  It will only happen in the editor when not playing.
                 float deltaTime = GetEffectiveDeltaTime(false);
                 msSubframes = 1;
-                UpdateVirtualCameras(CinemachineCore.UpdateFilter.Any, deltaTime);
+                UpdateVirtualCameras(CinemachineCore.UpdateFilter.Late, deltaTime);
                 ProcessActiveCamera(GetEffectiveDeltaTime(false));
             }
         }
@@ -454,7 +454,7 @@ private void UpdateVirtualCameras(CinemachineCore.UpdateFilter updateFilter, flo
                 activeBlend.UpdateCameraState(DefaultWorldUp, deltaTime);
 
             // Restore the filter for general use
-            CinemachineCore.Instance.CurrentUpdateFilter = CinemachineCore.UpdateFilter.Any;
+            CinemachineCore.Instance.CurrentUpdateFilter = CinemachineCore.UpdateFilter.Late;
             //UnityEngine.Profiling.Profiler.EndSample();
         }
 

Base/Runtime/Core/CinemachineCore.cs

@@ -182,8 +182,17 @@ internal bool UpdateVirtualCamera(ICinemachineCamera vcam, Vector3 worldUp, floa
         {
             //UnityEngine.Profiling.Profiler.BeginSample("CinemachineCore.UpdateVirtualCamera");
             int now = Time.frameCount;
-            bool isSmartUpdate = CurrentUpdateFilter != UpdateFilter.Any;
-            bool isSmartLateUpdate = CurrentUpdateFilter == UpdateFilter.Late;
+            UpdateFilter filter = CurrentUpdateFilter;
+            bool isSmartUpdate = filter != UpdateFilter.ForcedFixed 
+                && filter != UpdateFilter.ForcedLate;
+            bool isSmartLateUpdate = filter == UpdateFilter.Late;
+            if (!isSmartUpdate)
+            {
+                if (filter == UpdateFilter.ForcedFixed)
+                    filter = UpdateFilter.Fixed;
+                if (filter == UpdateFilter.ForcedLate)
+                    filter = UpdateFilter.Late;
+            }
 
             if (mUpdateStatus == null)
                 mUpdateStatus = new Dictionary<ICinemachineCamera, UpdateStatus>();
@@ -215,13 +224,13 @@ internal bool UpdateVirtualCamera(ICinemachineCamera vcam, Vector3 worldUp, floa
                 if (!GetTargetPosition(vcam, out targetPos))
                     updateNow = isSmartLateUpdate; // no target
                 else
-                    updateNow = status.ChoosePreferredUpdate(now, targetPos, CurrentUpdateFilter) 
-                        == CurrentUpdateFilter;
+                    updateNow = status.ChoosePreferredUpdate(now, targetPos, filter) 
+                        == filter;
             }
 
             if (updateNow)
             {
-                status.preferredUpdate = CurrentUpdateFilter;
+                status.preferredUpdate = filter;
                 while (status.lastUpdateSubframe < subframes)
                 {
 //Debug.Log(vcam.Name + ": frame " + Time.frameCount + "." + status.lastUpdateSubframe + ", " + CurrentUpdateFilter + ", deltaTime = " + deltaTime);
@@ -263,6 +272,7 @@ public UpdateStatus(int currentFrame)
                 targetPos = Matrix4x4.zero;
             }
 
+            // Important: updateFilter may ONLY be Late or Fixed
             public UpdateFilter ChoosePreferredUpdate(
                 int currentFrame, Matrix4x4 pos, UpdateFilter updateFilter)
             {
@@ -297,7 +307,7 @@ public UpdateFilter ChoosePreferredUpdate(
         Dictionary<ICinemachineCamera, UpdateStatus> mUpdateStatus;
 
         /// <summary>Internal use only</summary>
-        public enum UpdateFilter { Fixed, Late, Any };
+        public enum UpdateFilter { Fixed, ForcedFixed, Late, ForcedLate };
         internal UpdateFilter CurrentUpdateFilter { get; set; }
         private static bool GetTargetPosition(ICinemachineCamera vcam, out Matrix4x4 targetPos)
         {
@@ -328,7 +338,7 @@ public UpdateFilter GetVcamUpdateStatus(ICinemachineCamera vcam)
         {
             UpdateStatus status;
             if (mUpdateStatus == null || !mUpdateStatus.TryGetValue(vcam, out status))
-                return UpdateFilter.Any;
+                return UpdateFilter.Late;
             return status.preferredUpdate;
         }