Unity 2020.2.0a7 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -96,5 +96,8 @@ public static class SpriteAtlasExtensions
         extern internal static TextureFormat GetTextureFormat(this SpriteAtlas spriteAtlas, BuildTarget target);
         extern internal static Sprite[] GetPackedSprites(this SpriteAtlas spriteAtlas);
         extern internal static Hash128 GetStoredHash(this SpriteAtlas spriteAtlas);
+        extern internal static TextureImporterPlatformSettings GetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, string buildTarget, string secondaryTextureName);
+        extern internal static void SetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src, string secondaryTextureName);
+        extern internal static void DeleteSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, string secondaryTextureName);
     }
 }

Editor/Mono/2D/SpriteAtlas/SpriteAtlasAsset.bindings.cs

@@ -40,5 +40,8 @@ public class SpriteAtlasAsset : UnityEngine.Object
 
         extern internal TextureFormat GetTextureFormat(BuildTarget target);
         extern internal void CopyMasterAtlasSettings();
+        extern internal TextureImporterPlatformSettings GetSecondaryPlatformSettings(string buildTarget, string secondaryTextureName);
+        extern internal void SetSecondaryPlatformSettings(TextureImporterPlatformSettings src, string secondaryTextureName);
+        extern internal void DeleteSecondaryPlatformSettings(string secondaryTextureName);
     }
 };

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -302,6 +302,9 @@ private void Refresh()
                 m_SelectedKeysCache = null;
                 m_SelectionBoundsCache = null;
 
+                if (animEditor != null && animEditor.curveEditor != null)
+                    animEditor.curveEditor.InvalidateSelectionBounds();
+
                 ClearCurveWrapperCache();
 
                 if (hierarchyData != null)
@@ -323,6 +326,9 @@ private void Refresh()
                 m_SelectedKeysCache = null;
                 m_SelectionBoundsCache = null;
 
+                if (animEditor != null && animEditor.curveEditor != null)
+                    animEditor.curveEditor.InvalidateSelectionBounds();
+
                 ReloadModifiedAnimationCurveCache();
                 ReloadModifiedDopelineCache();
                 ReloadModifiedCurveWrapperCache();
@@ -465,6 +471,8 @@ void CurveWasModified(AnimationClip clip, EditorCurveBinding binding, AnimationU
                 // Otherwise do a full reload
                 refresh = RefreshType.Everything;
             }
+            // Force repaint to display live animation curve changes from other editor window (like timeline).
+            Repaint();
         }
 
         public void SaveKeySelection(string undoLabel)

Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs

@@ -131,6 +131,8 @@ public int MoveKey(int index, ref Keyframe key)
             return curve.MoveKey(index, key);
         }
 
+        internal Bounds ComputeBoundsBetweenTime(float start, float end) => renderer.GetBounds(start, end);
+
         // An additional vertical min / max range clamp when editing multiple curves with different ranges
         public float vRangeMin = -Mathf.Infinity;
         public float vRangeMax = Mathf.Infinity;
@@ -520,6 +522,7 @@ internal Keyframe GetKeyframeFromSelection(CurveSelection curveSelection)
 
         private bool m_BoundsAreDirty = true;
         private bool m_SelectionBoundsAreDirty = true;
+        private bool m_SelectionWithCurvesBoundsAreDirty = true;
 
         private bool m_EnableCurveGroups = false;
 
@@ -533,6 +536,16 @@ public Bounds selectionBounds
             }
         }
 
+        Bounds m_SelectionWithCurvesBounds = new Bounds(Vector3.zero, Vector3.zero);
+        public Bounds selectionWithCurvesBounds
+        {
+            get
+            {
+                RecalculateSelectionWithCurvesBounds();
+                return m_SelectionWithCurvesBounds;
+            }
+        }
+
         Bounds m_CurveBounds = new Bounds(Vector3.zero, Vector3.zero);
         public Bounds curveBounds
         {
@@ -830,6 +843,7 @@ private void RecalculateBounds()
         public void InvalidateSelectionBounds()
         {
             m_SelectionBoundsAreDirty = true;
+            m_SelectionWithCurvesBoundsAreDirty = true;
         }
 
         private void RecalculateSelectionBounds()
@@ -858,6 +872,37 @@ private void RecalculateSelectionBounds()
             m_SelectionBoundsAreDirty = false;
         }
 
+        private void RecalculateSelectionWithCurvesBounds()
+        {
+            if (!m_SelectionWithCurvesBoundsAreDirty)
+                return;
+
+            m_SelectionWithCurvesBounds = m_SelectionBounds;
+
+            //Aggregate selected key in between curves.
+            if (hasSelection)
+            {
+                CurveSelection[] selected = selectedCurves.OrderBy(p => p.curveID).ThenBy(p => p.key).ToArray();
+                int currentCurveId = selected.First().curveID;
+                CurveWrapper currentCurveWrapper = GetCurveWrapperFromID(currentCurveId);
+                for (int i = 0; i < selected.Length - 1; i++)
+                {
+                    if (currentCurveId != selected[i + 1].curveID)
+                    {
+                        currentCurveId = selected[i + 1].curveID;
+                        currentCurveWrapper = GetCurveWrapperFromID(currentCurveId);
+                        continue;
+                    }
+                    Keyframe keyframeStart = GetKeyframeFromSelection(selected[i]);
+                    Keyframe keyframeEnd = GetKeyframeFromSelection(selected[i + 1]);
+                    Bounds inBetweenBounds = currentCurveWrapper.ComputeBoundsBetweenTime(keyframeStart.time, keyframeEnd.time);
+                    m_SelectionWithCurvesBounds.Encapsulate(inBetweenBounds);
+                }
+            }
+
+            m_SelectionWithCurvesBoundsAreDirty = false;
+        }
+
         public Bounds GetClipBounds()
         {
             return curveBounds;
@@ -884,10 +929,16 @@ public Bounds GetSelectionBounds()
                     frameBounds.Encapsulate(new Vector2(cw.curve[cs.key - 1].time, cw.curve[cs.key - 1].value));
                 if (cs.key + 1 < cw.curve.length)
                     frameBounds.Encapsulate(new Vector2(cw.curve[cs.key + 1].time, cw.curve[cs.key + 1].value));
+
+                //Include neighboring curves in bounds
+                if (cs.key - 1 >= 0)
+                    frameBounds.Encapsulate(cw.ComputeBoundsBetweenTime(cw.curve[cs.key - 1].time, cw.curve[cs.key].time));
+                if (cs.key + 1 < cw.curve.length)
+                    frameBounds.Encapsulate(cw.ComputeBoundsBetweenTime(cw.curve[cs.key].time, cw.curve[cs.key + 1].time));
             }
             else
             {
-                frameBounds = selectionBounds;
+                frameBounds = selectionWithCurvesBounds;
             }
 
             // Enforce minimum size of bounds

Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

@@ -33,6 +33,9 @@ internal sealed partial class AnnotationUtility
 
         extern internal static  void SetIconEnabled(int classID, string scriptClass, int iconEnabled);
 
+        [StaticAccessor("GizmoManager::Get()", StaticAccessorType.Dot)]
+        extern internal static  int SetGizmosDirty();
+
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
         extern internal static  string[] GetPresetList();
 

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -173,6 +173,15 @@ internal static bool ShowAtPosition(Rect buttonRect, bool isGameView)
                 Event.current.Use();
                 if (s_AnnotationWindow == null)
                     s_AnnotationWindow = ScriptableObject.CreateInstance<AnnotationWindow>();
+                else
+                {
+                    // We are treating AnnotationWindow like a PopupWindow which has logic to reclose it when opened,
+                    // AuxWindows derived from EditorWindow reset/reopen when repeatedly clicking the open button by design.
+                    // Call Cancel() here if it is already open.
+                    s_AnnotationWindow.Cancel();
+                    return false;
+                }
+
                 s_AnnotationWindow.Init(buttonRect, isGameView);
                 return true;
             }

Editor/Mono/Annotation/AnnotationUtility.bindings.cs

@@ -0,0 +1,15 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor
+{
+    [NativeHeader("Editor/Src/AssetPipeline/ComputeShaderImporter.h")]
+    public sealed partial class ComputeShaderImporter : AssetImporter
+    {
+        [NativeProperty("PreprocessorOverride")] extern public PreprocessorOverride preprocessorOverride { get; set; }
+    }
+}

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -8,8 +8,6 @@
 namespace UnityEditor
 {
     [NativeHeader("Editor/Src/AssetPipeline/ShaderImporter.h")]
-
-
     public sealed partial class ShaderImporter : AssetImporter
     {
         public extern Shader GetShader();
@@ -21,5 +19,7 @@ public sealed partial class ShaderImporter : AssetImporter
         public extern void SetNonModifiableTextures(string[] name, Texture[] textures);
 
         public extern Texture GetNonModifiableTexture(string name);
+
+        [NativeProperty("PreprocessorOverride")] extern public PreprocessorOverride preprocessorOverride { get; set; }
     }
 }