Unity 2018.1.0b6 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -158,9 +158,23 @@ private float windowHeight
  {
  get
  {
- int headers = Styles.sBuiltinCameraModes.Where(mode => m_SceneView.IsCameraDrawModeEnabled(mode)).Select(mode => mode.section).Distinct().Count() +
- SceneView.userDefinedModes.Where(mode => m_SceneView.IsCameraDrawModeEnabled(mode)).Select(mode => mode.section).Distinct().Count();
- int modes = Styles.sBuiltinCameraModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode)) + SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode));
+ int headers;
+ int modes;
+
+ // TODO: This needs to be fixed and we need to find a way to dif. between disabled and unsupported
+ if (GraphicsSettings.renderPipelineAsset != null)
+ {
+ // When using SRP, we completely hide disabled builtin modes, including headers
+ headers = Styles.sBuiltinCameraModes.Where(mode => m_SceneView.IsCameraDrawModeEnabled(mode)).Select(mode => mode.section).Distinct().Count() +
+ SceneView.userDefinedModes.Where(mode => m_SceneView.IsCameraDrawModeEnabled(mode)).Select(mode => mode.section).Distinct().Count();
+ modes = Styles.sBuiltinCameraModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode)) + SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode));
+ }
+ else
+ {
+ headers = Styles.sBuiltinCameraModes.Select(mode => mode.section).Distinct().Count() + SceneView.userDefinedModes.Where(mode => m_SceneView.IsCameraDrawModeEnabled(mode)).Select(mode => mode.section).Distinct().Count();
+ modes = Styles.sBuiltinCameraModes.Count() + SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode));
+ }
+
  int separators = headers - 2;
  return ((headers + modes) * EditorGUI.kSingleLineHeight) + (kSeparatorHeight * separators) + kShowLightmapResolutionHeight;
  }

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -104,7 +104,7 @@ internal static string ApiCompatibilityLevelToDotNetProfileArgument(ApiCompatibi
  return "net20";
 
  case ApiCompatibilityLevel.NET_4_6:
- return "net45";
+ return "unityjit";
 
  case ApiCompatibilityLevel.NET_Standard_2_0:
  return "unityaot";
@@ -195,7 +195,7 @@ public void RunCompileAndLink()
  arguments.Add(string.Format("--map-file-parser=\"{0}\"", GetMapFileParserPath()));
  arguments.Add(string.Format("--generatedcppdir=\"{0}\"", Path.GetFullPath(GetCppOutputDirectoryInStagingArea())));
  if (PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup) == ApiCompatibilityLevel.NET_4_6)
- arguments.Add("--dotnetprofile=\"net45\"");
+ arguments.Add("--dotnetprofile=\"unityjit\"");
  if (PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup) == ApiCompatibilityLevel.NET_Standard_2_0)
  arguments.Add("--dotnetprofile=\"unityaot\"");
  Action<ProcessStartInfo> setupStartInfo = il2CppNativeCodeBuilder.SetupStartInfo;
@@ -287,7 +287,7 @@ private void ConvertPlayerDlltoCpp(ICollection<string> userAssemblies, string ou
 
  var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
  if (PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup) == ApiCompatibilityLevel.NET_4_6)
- arguments.Add("--dotnetprofile=\"net45\"");
+ arguments.Add("--dotnetprofile=\"unityjit\"");
 
  if (PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup) == ApiCompatibilityLevel.NET_Standard_2_0)
  arguments.Add("--dotnetprofile=\"unityaot\"");

Editor/Mono/EditorGUI.cs

@@ -8111,6 +8111,8 @@ internal static Rect GetToggleRect(bool hasLabel, params GUILayoutOption[] optio
 
  public class FadeGroupScope : GUI.Scope
  {
+ // when using the FadeGroupScope, make sure to only show the content when 'visible' is set to true,
+ // otherwise only the hide animation will run, and then the content will be visible again.
  public bool visible { get; protected set; }
  float m_Value;
 

Editor/Mono/EditorHandles/ArcHandle.cs

@@ -2,7 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace UnityEditor.IMGUI.Controls
@@ -14,27 +14,49 @@ public class ArcHandle
 
  static readonly float s_DefaultRadiusHandleSize = 0.03f;
 
- static float DefaultAngleHandleSizeFunction(Vector3 position)
+ static readonly Dictionary<int, Quaternion> s_MostRecentValidAngleHandleOrientations =
+ new Dictionary<int, Quaternion>();
+
+ // only used inside of DefaultAngleHandleDrawFunction to look up and store the most recent valid orientation per handle
+ // done so that DefaultAngleHandleDrawFunction can be a static method, which makes angleHandleDrawFunction more usable by sub-classes
+ static int s_CurrentlyDrawingAngleHandleHash;
+
+ public static void DefaultAngleHandleDrawFunction(
+ int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType
+ )
  {
- return HandleUtility.GetHandleSize(position) * s_DefaultAngleHandleSize;
+ Handles.DrawLine(Vector3.zero, position);
+
+ // draw a cylindrical "hammer head" to indicate the direction the handle will move
+ Vector3 worldPosition = Handles.matrix.MultiplyPoint3x4(position);
+ Vector3 normal = worldPosition - Handles.matrix.MultiplyPoint3x4(Vector3.zero);
+ Vector3 tangent = Handles.matrix.MultiplyVector(Quaternion.AngleAxis(90f, Vector3.up) * position);
+ Quaternion mostRecentValidOrientation;
+ if (!s_MostRecentValidAngleHandleOrientations.TryGetValue(s_CurrentlyDrawingAngleHandleHash, out mostRecentValidOrientation))
+ mostRecentValidOrientation = Quaternion.identity;
+ rotation = Mathf.Approximately(tangent.sqrMagnitude, 0f) ?
+ mostRecentValidOrientation : Quaternion.LookRotation(tangent, normal);
+ s_MostRecentValidAngleHandleOrientations[s_CurrentlyDrawingAngleHandleHash] = rotation;
+ Matrix4x4 matrix =
+ Matrix4x4.TRS(worldPosition, rotation, (Vector3.one + Vector3.forward * s_DefaultAngleHandleSizeRatio));
+ using (new Handles.DrawingScope(matrix))
+ Handles.CylinderHandleCap(controlID, Vector3.zero, Quaternion.identity, size, eventType);
+ s_CurrentlyDrawingAngleHandleHash = 0;
  }
 
- static float DefaultRadiusHandleSizeFunction(Vector3 position)
+ public static float DefaultAngleHandleSizeFunction(Vector3 position)
  {
- return HandleUtility.GetHandleSize(position) * s_DefaultRadiusHandleSize;
+ return HandleUtility.GetHandleSize(position) * s_DefaultAngleHandleSize;
  }
 
- static void DefaultRadiusHandleDrawFunction(
- int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType
- )
+ public static float DefaultRadiusHandleSizeFunction(Vector3 position)
  {
- Handles.DotHandleCap(controlID, position, rotation, size, eventType);
+ return HandleUtility.GetHandleSize(position) * s_DefaultRadiusHandleSize;
  }
 
  private bool m_ControlIDsReserved = false;
  private int m_AngleHandleControlID;
  private int[] m_RadiusHandleControlIDs = new int[4];
- private Quaternion m_MostRecentValidAngleHandleOrientation = Quaternion.identity;
 
  public float angle { get; set; }
 
@@ -60,6 +82,15 @@ public ArcHandle()
  {
  radius = 1f;
  SetColorWithoutRadiusHandle(Color.white, 0.1f);
+ angleHandleDrawFunction = DefaultAngleHandleDrawFunction;
+ angleHandleSizeFunction = DefaultAngleHandleSizeFunction;
+ radiusHandleDrawFunction = Handles.DotHandleCap;
+ radiusHandleSizeFunction = DefaultRadiusHandleSizeFunction;
+ }
+
+ ~ArcHandle()
+ {
+ s_MostRecentValidAngleHandleOrientations.Remove(GetHashCode());
  }
 
  public void SetColorWithoutRadiusHandle(Color color, float fillColorAlpha)
@@ -147,15 +178,13 @@ public void DrawHandle()
  Vector3 newPosition;
  EditorGUI.BeginChangeCheck();
  {
- float size = radiusHandleSizeFunction == null ?
- DefaultRadiusHandleSizeFunction(radiusHandlePosition) :
- radiusHandleSizeFunction(radiusHandlePosition);
+ var size = radiusHandleSizeFunction == null ? 0f : radiusHandleSizeFunction(radiusHandlePosition);
  newPosition = Handles.Slider(
  m_RadiusHandleControlIDs[i],
  radiusHandlePosition,
  Vector3.forward,
  size,
- radiusHandleDrawFunction ?? DefaultRadiusHandleDrawFunction,
+ radiusHandleDrawFunction,
  SnapSettings.move.z
  );
  }
@@ -171,21 +200,20 @@ public void DrawHandle()
  // draw angle handle last so it will always take precedence when overlapping a radius handle
  using (new Handles.DrawingScope(Handles.color * angleHandleColor))
  {
- if (Handles.color.a > 0f)
+ if (Handles.color.a > 0f && angleHandleDrawFunction != null)
  {
  EditorGUI.BeginChangeCheck();
  {
- float size = angleHandleSizeFunction == null ?
- DefaultAngleHandleSizeFunction(angleHandlePosition) :
- angleHandleSizeFunction(angleHandlePosition);
+ var size = angleHandleSizeFunction == null ? 0f : angleHandleSizeFunction(angleHandlePosition);
+ s_CurrentlyDrawingAngleHandleHash = GetHashCode();
  angleHandlePosition = Handles.Slider2D(
  m_AngleHandleControlID,
  angleHandlePosition,
  Vector3.up,
  Vector3.forward,
  Vector3.right,
  size,
- angleHandleDrawFunction ?? DefaultAngleHandleDrawFunction,
+ angleHandleDrawFunction,
  Vector2.zero
  );
  }
@@ -207,23 +235,5 @@ internal void GetControlIDs()
  m_RadiusHandleControlIDs[i] = GUIUtility.GetControlID(GetHashCode(), FocusType.Passive);
  m_ControlIDsReserved = true;
  }
-
- private void DefaultAngleHandleDrawFunction(
- int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType
- )
- {
- Handles.DrawLine(Vector3.zero, position);
-
- // draw a cylindrical "hammer head" to indicate the direction the handle will move
- Vector3 worldPosition = Handles.matrix.MultiplyPoint3x4(position);
- Vector3 normal = worldPosition - Handles.matrix.MultiplyPoint3x4(Vector3.zero);
- Vector3 tangent = Handles.matrix.MultiplyVector(Quaternion.AngleAxis(90f, Vector3.up) * position);
- m_MostRecentValidAngleHandleOrientation = rotation = tangent.sqrMagnitude == 0f ?
- m_MostRecentValidAngleHandleOrientation : Quaternion.LookRotation(tangent, normal);
- Matrix4x4 matrix =
- Matrix4x4.TRS(worldPosition, rotation, (Vector3.one + Vector3.forward * s_DefaultAngleHandleSizeRatio));
- using (new Handles.DrawingScope(matrix))
- Handles.CylinderHandleCap(controlID, Vector3.zero, Quaternion.identity, size, eventType);
- }
  }
 }

Editor/Mono/EditorHandles/BoundsHandle/PrimitiveBoundsHandle.cs

@@ -48,7 +48,7 @@ internal static GUIContent editModeButton
  }
  private static GUIContent s_EditModeButton;
 
- private static float DefaultMidpointHandleSizeFunction(Vector3 position)
+ public static float DefaultMidpointHandleSizeFunction(Vector3 position)
  {
  return HandleUtility.GetHandleSize(position) * s_DefaultMidpointHandleSize;
  }
@@ -81,6 +81,8 @@ public PrimitiveBoundsHandle()
  handleColor = Color.white;
  wireframeColor = Color.white;
  axes = Axes.X | Axes.Y | Axes.Z;
+ midpointHandleDrawFunction = Handles.DotHandleCap;
+ midpointHandleSizeFunction = DefaultMidpointHandleSizeFunction;
  }
 
  public void SetColor(Color color)
@@ -272,14 +274,15 @@ private Vector3 MidpointHandle(int id, Vector3 localPos, Vector3 localTangent, V
 
  AdjustMidpointHandleColor(localPos, localTangent, localBinormal, isCameraInsideBox);
 
- if (Handles.color.a > 0f)
+ if (Handles.color.a > 0f && midpointHandleDrawFunction != null)
  {
  Vector3 localDir = Vector3.Cross(localTangent, localBinormal).normalized;
 
- var drawFunc = midpointHandleDrawFunction ?? Handles.DotHandleCap;
- var sizeFunc = midpointHandleSizeFunction ?? DefaultMidpointHandleSizeFunction;
+ var size = midpointHandleSizeFunction == null ? 0f : midpointHandleSizeFunction(localPos);
 
- localPos = UnityEditorInternal.Slider1D.Do(id, localPos, localDir, sizeFunc(localPos), drawFunc, SnapSettings.scale);
+ localPos = UnityEditorInternal.Slider1D.Do(
+ id, localPos, localDir, size, midpointHandleDrawFunction, SnapSettings.scale
+ );
  }
 
  Handles.color = oldColor;

Editor/Mono/Inspector/CameraEditor.cs

@@ -450,8 +450,10 @@ public override void OnInspectorGUI()
 
  settings.DrawClearFlags();
 
- using (new EditorGUILayout.FadeGroupScope(m_ShowBGColorOptions.faded))
+ if (EditorGUILayout.BeginFadeGroup(m_ShowBGColorOptions.faded))
  settings.DrawBackgroundColor();
+ EditorGUILayout.EndFadeGroup();
+
  settings.DrawCullingMask();
 
  EditorGUILayout.Space();
@@ -480,8 +482,9 @@ public override void OnInspectorGUI()
  settings.DrawVR();
  settings.DrawMultiDisplay();
 
- using (new EditorGUILayout.FadeGroupScope(m_ShowTargetEyeOption.faded))
+ if (EditorGUILayout.BeginFadeGroup(m_ShowTargetEyeOption.faded))
  settings.DrawTargetEye();
+ EditorGUILayout.EndFadeGroup();
 
  DepthTextureModeGUI();
  CommandBufferGUI();
@@ -563,7 +566,7 @@ public virtual void OnOverlayGUI(Object target, SceneView sceneView)
  }
 
  var previewTexture = GetPreviewTextureWithSize((int)cameraRect.width, (int)cameraRect.height);
- previewTexture.antiAliasing = QualitySettings.antiAliasing;
+ previewTexture.antiAliasing = Mathf.Max(1, QualitySettings.antiAliasing);
  previewCamera.targetTexture = previewTexture;
  previewCamera.pixelRect = new Rect(0, 0, cameraRect.width, cameraRect.height);
 

Editor/Mono/Inspector/HingeJoint2DEditor.cs

@@ -66,12 +66,6 @@ internal override Bounds GetWorldBoundsOfTarget(UnityObject targetObject)
  return bounds;
  }
 
- private void NonEditableHandleDrawFunction(
- int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType
- )
- {
- }
-
  private static readonly Quaternion s_RightHandedHandleOrientationOffset =
  Quaternion.AngleAxis(180f, Vector3.right) * Quaternion.AngleAxis(90f, Vector3.up);
  private static readonly Quaternion s_LeftHandedHandleOrientationOffset =
@@ -96,9 +90,9 @@ private void NonEditableHandleDrawFunction(
  // only display control handles on manipulator if in edit mode
  var editMode = EditMode.editMode == EditMode.SceneViewEditMode.JointAngularLimits && EditMode.IsOwner(this);
  if (editMode)
- m_AngularLimitHandle.angleHandleDrawFunction = null;
+ m_AngularLimitHandle.angleHandleDrawFunction = ArcHandle.DefaultAngleHandleDrawFunction;
  else
- m_AngularLimitHandle.angleHandleDrawFunction = NonEditableHandleDrawFunction;
+ m_AngularLimitHandle.angleHandleDrawFunction = null;
 
  // to enhance usability, orient the manipulator to best illustrate its affects on the dynamic body in the system
  var dynamicBody = hingeJoint2D.attachedRigidbody;

Editor/Mono/Inspector/InspectorWindow.cs

@@ -1003,16 +1003,6 @@ protected void AssignAssetEditor(Editor[] editors)
  if (editors.Length > 1 && editors[0] is AssetImporterEditor)
  {
  (editors[0] as AssetImporterEditor).assetEditor = editors[1];
- // if we have an asset editor but no target, it's likely the asset was just imported and we lost the target
- // get the target back from the serialized object for all editors
- // (dealing with multiple editors when a GameObject is involved)
- for (int i = 0; i < editors.Length; i++)
- {
- if (editors[i].target == null)
- {
- editors[i].InternalSetTargets(editors[i].serializedObject.targetObjects);
- }
- }
  }
  }