Imported the latest Cinemachine beta package

Author: ciro-unity

Diff for: Assets/Cinemachine/Base/Editor/Editors/CinemachineBasicMultiChannelPerlinEditor.cs

@@ -1,46 +1,78 @@
+using System.Collections.Generic;
 using UnityEditor;
+using UnityEngine;
 
 namespace Cinemachine.Editor
 {
     [CustomEditor(typeof(CinemachineBasicMultiChannelPerlin))]
-    internal sealed class CinemachineBasicMultiChannelPerlinEditor : UnityEditor.Editor
+    internal sealed class CinemachineBasicMultiChannelPerlinEditor 
+        : BaseEditor<CinemachineBasicMultiChannelPerlin>
     {
-        private CinemachineBasicMultiChannelPerlin Target { get { return target as CinemachineBasicMultiChannelPerlin; } }
-        private static readonly string[] m_excludeFields = new string[] { "m_Script" };
-        EmbeddeAssetEditor<NoiseSettings> m_SettingsEditor;
+        List<NoiseSettings> mNoisePresets;
+        string[] mNoisePresetNames;
 
-        private void OnEnable()
+        protected override List<string> GetExcludedPropertiesInInspector()
         {
-            m_SettingsEditor = new EmbeddeAssetEditor<NoiseSettings>(
-                    SerializedPropertyHelper.PropertyName(() => Target.m_Definition), this);
-            m_SettingsEditor.OnChanged = (NoiseSettings noise) =>
-                {
-                    UnityEditorInternal.InternalEditorUtility.RepaintAllViews();
-                };
+            List<string> excluded = base.GetExcludedPropertiesInInspector();
+            excluded.Add(FieldPath(x => x.m_NoiseProfile));
+            return excluded;
         }
 
-        private void OnDisable()
+        private void OnEnable()
         {
-            if (m_SettingsEditor != null)
-                m_SettingsEditor.OnDisable();
+            mNoisePresets = FindAssetsByType<NoiseSettings>();
+            mNoisePresets.Insert(0, null);
+            List<string> presetNameList = new List<string>();
+            foreach (var n in mNoisePresets)
+                presetNameList.Add((n == null) ? "(none)" : n.name);
+            mNoisePresetNames = presetNameList.ToArray();
         }
 
         public override void OnInspectorGUI()
         {
-            serializedObject.Update();
+            BeginInspector();
 
-            if (Target.m_Definition == null)
-                EditorGUILayout.HelpBox("A Noise Definition is required", MessageType.Error);
+            if (Target.m_NoiseProfile == null)
+                EditorGUILayout.HelpBox(
+                    "A Noise Profile is required.  You may choose from among the NoiseSettings assets defined in the project.",
+                    MessageType.Warning);
 
-            DrawPropertiesExcluding(serializedObject, m_excludeFields);
-            serializedObject.ApplyModifiedProperties();
+            GUIContent editLabel = new GUIContent("Edit");
+            Vector2 labelDimension = GUI.skin.button.CalcSize(editLabel);
+            Rect rect = EditorGUILayout.GetControlRect(true);
+            rect.width -= labelDimension.x;
+            int preset = mNoisePresets.IndexOf(Target.m_NoiseProfile);
+            preset = EditorGUI.Popup(rect, "Noise Profile", preset, mNoisePresetNames);
+            NoiseSettings newProfile = preset < 0 ? null : mNoisePresets[preset];
+            if (Target.m_NoiseProfile != newProfile)
+            {
+                Undo.RecordObject(Target, "Change Noise Profile");
+                Target.m_NoiseProfile = newProfile;
+            }
+            if (Target.m_NoiseProfile != null)
+            {
+                rect.x += rect.width; rect.width = labelDimension.x;
+                if (GUI.Button(rect, editLabel))
+                    Selection.activeObject = Target.m_NoiseProfile;
+            }
 
-            m_SettingsEditor.DrawEditorCombo(
-                "Create New Noise Asset",
-                Target.gameObject.name + " Noise Settings", "asset", string.Empty,
-                "Noise Settings", true);
+            DrawRemainingPropertiesInInspector();
+        }
 
-            serializedObject.ApplyModifiedProperties();
+        public static List<T> FindAssetsByType<T>() where T : UnityEngine.Object
+        {
+            List<T> assets = new List<T>();
+            string[] guids = AssetDatabase.FindAssets(string.Format("t:{0}", typeof(T)));
+            for (int i = 0; i < guids.Length; i++)
+            {
+                string assetPath = AssetDatabase.GUIDToAssetPath(guids[i]);
+                T asset = AssetDatabase.LoadAssetAtPath<T>(assetPath);
+                if (asset != null)
+                {
+                    assets.Add(asset);
+                }
+            }
+            return assets;
         }
     }
 }

Diff for: Assets/Cinemachine/Base/Editor/Editors/CinemachineBlenderSettingsEditor.cs

@@ -6,11 +6,8 @@
 namespace Cinemachine.Editor
 {
     [CustomEditor(typeof(CinemachineBlenderSettings))]
-    internal sealed class CinemachineBlenderSettingsEditor : UnityEditor.Editor
+    internal sealed class CinemachineBlenderSettingsEditor : BaseEditor<CinemachineBlenderSettings>
     {
-        private CinemachineBlenderSettings Target { get { return target as CinemachineBlenderSettings; } }
-        private static string[] m_excludeFields = null;
-
         private ReorderableList mBlendList;
 
         /// <summary>
@@ -21,25 +18,23 @@ internal sealed class CinemachineBlenderSettingsEditor : UnityEditor.Editor
         public GetAllVirtualCamerasDelegate GetAllVirtualCameras;
         public delegate CinemachineVirtualCameraBase[] GetAllVirtualCamerasDelegate();
 
+        protected override List<string> GetExcludedPropertiesInInspector()
+        {
+            List<string> excluded = base.GetExcludedPropertiesInInspector();
+            excluded.Add(FieldPath(x => x.m_CustomBlends));
+            return excluded;
+        }
+
         public override void OnInspectorGUI()
         {
-            if (m_excludeFields == null)
-            {
-                m_excludeFields = new string[]
-                {
-                    "m_Script",
-                    SerializedPropertyHelper.PropertyName(() => Target.m_CustomBlends)
-                };
-            }
+            BeginInspector();
             if (mBlendList == null)
                 SetupBlendList();
 
-            serializedObject.Update();
-            DrawPropertiesExcluding(serializedObject, m_excludeFields);
+            DrawRemainingPropertiesInInspector();
 
             UpdateCameraCandidates();
             mBlendList.DoLayoutList();
-
             serializedObject.ApplyModifiedProperties();
         }
 

Diff for: Assets/Cinemachine/Base/Editor/Editors/CinemachineBrainEditor.cs

@@ -1,36 +1,44 @@
 using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
+using Cinemachine.Utility;
 
 namespace Cinemachine.Editor
 {
     [CustomEditor(typeof(CinemachineBrain))]
-    internal sealed class CinemachineBrainEditor : UnityEditor.Editor
+    internal sealed class CinemachineBrainEditor : BaseEditor<CinemachineBrain>
     {
-        private CinemachineBrain Target { get { return target as CinemachineBrain; } }
-        EmbeddeAssetEditor<CinemachineBlenderSettings> m_SettingsEditor;
-
+        EmbeddeAssetEditor<CinemachineBlenderSettings> m_BlendsEditor;
         bool mEventsExpanded = false;
 
+        protected override List<string> GetExcludedPropertiesInInspector()
+        {
+            List<string> excluded = base.GetExcludedPropertiesInInspector();
+            excluded.Add(FieldPath(x => x.m_CameraCutEvent));
+            excluded.Add(FieldPath(x => x.m_CameraActivatedEvent));
+            excluded.Add(FieldPath(x => x.m_CustomBlends));
+            return excluded;
+        }
+
         private void OnEnable()
         {
-            m_SettingsEditor = new EmbeddeAssetEditor<CinemachineBlenderSettings>(
-                    SerializedPropertyHelper.PropertyName(() => Target.m_CustomBlends), this);
-            m_SettingsEditor.OnChanged = (CinemachineBlenderSettings b) =>
+            m_BlendsEditor = new EmbeddeAssetEditor<CinemachineBlenderSettings>(
+                    FieldPath(x => x.m_CustomBlends), this);
+            m_BlendsEditor.OnChanged = (CinemachineBlenderSettings b) =>
                 {
                     UnityEditorInternal.InternalEditorUtility.RepaintAllViews();
                 };
         }
 
         private void OnDisable()
         {
-            if (m_SettingsEditor != null)
-                m_SettingsEditor.OnDisable();
+            if (m_BlendsEditor != null)
+                m_BlendsEditor.OnDisable();
         }
 
         public override void OnInspectorGUI()
         {
-            serializedObject.Update();
+            BeginInspector();
 
             // Show the active camera and blend
             GUI.enabled = false;
@@ -44,24 +52,19 @@ public override void OnInspectorGUI()
             GUI.enabled = true;
 
             // Normal properties
-            List<string> excludeFields = new List<string>
-            {
-                "m_Script",
-                SerializedPropertyHelper.PropertyName(() => Target.m_CameraCutEvent),
-                SerializedPropertyHelper.PropertyName(() => Target.m_CameraActivatedEvent)
-            };
-            DrawPropertiesExcluding(serializedObject, excludeFields.ToArray());
+            DrawRemainingPropertiesInInspector();
 
-            m_SettingsEditor.DrawEditorCombo(
+            // Blender
+            m_BlendsEditor.DrawEditorCombo(
                 "Create New Blender Asset",
                 Target.gameObject.name + " Blends", "asset", string.Empty,
                 "Custom Blends", false);
 
             mEventsExpanded = EditorGUILayout.Foldout(mEventsExpanded, "Events");
             if (mEventsExpanded)
             {
-                EditorGUILayout.PropertyField(serializedObject.FindProperty(() => Target.m_CameraCutEvent));
-                EditorGUILayout.PropertyField(serializedObject.FindProperty(() => Target.m_CameraActivatedEvent));
+                EditorGUILayout.PropertyField(FindProperty(x => x.m_CameraCutEvent));
+                EditorGUILayout.PropertyField(FindProperty(x => x.m_CameraActivatedEvent));
             }
             serializedObject.ApplyModifiedProperties();
         }
@@ -112,5 +115,29 @@ internal static void DrawCameraFrustumGizmo(
             Gizmos.matrix = originalMatrix;
             Gizmos.color = originalGizmoColour;
         }
+
+        [DrawGizmo(GizmoType.Active | GizmoType.InSelectionHierarchy | GizmoType.Pickable, typeof(CinemachineVirtualCameraBase))]
+        internal static void DrawVirtualCameraBaseGizmos(CinemachineVirtualCameraBase vcam, GizmoType selectionType)
+        {
+            // Don't draw gizmos on hidden stuff
+            if ((vcam.VirtualCameraGameObject.hideFlags & (HideFlags.HideInHierarchy | HideFlags.HideInInspector)) != 0)
+                return;
+
+            if (vcam.ParentCamera != null && (selectionType & GizmoType.Active) == 0)
+                return;
+
+            CameraState state = vcam.State;
+            Gizmos.DrawIcon(state.FinalPosition, "Cinemachine/cm_logo_lg.png", true);
+
+            DrawCameraFrustumGizmo(
+                CinemachineCore.Instance.FindPotentialTargetBrain(vcam),
+                state.Lens,
+                Matrix4x4.TRS(
+                    state.FinalPosition,
+                    UnityQuaternionExtensions.Normalized(state.FinalOrientation), Vector3.one),
+                CinemachineCore.Instance.IsLive(vcam)
+                    ? CinemachineSettings.CinemachineCoreSettings.ActiveGizmoColour
+                    : CinemachineSettings.CinemachineCoreSettings.InactiveGizmoColour);
+        }
     }
 }