Unity 6000.2.0a4 C# reference source code

Author: Unity Technologies

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

@@ -111,8 +111,23 @@ internal static void RegisterAndPackAtlas(this SpriteAtlas spriteAtlas, AssetImp
         extern public static void SetTextureSettings([NotNull] this SpriteAtlas spriteAtlas, SpriteAtlasTextureSettings src);
         extern public static SpriteAtlasPackingSettings GetPackingSettings([NotNull] this SpriteAtlas spriteAtlas);
         extern public static void SetPackingSettings([NotNull] this SpriteAtlas spriteAtlas, SpriteAtlasPackingSettings src);
-        extern public static TextureImporterPlatformSettings GetPlatformSettings([NotNull] this SpriteAtlas spriteAtlas, string buildTarget);
-        extern public static void SetPlatformSettings([NotNull] this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src);
+
+        [NativeName("GetPlatformSettings")]
+        extern private static TextureImporterPlatformSettings GetPlatformSettings_Internal([NotNull] this SpriteAtlas spriteAtlas, string buildTarget);
+        public static TextureImporterPlatformSettings GetPlatformSettings(this SpriteAtlas spriteAtlas, string buildTarget)
+        {
+            buildTarget = TextureImporter.GetTexturePlatformSerializationName(buildTarget); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            return GetPlatformSettings_Internal(spriteAtlas, buildTarget);
+        }
+
+        [NativeName("SetPlatformSettings")]
+        extern private static void SetPlatformSettings_Internal([NotNull] this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src);
+        public static void SetPlatformSettings(this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src)
+        {
+            src.name = TextureImporter.GetTexturePlatformSerializationName(src.name); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            SetPlatformSettings_Internal(spriteAtlas, src);
+        }
+
         extern public static void SetIncludeInBuild([NotNull] this SpriteAtlas spriteAtlas, bool value);
         extern public static void SetIsVariant([NotNull] this SpriteAtlas spriteAtlas, bool value);
         extern public static void SetMasterAtlas([NotNull] this SpriteAtlas spriteAtlas, SpriteAtlas value);
@@ -126,8 +141,23 @@ internal static void RegisterAndPackAtlas(this SpriteAtlas spriteAtlas, AssetImp
         extern internal static TextureFormat GetTextureFormat([NotNull] this SpriteAtlas spriteAtlas, BuildTarget target);
         extern internal static Sprite[] GetPackedSprites([NotNull] this SpriteAtlas spriteAtlas);
         extern internal static Hash128 GetStoredHash([NotNull] this SpriteAtlas spriteAtlas);
-        extern internal static TextureImporterPlatformSettings GetSecondaryPlatformSettings([NotNull] this SpriteAtlas spriteAtlas, string buildTarget, string secondaryTextureName);
-        extern internal static void SetSecondaryPlatformSettings([NotNull] this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src, string secondaryTextureName);
+
+        [NativeName("GetSecondaryPlatformSettings")]
+        extern private static TextureImporterPlatformSettings GetSecondaryPlatformSettings_Internal([NotNull] this SpriteAtlas spriteAtlas, string buildTarget, string secondaryTextureName);
+        internal static TextureImporterPlatformSettings GetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, string buildTarget, string secondaryTextureName)
+        {
+            buildTarget = TextureImporter.GetTexturePlatformSerializationName(buildTarget); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            return GetSecondaryPlatformSettings_Internal(spriteAtlas, buildTarget, secondaryTextureName);
+        }
+
+        [NativeName("SetSecondaryPlatformSettings")]
+        extern private static void SetSecondaryPlatformSettings_Internal([NotNull] this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src, string secondaryTextureName);
+        internal static void SetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src, string secondaryTextureName)
+        {
+            src.name = TextureImporter.GetTexturePlatformSerializationName(src.name); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            SetSecondaryPlatformSettings_Internal(spriteAtlas, src, secondaryTextureName);
+        }
+
         extern internal static bool GetSecondaryColorSpace([NotNull] this SpriteAtlas spriteAtlas, string secondaryTextureName);
         extern internal static void SetSecondaryColorSpace([NotNull] this SpriteAtlas spriteAtlas, string secondaryTextureName, bool srGB);
         extern internal static void DeleteSecondaryPlatformSettings([NotNull] this SpriteAtlas spriteAtlas, string secondaryTextureName);

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

@@ -24,11 +24,41 @@ public sealed partial class SpriteAtlasImporter : AssetImporter
         extern public bool includeInBuild { get; set; }
         extern public SpriteAtlasPackingSettings packingSettings { get; set; }
         extern public SpriteAtlasTextureSettings textureSettings { get; set; }
-        extern public void SetPlatformSettings(TextureImporterPlatformSettings src);
-        extern public TextureImporterPlatformSettings GetPlatformSettings(string buildTarget);
+
+        [NativeName("SetPlatformSettings")]
+        extern private void SetPlatformSettings_Internal(TextureImporterPlatformSettings src);
+        public void SetPlatformSettings(TextureImporterPlatformSettings src)
+        {
+            src.name = TextureImporter.GetTexturePlatformSerializationName(src.name); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            SetPlatformSettings_Internal(src);
+        }
+
+        [NativeName("GetPlatformSettings")]
+        extern private TextureImporterPlatformSettings GetPlatformSettings_Internal(string buildTarget);
+        public TextureImporterPlatformSettings GetPlatformSettings(string buildTarget)
+        {
+            buildTarget = TextureImporter.GetTexturePlatformSerializationName(buildTarget); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            return GetPlatformSettings_Internal(buildTarget);
+        }
+
         extern internal TextureFormat GetTextureFormat(BuildTarget target);
-        extern internal TextureImporterPlatformSettings GetSecondaryPlatformSettings(string buildTarget, string secondaryTextureName);
-        extern internal void SetSecondaryPlatformSettings(TextureImporterPlatformSettings src, string secondaryTextureName);
+
+        [NativeName("GetSecondaryPlatformSettings")]
+        extern private TextureImporterPlatformSettings GetSecondaryPlatformSettings_Internal(string buildTarget, string secondaryTextureName);
+        internal TextureImporterPlatformSettings GetSecondaryPlatformSettings(string buildTarget, string secondaryTextureName)
+        {
+            buildTarget = TextureImporter.GetTexturePlatformSerializationName(buildTarget); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            return GetSecondaryPlatformSettings_Internal(buildTarget, secondaryTextureName);
+        }
+
+        [NativeName("SetSecondaryPlatformSettings")]
+        extern private void SetSecondaryPlatformSettings_Internal(TextureImporterPlatformSettings src, string secondaryTextureName);
+        internal void SetSecondaryPlatformSettings(TextureImporterPlatformSettings src, string secondaryTextureName)
+        {
+            src.name = TextureImporter.GetTexturePlatformSerializationName(src.name); // String may refer to a platform group: if != "Standalone", ensure it refers to a platform instead. E.g.: "iOS", not "iPhone".
+            SetSecondaryPlatformSettings_Internal(src, secondaryTextureName);
+        }
+
         extern internal bool GetSecondaryColorSpace(string secondaryTextureName);
         extern internal void SetSecondaryColorSpace(string secondaryTextureName, bool srGB);
         extern internal void DeleteSecondaryPlatformSettings(string secondaryTextureName);

Editor/Mono/Animation/AnimationUtility.bindings.cs

@@ -130,7 +130,12 @@ public static AnimationClip[] GetAnimationClips(GameObject gameObject)
                     var extraClips = new List<AnimationClip>();
                     clipSources[i].GetAnimationClips(extraClips);
 
-                    allClips.AddRange(extraClips);
+                    allClips.Capacity = allClips.Count + extraClips.Count;
+                    foreach (var clip in extraClips)
+                    {
+                        if (clip != null)
+                            allClips.Add(clip);
+                    }
                 }
 
                 return allClips.ToArray();

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -44,11 +44,13 @@ public enum NormalizationMode
 
         [SerializeField]
         GUIView m_DelegateView;
-        internal GUIView delegateView => m_DelegateView;
 
         public const string CurveChangedCommand = "CurveChanged";
         public const string CurveChangeCompletedCommand = "CurveChangeCompleted";
 
+        // Watch out when accessing this, it will create a new curve editor window if none exists yet.
+        // If you don't display the window (call Show()), it will cause an error when validating the layout
+        // (e.g. when the user maximizes a window).
         public static CurveEditorWindow instance
         {
             get
@@ -100,6 +102,11 @@ public static Color color
             }
         }
 
+        internal static GUIView delegateView
+        {
+            get { return visible ? CurveEditorWindow.instance.m_DelegateView : null; }
+        }
+
         public static bool visible
         {
             get { return s_SharedCurveEditor != null; }

Editor/Mono/Animation/AnimatorController.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEngine;
 using System.IO;
 using System.Collections.Generic;
@@ -305,14 +306,10 @@ public Motion GetStateEffectiveMotion(AnimatorState state)
 
         public Motion GetStateEffectiveMotion(AnimatorState state, int layerIndex)
         {
-            if (layers[layerIndex].syncedLayerIndex == -1)
-            {
-                return state.motion;
-            }
-            else
-            {
-                return layers[layerIndex].GetOverrideMotion(state);
-            }
+            if (layerIndex < 0 || layerIndex > layers.Length)
+                return null;
+
+            return layers[layerIndex].syncedLayerIndex == -1 ? state.motion : layers[layerIndex].GetOverrideMotion(state);
         }
 
         public void SetStateEffectiveBehaviours(AnimatorState state, int layerIndex, StateMachineBehaviour[] behaviours)
@@ -331,6 +328,9 @@ public void SetStateEffectiveBehaviours(AnimatorState state, int layerIndex, Sta
 
         public StateMachineBehaviour[] GetStateEffectiveBehaviours(AnimatorState state, int layerIndex)
         {
+            if (layerIndex < 0 || layerIndex > layers.Length)
+                return Array.Empty<StateMachineBehaviour>();
+
             return Internal_GetEffectiveBehaviours(state, layerIndex) as StateMachineBehaviour[];
         }
 

Editor/Mono/Animation/StateMachine.cs

@@ -100,11 +100,12 @@ public void RemoveCondition(AnimatorCondition condition)
         }
     }
 
-
+    [HelpURL("StateMachineTransitions")]
     internal class AnimatorDefaultTransition : ScriptableObject
     {
     }
 
+    [HelpURL("class-State")]
     public partial class AnimatorState : Object
     {
         private PushUndoIfNeeded undoHandler = new PushUndoIfNeeded(true);
@@ -242,6 +243,7 @@ public int uniqueNameHash
         }
     }
 
+    [HelpURL("NestedStateMachines")]
     public partial class AnimatorStateMachine : Object
     {
         private PushUndoIfNeeded undoHandler = new PushUndoIfNeeded(true);

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -56,7 +56,6 @@ private enum EnabledState
         const float k_WindowWidth = 270;
         const float k_ScrollBarWidth = 14;
         const float k_ListElementHeight = 18;
-        const float k_JustClosedPeriod = 200;
         const float k_FrameWidth = 1f;
         float iconSize = 16;
         float gizmoRightAlign;
@@ -66,6 +65,8 @@ private enum EnabledState
 
         static AnnotationWindow s_AnnotationWindow = null;
         static long s_LastClosedTime;
+        const long k_JustClosedPeriod = 400;
+
         static Styles m_Styles;
         List<GizmoInfo> m_RecentAnnotations;
         List<GizmoInfo> m_BuiltinAnnotations;

Editor/Mono/Annotation/LayerVisibilityWindow.cs

@@ -39,14 +39,14 @@ public Styles()
         const float k_FrameWidth = 1f;
         const float k_ToggleSize = 17;
         const float k_SeparatorHeight = 6;
-        const float k_JustClosedPeriod = 200;
         const string k_LayerVisible = "Show/Hide Layer";
         const string k_LayerPickable = "Toggle Pickable status this Layer. Non-Pickable items cannot be selected in the Scene View.";
 
         private static LayerVisibilityWindow s_LayerVisibilityWindow;
         private static long s_LastClosedTime;
-        private static Styles s_Styles;
+        const long k_JustClosedPeriod = 400;
 
+        private static Styles s_Styles;
         private List<string> s_LayerNames;
         private List<int> s_LayerMasks;
         private int m_AllLayersMask;

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -146,6 +146,18 @@ static class Styles
 
         }
 
+        // Default CameraMode should be DrawCameraMode.GIContributorsReceivers
+        internal static SceneView.CameraMode defaultCameraMode
+        {
+            get
+            {
+                var mode = Styles.sBuiltinCameraModes [3];
+                if(mode.drawMode != DrawCameraMode.GIContributorsReceivers)
+                    Debug.LogError("Default Draw Camera mode should be set to DrawCameraMode.GIContributorsReceivers.");
+                return mode;
+            }
+        }
+
         private Dictionary<string, bool> foldoutStates = new Dictionary<string, bool>();
 
         private float windowHeight

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -52,6 +52,7 @@
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Profiler")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Rendering")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.SceneVisibility")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.ScriptCompilation")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.ShortcutManager")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.UIToolkit")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Framework.PackageManager")]