Unity 2021.2.0a21 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs

@@ -112,12 +112,12 @@ public int CompareTo(AnimationWindowCurve obj)
             // We want to sort position before rotation
             if (sameTransformComponent)
             {
-                string propertyGroupA = AnimationWindowUtility.GetNicePropertyGroupDisplayName(typeof(Transform), AnimationWindowUtility.GetPropertyGroupName(propertyName));
-                string propertyGroupB = AnimationWindowUtility.GetNicePropertyGroupDisplayName(typeof(Transform), AnimationWindowUtility.GetPropertyGroupName(obj.propertyName));
+                string propertyGroupA = AnimationWindowUtility.GetPropertyGroupName(propertyName);
+                string propertyGroupB = AnimationWindowUtility.GetPropertyGroupName(obj.propertyName);
 
-                if (propertyGroupA.Contains("Position") && propertyGroupB.Contains("Rotation"))
+                if (propertyGroupA.Equals("m_LocalPosition") && (propertyGroupB.Equals("m_LocalRotation") || propertyGroupB.StartsWith("localEulerAngles")))
                     return -1;
-                if (propertyGroupA.Contains("Rotation") && propertyGroupB.Contains("Position"))
+                if ((propertyGroupA.Equals("m_LocalRotation") || propertyGroupA.StartsWith("localEulerAngles")) && propertyGroupB.Equals("m_LocalPosition"))
                     return 1;
             }
             // Transform component should always come first.

Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

@@ -729,16 +729,21 @@ public static void RenameCurvePath(AnimationWindowCurve curve, EditorCurveBindin
             }
         }
 
+        private static readonly string k_PositionDisplayName = L10n.Tr("Position");
+        private static readonly string k_ScaleDisplayName = L10n.Tr("Scale");
+        private static readonly string k_RotationDisplayName = L10n.Tr("Rotation");
+        private static readonly string k_MaterialReferenceDisplayName = L10n.Tr("Material Reference");
+
         // Takes raw animation curve propertyname and makes it pretty
         public static string GetPropertyDisplayName(string propertyName)
         {
-            propertyName = propertyName.Replace("m_LocalPosition", L10n.Tr("Position"));
-            propertyName = propertyName.Replace("m_LocalScale", L10n.Tr("Scale"));
-            propertyName = propertyName.Replace("m_LocalRotation", L10n.Tr("Rotation"));
-            propertyName = propertyName.Replace("localEulerAnglesBaked", L10n.Tr("Rotation"));
-            propertyName = propertyName.Replace("localEulerAnglesRaw", L10n.Tr("Rotation"));
-            propertyName = propertyName.Replace("localEulerAngles", L10n.Tr("Rotation"));
-            propertyName = propertyName.Replace("m_Materials.Array.data", L10n.Tr("Material Reference"));
+            propertyName = propertyName.Replace("m_LocalPosition", k_PositionDisplayName);
+            propertyName = propertyName.Replace("m_LocalScale", k_ScaleDisplayName);
+            propertyName = propertyName.Replace("m_LocalRotation", k_RotationDisplayName);
+            propertyName = propertyName.Replace("localEulerAnglesBaked", k_RotationDisplayName);
+            propertyName = propertyName.Replace("localEulerAnglesRaw", k_RotationDisplayName);
+            propertyName = propertyName.Replace("localEulerAngles", k_RotationDisplayName);
+            propertyName = propertyName.Replace("m_Materials.Array.data", k_MaterialReferenceDisplayName);
 
             propertyName = ObjectNames.NicifyVariableName(propertyName);
             propertyName = propertyName.Replace("m_", "");

Editor/Mono/Audio/Mixer/Bindings/AudioMixerController.cs

@@ -5,8 +5,12 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Audio;
+using UnityEditor;
+using UnityEditor.Audio;
+using System.IO;
 using System;
 using System.Linq;
+
 using Object = UnityEngine.Object;
 
 namespace UnityEditor.Audio
@@ -37,13 +41,18 @@ public override string ResolveStringPath(bool getOnlyBasePath)
             {
                 return "Volume" + GetBasePath(group.GetDisplayString(), null);
             }
-
-            if (group.GetGUIDForPitch() == parameter)
+            else if (group.GetGUIDForPitch() == parameter)
             {
                 return "Pitch" + GetBasePath(group.GetDisplayString(), null);
             }
-
-            return "Error finding parameter path.";
+            else if (group.GetGUIDForSend() == parameter)
+            {
+                return "Send" + GetBasePath(group.GetDisplayString(), null);
+            }
+            else
+            {
+                return "Error finding Parameter path.";
+            }
         }
 
         protected string GetBasePath(string group, string effect)
@@ -73,29 +82,22 @@ public override string ResolveStringPath(bool getOnlyBasePath)
 
             if (effect.GetGUIDForMixLevel() == parameter)
             {
-                if (effect.IsSend())
-                {
-                    var allGroups = group.controller.GetAllAudioGroupsSlow();
-                    var effectMap = AudioMixerGroupController.GetEffectMapSlow(allGroups);
-                    return $"Send level{GetBasePath(group.GetDisplayString(), null)} to {effect.sendTarget.GetDisplayString(effectMap)}";
-                }
-
-                return $"Mix Level{GetBasePath(group.GetDisplayString(), effect.effectName)}";
+                return "Mix Level" + GetBasePath(group.GetDisplayString(), effect.effectName);
             }
-
-            MixerParameterDefinition[] paramDefs = MixerEffectDefinitions.GetEffectParameters(effect.effectName);
-
-            for (int i = 0; i < paramDefs.Length; i++)
+            else
             {
-                GUID guid = effect.GetGUIDForParameter(paramDefs[i].name);
-
-                if (guid == parameter)
+                MixerParameterDefinition[] paramDefs = MixerEffectDefinitions.GetEffectParameters(effect.effectName);
+                for (int i = 0; i < paramDefs.Length; i++)
                 {
-                    return paramDefs[i].name + GetBasePath(group.GetDisplayString(), effect.effectName);
+                    GUID guid = effect.GetGUIDForParameter(paramDefs[i].name);
+                    if (guid == parameter)
+                    {
+                        return paramDefs[i].name + GetBasePath(group.GetDisplayString(), effect.effectName);
+                    }
                 }
-            }
 
-            return "Error finding parameter path.";
+                return "Error finding Parameter path.";
+            }
         }
     }
 
@@ -105,12 +107,11 @@ public override string ResolveStringPath(bool getOnlyBasePath)
     internal sealed partial class AudioMixerController : AudioMixer
     {
         public static float kMinVolume = -80.0f; // The minimum volume is the level at which sends and effects can be bypassed
-        public static float kMaxEffect = 0.0f;
+        public static float kMaxEffect =   0.0f;
         public static float kVolumeWarp = 1.7f;
         public static string s_GroupEffectDisplaySeperator = "\\"; // Use backslash instead of forward slash to prevent OS menus from splitting path and creating submenus
 
         public event ChangedExposedParameterHandler ChangedExposedParameter;
-
         public void OnChangedExposedParameter()
         {
             if (ChangedExposedParameter != null)
@@ -130,7 +131,6 @@ public void ClearEventHandlers()
 
         [System.NonSerialized]
         private Dictionary<GUID, AudioParameterPath> m_ExposedParamPathCache;
-
         private Dictionary<GUID, AudioParameterPath> exposedParamCache
         {
             get
@@ -221,48 +221,35 @@ public string ResolveExposedParameterPath(GUID parameter, bool getOnlyBasePath)
             List<AudioMixerGroupController> groups = GetAllAudioGroupsSlow();
             foreach (AudioMixerGroupController group in groups)
             {
-                if (group.GetGUIDForVolume() == parameter || group.GetGUIDForPitch() == parameter)
+                if (group.GetGUIDForVolume()             == parameter ||
+                    group.GetGUIDForPitch()              == parameter ||
+                    group.GetGUIDForSend()               == parameter)
                 {
                     AudioGroupParameterPath newPath = new AudioGroupParameterPath(group, parameter);
                     exposedParamCache[parameter] = newPath;
                     return newPath.ResolveStringPath(getOnlyBasePath);
                 }
-
-                for (int i = 0; i < group.effects.Length; i++)
+                else
                 {
-                    AudioMixerEffectController effect = group.effects[i];
-                    MixerParameterDefinition[] paramDefs = MixerEffectDefinitions.GetEffectParameters(effect.effectName);
-
-                    var found = false;
-
-                    if (parameter == effect.GetGUIDForMixLevel())
+                    for (int i = 0; i < group.effects.Length; i++)
                     {
-                        found = true;
-                    }
-                    else
-                    {
-                        for (var j = 0; j < paramDefs.Length; j++)
-                        {
-                            var nextGuid = effect.GetGUIDForParameter(paramDefs[j].name);
+                        AudioMixerEffectController effect = group.effects[i];
+                        MixerParameterDefinition[] paramDefs = MixerEffectDefinitions.GetEffectParameters(effect.effectName);
 
-                            if (parameter == nextGuid)
+                        for (int j = 0; j < paramDefs.Length; j++)
+                        {
+                            GUID guid = effect.GetGUIDForParameter(paramDefs[j].name);
+                            if (guid == parameter)
                             {
-                                found = true;
-                                break;
+                                AudioEffectParameterPath newPath = new AudioEffectParameterPath(group, effect, parameter);
+                                exposedParamCache[parameter] = newPath;
+                                return newPath.ResolveStringPath(getOnlyBasePath);
                             }
                         }
                     }
-
-                    if (found)
-                    {
-                        var newPath = new AudioEffectParameterPath(group, effect, parameter);
-                        exposedParamCache[parameter] = newPath;
-                        return newPath.ResolveStringPath(getOnlyBasePath);
-                    }
                 }
             }
-
-            return "Error finding parameter path";
+            return "Error finding Parameter path";
         }
 
         public static AudioMixerController CreateMixerControllerAtPath(string path)
@@ -342,7 +329,6 @@ private bool IsChildOf(AudioMixerGroupController child, List<AudioMixerGroupCont
                 if (groups.Contains(child))
                     return true;
             }
-
             return false;
         }
 
@@ -365,7 +351,6 @@ private void RemoveAncestorGroups(List<AudioMixerGroupController> groups)
         private void DestroyExposedParametersContainedInEffect(AudioMixerEffectController effect)
         {
             Undo.RecordObject(this, "Changed Exposed Parameters");
-
             //Cleanup exposed parameters that were in the effect
             var exposedParams = exposedParameters;
             foreach (var param in exposedParams)
@@ -378,12 +363,11 @@ private void DestroyExposedParametersContainedInEffect(AudioMixerEffectControlle
         private void DestroyExposedParametersContainedInGroup(AudioMixerGroupController group)
         {
             Undo.RecordObject(this, "Remove Exposed Parameter");
-
             //Clean up the exposed parameters that were in the group.
             var exposedParams = exposedParameters;
             foreach (var param in exposedParams)
             {
-                if (group.GetGUIDForVolume() == param.guid || group.GetGUIDForPitch() == param.guid)
+                if (group.GetGUIDForVolume() == param.guid || group.GetGUIDForPitch() == param.guid || group.GetGUIDForSend() == param.guid)
                     RemoveExposedParameter(param.guid);
             }
         }
@@ -562,7 +546,6 @@ public AudioMixerGroupController FindParentGroup(AudioMixerGroupController node,
                 if (g != null)
                     return g;
             }
-
             return null;
         }
 
@@ -618,6 +601,8 @@ private AudioMixerGroupController DuplicateGroupRecurse(AudioMixerGroupControlle
                     s.SetValue(targetGroup.GetGUIDForVolume(), value);
                 if (s.GetValue(sourceGroup.GetGUIDForPitch(), out value))
                     s.SetValue(targetGroup.GetGUIDForPitch(), value);
+                if (s.GetValue(sourceGroup.GetGUIDForSend(), out value))
+                    s.SetValue(targetGroup.GetGUIDForSend(), value);
             }
 
             AssetDatabase.AddObjectToAsset(targetGroup, this);
@@ -677,7 +662,6 @@ public void CopyEffectSettingsToAllSnapshots(AudioMixerGroupController group, in
                     if (snapshot.GetValue(guid, out value))
                         snaps[n].SetValue(guid, value);
                 }
-
                 foreach (var p in paramDefs)
                 {
                     var guid = effect.GetGUIDForParameter(p.name);
@@ -766,7 +750,6 @@ public static bool MoveEffect(ref List<AudioMixerEffectController> sourceEffects
                 if (sourceIndex == targetIndex)
                     return false;
             }
-
             if (sourceIndex < 0 || sourceIndex >= sourceEffects.Count)
                 return false;
             if (targetIndex < 0 || targetIndex > targetEffects.Count)
@@ -802,7 +785,6 @@ public class ConnectionNode
             public List<object> targets = new List<object>();
             public AudioMixerGroupController group = null;
             public AudioMixerEffectController effect = null;
-
             public string GetDisplayString()
             {
                 string s = group.GetDisplayString();
@@ -849,17 +831,13 @@ static private Dictionary<object, ConnectionNode> BuildTemporaryGraph(
                             graph[target].group = group;
                             graph[target].effect = target;
                         }
-
                         if (!graph[effect].targets.Contains(target))
                             graph[effect].targets.Add(target);
                     }
-
                     groupTail = effect;
                 }
-
                 graph[group].groupTail = groupTail;
             }
-
             return graph;
         }
 
@@ -886,10 +864,8 @@ static private bool CheckForCycle(object curr, Dictionary<object, ConnectionNode
                     identifiedLoop.Clear();
                     identifiedLoop.Add(node);
                 }
-
                 return true;
             }
-
             node.visited = true;
             foreach (var s in node.targets)
             {
@@ -901,7 +877,6 @@ static private bool CheckForCycle(object curr, Dictionary<object, ConnectionNode
                     return true;
                 }
             }
-
             node.visited = false;
             return false;
         }
@@ -923,11 +898,9 @@ static public bool DoesTheTemporaryGraphHaveAnyCycles(List<AudioMixerGroupContro
                         identifiedLoop.RemoveRange(i, identifiedLoop.Count - i);
                         identifiedLoop.Reverse();
                     }
-
                     return true;
                 }
             }
-
             return false;
         }
 

Editor/Mono/Audio/Mixer/Bindings/AudioMixerGroup.cs

@@ -3,6 +3,9 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEditor;
+using UnityEditor.Audio;
+using System.IO;
 using System.Collections.Generic;
 using System;
 
@@ -57,17 +60,6 @@ public override string ToString()
         {
             return name;
         }
-
-        public static Dictionary<AudioMixerEffectController, AudioMixerGroupController> GetEffectMapSlow(List<AudioMixerGroupController> allGroups)
-        {
-            var effectMap = new Dictionary<AudioMixerEffectController, AudioMixerGroupController>();
-
-            foreach (var g in allGroups)
-                foreach (var e in g.effects)
-                    effectMap[e] = g;
-
-            return effectMap;
-        }
     }
 
     internal class MixerGroupControllerCompareByName : IComparer<AudioMixerGroupController>

Editor/Mono/Audio/Mixer/GUI/AudioMixerChannelStripView.cs

@@ -18,7 +18,6 @@ internal class AudioMixerChannelStripView
         [Serializable]
         public class State
         {
-            public int m_LastClickedInstanceID = 0;
             public Vector2 m_ScrollPos = new Vector2(0, 0);
         }
 
@@ -941,7 +940,7 @@ void GroupClicked(AudioMixerGroupController clickedGroup, ChannelStripParams p,
             foreach (var group in m_Controller.CachedSelection)
                 selectedIDs.Add(group.GetInstanceID());
 
-            int lastClickedID = m_State.m_LastClickedInstanceID;
+            int lastClickedID = selectedIDs.Count > 0 ? selectedIDs.Last() : 0;
             bool allowMultiselection = true;
             bool keepMultiSelection = Event.current.shift || clickedControlInGroup;
             bool useShiftAsActionKey = false;