Unity 2017.4.11f1 C# reference source code

Unity Technologies · Unity Technologies · commit a330baecf8be · 2018-09-13T09:35:24.000Z
diff --git a/Editor/Mono/2D/Common/TexturePlatformSettingsController.cs b/Editor/Mono/2D/Common/TexturePlatformSettingsController.cs
@@ -87,21 +87,25 @@ public bool HandlePlatformSettings(BuildTarget buildTarget, List<TextureImporter
             int allSize = platformSettings[0].maxTextureSize;
             TextureImporterFormat allFormat = platformSettings[0].format;
             int allCompressionQuality = platformSettings[0].compressionQuality;
+            var allAlphaSplit = platformSettings[0].allowsAlphaSplitting;
 
             var newOverride = allOverride;
             var newSize = allSize;
             var newFormat = allFormat;
             var newCompressionQuality = allCompressionQuality;
+            var newAlphaSplit = allAlphaSplit;
 
             bool mixedOverride = false;
             bool mixedSize = false;
             bool mixedFormat = false;
             bool mixedCompression = false;
+            var mixedAlphaSplit = false;
 
             bool overrideChanged = false;
             bool sizeChanged = false;
             bool formatChanged = false;
             bool compressionChanged = false;
+            var alphaSplitChanged = false;
 
             for (var i = 1; i < platformSettings.Count; ++i)
             {
@@ -114,6 +118,8 @@ public bool HandlePlatformSettings(BuildTarget buildTarget, List<TextureImporter
                     mixedFormat = true;
                 if (settings.compressionQuality != allCompressionQuality)
                     mixedCompression = true;
+                if (settings.allowsAlphaSplitting != allAlphaSplit)
+                    mixedAlphaSplit = true;
             }
 
             newOverride = view.DrawOverride(allOverride, mixedOverride, out overrideChanged);
@@ -166,9 +172,17 @@ public bool HandlePlatformSettings(BuildTarget buildTarget, List<TextureImporter
                 {
                     newCompressionQuality = view.DrawCompressionQualitySlider(allCompressionQuality, mixedCompression, out compressionChanged);
                 }
+
+                // show the ETC1 split option only for sprites on platforms supporting ETC.
+                bool isETCPlatform = formatHelper.IsETC1SupportedByBuildTarget(buildTarget);
+                bool isETCFormatSelected = formatHelper.IsTextureFormatETC1Compression((TextureFormat)allFormat);
+                if (isETCPlatform && isETCFormatSelected)
+                {
+                    newAlphaSplit = view.DrawAlphaSplit(allAlphaSplit, mixedAlphaSplit, mixedOverride || !allOverride, out alphaSplitChanged);
+                }
             }
 
-            if (overrideChanged || sizeChanged || formatChanged || compressionChanged)
+            if (overrideChanged || sizeChanged || formatChanged || compressionChanged || alphaSplitChanged)
             {
                 for (var i = 0; i < platformSettings.Count; ++i)
                 {
@@ -180,6 +194,8 @@ public bool HandlePlatformSettings(BuildTarget buildTarget, List<TextureImporter
                         platformSettings[i].format = newFormat;
                     if (compressionChanged)
                         platformSettings[i].compressionQuality = newCompressionQuality;
+                    if (alphaSplitChanged)
+                        platformSettings[i].allowsAlphaSplitting = newAlphaSplit;
                 }
 
                 return true;
diff --git a/Editor/Mono/2D/Common/TexturePlatformSettingsFormatHelper.cs b/Editor/Mono/2D/Common/TexturePlatformSettingsFormatHelper.cs
@@ -58,5 +58,15 @@ public bool TextureFormatRequireCompressionQualityInput(TextureImporterFormat fo
         {
             return TextureImporterInspector.IsFormatRequireCompressionSetting(format);
         }
+
+        public bool IsETC1SupportedByBuildTarget(BuildTarget buildTarget)
+        {
+            return TextureImporter.IsETC1SupportedByBuildTarget(buildTarget);
+        }
+
+        public bool IsTextureFormatETC1Compression(TextureFormat format)
+        {
+            return TextureImporter.IsTextureFormatETC1Compression(format);
+        }
     }
 }
diff --git a/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs b/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs
@@ -15,6 +15,7 @@ class Styles
             public readonly GUIContent maxTextureSizeLabel = EditorGUIUtility.TextContent("Max Texture Size|Maximum size of the packed texture.");
             public readonly GUIContent compressionLabel = EditorGUIUtility.TextContent("Compression|How will this texture be compressed?");
             public readonly GUIContent useCrunchedCompressionLabel = EditorGUIUtility.TextContent("Use Crunch Compression|Texture is crunch-compressed to save space on disk when applicable.");
+            public readonly GUIContent useAlphaSplitLabel = EditorGUIUtility.TrTextContent("Split Alpha Channel", "Alpha for this texture will be preserved by splitting the alpha channel to another texture, and both resulting textures will be compressed using ETC1.");
             public readonly GUIContent compressionQualityLabel = EditorGUIUtility.TextContent("Compressor Quality");
             public readonly GUIContent compressionQualitySliderLabel = EditorGUIUtility.TextContent("Compressor Quality|Use the slider to adjust compression quality from 0 (Fastest) to 100 (Best)");
 
@@ -133,5 +134,18 @@ public virtual int DrawCompressionQualitySlider(int defaultValue, bool isMixedVa
             changed = EditorGUI.EndChangeCheck();
             return defaultValue;
         }
+
+        public virtual bool DrawAlphaSplit(bool defaultValue, bool isMixedValue, bool isDisabled, out bool changed)
+        {
+            using (new EditorGUI.DisabledScope(isDisabled))
+            {
+                EditorGUI.BeginChangeCheck();
+                EditorGUI.showMixedValue = isMixedValue;
+                defaultValue = EditorGUILayout.Toggle(s_Styles.useAlphaSplitLabel, defaultValue);
+                EditorGUI.showMixedValue = false;
+                changed = EditorGUI.EndChangeCheck();
+                return defaultValue;
+            }
+        }
     }
 }
diff --git a/Editor/Mono/2D/Interface/ITexturePlatformSetting.cs b/Editor/Mono/2D/Interface/ITexturePlatformSetting.cs
@@ -12,6 +12,7 @@ internal interface ITexturePlatformSettingsView
         string buildPlatformTitle { get; set; }
         TextureImporterCompression DrawCompression(TextureImporterCompression defaultValue, bool isMixedValue, out bool changed);
         bool DrawUseCrunchedCompression(bool defaultValue, bool isMixedValue, out bool changed);
+        bool DrawAlphaSplit(bool defaultValue, bool isMixedValue, bool isDisabled, out bool changed);
         bool DrawOverride(bool defaultValue, bool isMixedValue, out bool changed);
         int DrawMaxSize(int defaultValue, bool isMixedValue, out bool changed);
         TextureImporterFormat DrawFormat(TextureImporterFormat defaultValue, int[] displayValues, string[] displayStrings, bool isMixedValue, bool isDisabled, out bool changed);
@@ -24,6 +25,10 @@ internal interface ITexturePlatformSettingsFormatHelper
         void AcquireTextureFormatValuesAndStrings(BuildTarget buildTarget, out int[] displayValues, out string[] displayStrings);
 
         bool TextureFormatRequireCompressionQualityInput(TextureImporterFormat format);
+
+        bool IsETC1SupportedByBuildTarget(BuildTarget buildTarget);
+
+        bool IsTextureFormatETC1Compression(TextureFormat format);
     }
 
     internal interface ITexturePlatformSettingsController
diff --git a/Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs b/Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs
@@ -125,6 +125,7 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
         private int[] m_OptionValues = null;
         private string[] m_OptionDisplays = null;
         private Texture2D[] m_PreviewTextures = null;
+        private Texture2D[] m_PreviewAlphaTextures = null;
 
         private bool m_PackableListExpanded = true;
         private ReorderableList m_PackableList;
@@ -575,6 +576,7 @@ void CachePreviewTexture()
             if (m_PreviewTextures == null || m_Hash != spriteAtlas.GetHashString())
             {
                 m_PreviewTextures = spriteAtlas.GetPreviewTextures();
+                m_PreviewAlphaTextures = spriteAtlas.GetPreviewAlphaTextures();
                 m_Hash = spriteAtlas.GetHashString();
 
                 if (m_PreviewTextures != null
@@ -623,7 +625,7 @@ public override void OnPreviewSettings()
             {
                 Texture2D t = m_PreviewTextures[m_PreviewPage];
 
-                if (TextureUtil.HasAlphaTextureFormat(t.format))
+                if (TextureUtil.HasAlphaTextureFormat(t.format) || (m_PreviewAlphaTextures != null && m_PreviewAlphaTextures.Length > 0))
                     m_ShowAlpha = GUILayout.Toggle(m_ShowAlpha, m_ShowAlpha ? s_Styles.alphaIcon : s_Styles.RGBIcon, s_Styles.previewButton);
 
                 int mipCount = Mathf.Max(1, TextureUtil.GetMipmapCount(t));
@@ -639,7 +641,13 @@ public override void OnPreviewSettings()
         public override void OnPreviewGUI(Rect r, GUIStyle background)
         {
             CachePreviewTexture();
-            if (m_PreviewTextures != null && m_PreviewPage < m_PreviewTextures.Length)
+
+            if (m_ShowAlpha && m_PreviewAlphaTextures != null && m_PreviewPage < m_PreviewAlphaTextures.Length)
+            {
+                var at = m_PreviewAlphaTextures[m_PreviewPage];
+                EditorGUI.DrawTextureTransparent(r, at, ScaleMode.ScaleToFit);
+            }
+            else if (m_PreviewTextures != null && m_PreviewPage < m_PreviewTextures.Length)
             {
                 Texture2D t = m_PreviewTextures[m_PreviewPage];
 
diff --git a/Editor/Mono/AssetPipeline/ModelImporter.bindings.cs b/Editor/Mono/AssetPipeline/ModelImporter.bindings.cs
@@ -816,7 +816,7 @@ internal extern bool isAssetOlderOr42
         }
 
         [FreeFunction("ModelImporterBindings::UpdateTransformMask")]
-        extern internal static void UpdateTransformMask(AvatarMask mask, SerializedProperty serializedProperty);
+        extern internal static void UpdateTransformMask([NotNull] AvatarMask mask, [NotNull] SerializedProperty serializedProperty);
 
         extern internal AnimationClip GetPreviewAnimationClipForTake(string takeName);
 
diff --git a/Editor/Mono/ImportSettings/PrefabUtility.cs b/Editor/Mono/ImportSettings/PrefabUtility.cs
@@ -89,28 +89,20 @@ private static void GetObjectListFromHierarchy(List<Object> hierarchy, GameObjec
         {
             Transform transform = null;
             List<Component> components = new List<Component>();
-            hierarchy.Add(gameObject);
             gameObject.GetComponents(components);
             foreach (var component in components)
             {
                 if (component is Transform)
-                {
                     transform = component as Transform;
-                }
-                else
-                {
-                    hierarchy.Add(component);
-                }
-            }
 
-            if (transform != null)
-            {
-                int childCount = transform.childCount;
-                for (var i = 0; i < childCount; i++)
-                {
-                    GetObjectListFromHierarchy(hierarchy, transform.GetChild(i).gameObject);
-                }
+                hierarchy.Add(component);
             }
+            if (transform == null)
+                return;
+
+            int childCount = transform.childCount;
+            for (var i = 0; i < childCount; i++)
+                GetObjectListFromHierarchy(hierarchy, transform.GetChild(i).gameObject);
         }
 
         private static void RegisterNewObjects(List<Object> newHierarchy, List<Object> hierarchy, string actionName)
@@ -156,9 +148,11 @@ private static void RegisterNewObjects(List<Object> newHierarchy, List<Object> h
                             break;
                         }
                     }
-
                     if (requiredComponentsExist)
                     {
+                        if (danglingObject is Transform)
+                            danglingObject = ((Transform)danglingObject).gameObject;
+
                         Undo.RegisterCreatedObjectUndo(danglingObject, actionName);
                         addedTypes.Add(danglingObject.GetType());
                         danglingObjects.RemoveAt(i);
@@ -200,9 +194,9 @@ internal static void RevertPrefabInstanceWithUndo(GameObject target)
             }
 
             RevertPrefabInstance(root);
-
             List<Object> newHierarchy = new List<Object>();
             GetObjectListFromHierarchy(newHierarchy, FindPrefabRoot(root));
+
             RegisterNewObjects(newHierarchy, hierarchy, actionName);
         }
 
diff --git a/Editor/Mono/SceneView/SceneView.cs b/Editor/Mono/SceneView/SceneView.cs
@@ -1657,7 +1657,8 @@ internal void OnGUI()
             if (!UseSceneFiltering())
             {
                 // Blit to final target RT in deferred mode
-                Handles.DrawCameraStep2(m_Camera, m_RenderMode);
+                if (m_Camera.gameObject.activeInHierarchy)
+                    Handles.DrawCameraStep2(m_Camera, m_RenderMode);
 
                 // Give editors a chance to kick in. Disable in search mode, editors rendering to the scene
                 // view won't be able to properly render to the rendertexture as needed.
diff --git a/Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs b/Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs
@@ -488,7 +488,7 @@ private void ErrorOnARDeviceIncompatibility(BuildTargetGroup targetGroup)
         {
             if (targetGroup == BuildTargetGroup.Android)
             {
-                if (PlayerSettings.Android.androidTangoEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
+                if (PlayerSettings.Android.ARCoreEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
                 {
                     EditorGUILayout.HelpBox("Both ARCore and Vuforia XR Device support cannot be selected at the same time. Please select only one XR Device that will manage the Android device.", MessageType.Error);
                 }
@@ -516,7 +516,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)
             // Google Tango settings
             EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TextContent("ARCore Supported"));
 
-            if (PlayerSettings.Android.androidTangoEnabled)
+            if (PlayerSettings.Android.ARCoreEnabled)
             {
                 EditorGUI.indentLevel++;
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2017.4.10f1 C# reference source code
+## Unity 2017.4.11f1 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.
diff --git a/Runtime/AR/ScriptBindings/ARBackgroundRenderer.cs b/Runtime/AR/ScriptBindings/ARBackgroundRenderer.cs
@@ -162,15 +162,11 @@ protected void DisableARBackgroundRendering()
             if (null == m_CommandBuffer)
                 return;
 
-            Camera camera;
-
-            if (m_Camera != null)
-                camera = m_Camera;
-            else
-                camera = Camera.main;
+            Camera camera = m_Camera ?? Camera.main;
+            if (camera == null)
+                return;
 
-            if (camera != null)
-                camera.clearFlags = m_CameraClearFlags;
+            camera.clearFlags = m_CameraClearFlags;
 
             // Command buffer
             camera.RemoveCommandBuffer(CameraEvent.BeforeForwardOpaque, m_CommandBuffer);
diff --git a/Runtime/Export/MouseEvents.cs b/Runtime/Export/MouseEvents.cs
@@ -123,7 +123,7 @@ static void DoSendMouseEvents(int skipRTCameras)
 
                         Vector2 pos = new Vector2(eventPosition.x / w, eventPosition.y / h);
 
-                        // If it's outside the camera's viewport, do nothing
+                        // If the mouse is outside the display bounds, do nothing
                         if (pos.x < 0f || pos.x > 1f || pos.y < 0f || pos.y > 1f)
                             continue;
                     }
@@ -132,13 +132,13 @@ static void DoSendMouseEvents(int skipRTCameras)
                         // The multiple display system is not supported on all platforms, when it is not supported the returned position
                         // will be all zeros so when the returned index is 0 we will default to the mouse position to be safe.
                         eventPosition = mousePosition;
-
-                        // Is the mouse inside the cameras viewport?
-                        var rect = camera.pixelRect;
-                        if (!rect.Contains(eventPosition))
-                            continue;
                     }
 
+                    // Is the mouse inside the cameras viewport?
+                    var rect = camera.pixelRect;
+                    if (!rect.Contains(eventPosition))
+                        continue;
+
                     HitTestLegacyGUI(camera, eventPosition, ref m_CurrentHit[m_HitIndexGUI]);
 
                     // There is no need to continue if the camera shouldn't be sending out events
diff --git a/artifacts/generated/common/editor/EditorSpriteAtlasBindings.gen.cs b/artifacts/generated/common/editor/EditorSpriteAtlasBindings.gen.cs
@@ -142,6 +142,10 @@ internal static partial class SpriteAtlasExtensions
     [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
     extern internal static  Texture2D[] GetPreviewTextures (this SpriteAtlas spriteAtlas) ;
 
+    [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
+    [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
+    extern internal static  Texture2D[] GetPreviewAlphaTextures (this SpriteAtlas spriteAtlas) ;
+
     [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
     [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
     extern internal static  TextureImporterFormat FormatDetermineByAtlasSettings (this SpriteAtlas spriteAtlas, BuildTarget target) ;
diff --git a/artifacts/generated/common/editor/PlayerSettingsAndroidBindings.gen.cs b/artifacts/generated/common/editor/PlayerSettingsAndroidBindings.gen.cs
@@ -227,7 +227,7 @@ public extern static bool androidIsGame
             set;
         }
 
-        internal extern static bool androidTangoEnabled
+        public extern static bool ARCoreEnabled
         {
             [UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
             [System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]

Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,15 @@ public bool TextureFormatRequireCompressionQualityInput(TextureImporterFormat fo`
`58`	`58`	`{`
`59`	`59`	`return TextureImporterInspector.IsFormatRequireCompressionSetting(format);`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ public bool IsETC1SupportedByBuildTarget(BuildTarget buildTarget)`
	`63`	`+ {`
	`64`	`+ return TextureImporter.IsETC1SupportedByBuildTarget(buildTarget);`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ public bool IsTextureFormatETC1Compression(TextureFormat format)`
	`68`	`+ {`
	`69`	`+ return TextureImporter.IsTextureFormatETC1Compression(format);`
	`70`	`+ }`
`61`	`71`	`}`
`62`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -816,7 +816,7 @@ internal extern bool isAssetOlderOr42`
`816`	`816`	`}`
`817`	`817`
`818`	`818`	`[FreeFunction("ModelImporterBindings::UpdateTransformMask")]`
`819`		`- extern internal static void UpdateTransformMask(AvatarMask mask, SerializedProperty serializedProperty);`
	`819`	`+ extern internal static void UpdateTransformMask([NotNull] AvatarMask mask, [NotNull] SerializedProperty serializedProperty);`
`820`	`820`
`821`	`821`	`extern internal AnimationClip GetPreviewAnimationClipForTake(string takeName);`
`822`	`822`
Original file line number	Diff line number	Diff line change
`@@ -1657,7 +1657,8 @@ internal void OnGUI()`
`1657`	`1657`	`if (!UseSceneFiltering())`
`1658`	`1658`	`{`
`1659`	`1659`	`// Blit to final target RT in deferred mode`
`1660`		`- Handles.DrawCameraStep2(m_Camera, m_RenderMode);`
	`1660`	`+ if (m_Camera.gameObject.activeInHierarchy)`
	`1661`	`+ Handles.DrawCameraStep2(m_Camera, m_RenderMode);`
`1661`	`1662`
`1662`	`1663`	`// Give editors a chance to kick in. Disable in search mode, editors rendering to the scene`
`1663`	`1664`	`// view won't be able to properly render to the rendertexture as needed.`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ private void ErrorOnARDeviceIncompatibility(BuildTargetGroup targetGroup)`
`488`	`488`	`{`
`489`	`489`	`if (targetGroup == BuildTargetGroup.Android)`
`490`	`490`	`{`
`491`		`- if (PlayerSettings.Android.androidTangoEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))`
	`491`	`+ if (PlayerSettings.Android.ARCoreEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))`
`492`	`492`	`{`
`493`	`493`	`EditorGUILayout.HelpBox("Both ARCore and Vuforia XR Device support cannot be selected at the same time. Please select only one XR Device that will manage the Android device.", MessageType.Error);`
`494`	`494`	`}`
`@@ -516,7 +516,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)`
`516`	`516`	`// Google Tango settings`
`517`	`517`	`EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TextContent("ARCore Supported"));`
`518`	`518`
`519`		`- if (PlayerSettings.Android.androidTangoEnabled)`
	`519`	`+ if (PlayerSettings.Android.ARCoreEnabled)`
`520`	`520`	`{`
`521`	`521`	`EditorGUI.indentLevel++;`
`522`	`522`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2017.4.10f1 C# reference source code`
	`1`	`+## Unity 2017.4.11f1 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`