Skip to content

Commit 1e41657

Browse files
author
Unity Technologies
committed
Unity 2019.1.0a10 C# reference source code
1 parent e94d025 commit 1e41657

396 files changed

Lines changed: 22151 additions & 12393 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using System.Collections.Generic;
66
using UnityEngine;
7+
using UnityEngine.Experimental.Rendering;
78
using UnityEngine.U2D;
89
using UnityEditor.Build;
910
using UnityEditor.U2D.Common;
@@ -575,9 +576,9 @@ public override string GetInfoString()
575576
if (m_PreviewTextures != null && m_PreviewPage < m_PreviewTextures.Length)
576577
{
577578
Texture2D t = m_PreviewTextures[m_PreviewPage];
578-
TextureFormat format = TextureUtil.GetTextureFormat(t);
579+
GraphicsFormat format = GraphicsFormatUtility.GetFormat(t);
579580

580-
return string.Format("{0}x{1} {2}\n{3}", t.width, t.height, TextureUtil.GetTextureFormatString(format), EditorUtility.FormatBytes(TextureUtil.GetStorageMemorySizeLong(t)));
581+
return string.Format("{0}x{1} {2}\n{3}", t.width, t.height, GraphicsFormatUtility.GetFormatString(format), EditorUtility.FormatBytes(TextureUtil.GetStorageMemorySizeLong(t)));
581582
}
582583
return "";
583584
}

‎Editor/Mono/2D/SpriteEditorModule/SpriteFrameModule/SpriteFrameModuleBase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public override void OnModuleActivate()
5757
textureActualWidth = width;
5858
textureActualHeight = height;
5959
m_RectsCache = ScriptableObject.CreateInstance<SpriteRectModel>();
60+
m_RectsCache.hideFlags = HideFlags.HideAndDontSave;
6061
m_RectsCache.spriteRects = m_SpriteDataProvider.GetSpriteRects().ToList();
6162
spriteEditor.spriteRects = m_RectsCache.spriteRects;
6263
if (spriteEditor.selectedSpriteRect != null)

‎Editor/Mono/2D/SpriteEditorModule/SpriteOutlineModule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ private void ClearSelection()
327327
protected virtual void LoadOutline()
328328
{
329329
m_Outline = ScriptableObject.CreateInstance<SpriteOutlineModel>();
330+
m_Outline.hideFlags = HideFlags.HideAndDontSave;
330331
var spriteDataProvider = spriteEditorWindow.GetDataProvider<ISpriteEditorDataProvider>();
331332
var outlineDataProvider = spriteEditorWindow.GetDataProvider<ISpriteOutlineDataProvider>();
332333
foreach (var rect in spriteDataProvider.GetSpriteRects())

‎Editor/Mono/2D/SpriteEditorModule/SpritePhysicsShapeModule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public override bool ApplyRevert(bool apply)
5858
protected override void LoadOutline()
5959
{
6060
m_Outline = ScriptableObject.CreateInstance<SpriteOutlineModel>();
61+
m_Outline.hideFlags = HideFlags.HideAndDontSave;
6162
var spriteDataProvider = spriteEditorWindow.GetDataProvider<ISpriteEditorDataProvider>();
6263
var outlineDataProvider = spriteEditorWindow.GetDataProvider<ISpritePhysicsOutlineDataProvider>();
6364
foreach (var rect in spriteDataProvider.GetSpriteRects())

‎Editor/Mono/ActiveEditorTracker.bindings.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public sealed class ActiveEditorTracker
2121
MonoReloadableIntPtrClear m_Property;
2222
#pragma warning restore
2323

24+
internal static event Action editorTrackerRebuilt;
25+
2426
public ActiveEditorTracker()
2527
{
2628
Internal_Create(this);
@@ -161,5 +163,11 @@ public static ActiveEditorTracker sharedTracker
161163

162164
[FreeFunction("Internal_SetupSharedTracker")]
163165
static extern void SetupSharedTracker(ActiveEditorTracker sharedTracker);
166+
167+
static void Internal_OnTrackerRebuild()
168+
{
169+
if (editorTrackerRebuilt != null)
170+
editorTrackerRebuilt();
171+
}
164172
}
165173
}

‎Editor/Mono/Animation/AnimationWindow/ControlPointRenderer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static Material material
4242
{
4343
Shader shader = (Shader)EditorGUIUtility.LoadRequired("Editors/AnimationWindow/ControlPoint.shader");
4444
s_Material = new Material(shader);
45+
s_Material.hideFlags = HideFlags.HideAndDontSave;
4546
}
4647

4748
return s_Material;

‎Editor/Mono/Animation/AnimationWindow/CurveEditor.cs‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ public int MoveKey(int index, ref Keyframe key)
131131
// An additional vertical min / max range clamp when editing multiple curves with different ranges
132132
public float vRangeMin = -Mathf.Infinity;
133133
public float vRangeMax = Mathf.Infinity;
134+
135+
public bool useScalingInKeyEditor = false;
136+
public string xAxisLabel = null;
137+
public string yAxisLabel = null;
134138
}
135139

136140
// Control point collection renderer
@@ -2193,7 +2197,8 @@ void SelectPoints()
21932197
switch (evt.GetTypeForControl(id))
21942198
{
21952199
case EventType.Layout:
2196-
HandleUtility.AddDefaultControl(id);
2200+
float distance = HandleUtility.DistanceToRectangleInternal(drawRect.position, Quaternion.identity, drawRect.size);
2201+
HandleUtility.AddControl(id, distance);
21972202
break;
21982203

21992204
case EventType.ContextClick:
@@ -2677,7 +2682,7 @@ void EditSelectedPoints()
26772682
var fieldPosition = DrawingToViewTransformPoint(m_PointEditingFieldPosition);
26782683

26792684
const float kFieldHeight = 18f;
2680-
const float kFieldWidth = 80f;
2685+
const float kFieldWidth = 95f;
26812686

26822687
// Keep fields in the drawing margins
26832688
var drawAreaInMargins = Rect.MinMaxRect(leftmargin, topmargin, rect.width - rightmargin, rect.height - bottommargin);
@@ -2686,13 +2691,27 @@ void EditSelectedPoints()
26862691

26872692
EditorGUI.BeginChangeCheck();
26882693
GUI.SetNextControlName(kPointTimeFieldName);
2694+
CurveWrapper curveWrapper = GetCurveWrapperFromSelection(selectedCurves[0]);
2695+
2696+
Vector2 scale = Vector2.one;
2697+
if (curveWrapper.useScalingInKeyEditor && curveWrapper.getAxisUiScalarsCallback != null)
2698+
{
2699+
scale = curveWrapper.getAxisUiScalarsCallback();
2700+
2701+
// don't scale if the values are too small or negative
2702+
if (scale.x < 0.0001)
2703+
scale.x = 1;
2704+
if (scale.y < 0.0001)
2705+
scale.y = 1;
2706+
}
2707+
26892708
m_NewTime = PointFieldForSelection(
26902709
new Rect(fieldPosition.x, fieldPosition.y, kFieldWidth, kFieldHeight),
26912710
1,
2692-
m_NewTime,
2711+
m_NewTime * scale.x,
26932712
x => GetKeyframeFromSelection(x).time,
26942713
(r, id, time) => TimeField(r, id, time, invSnap, timeFormat),
2695-
settings.xAxisLabel);
2714+
curveWrapper.xAxisLabel == null ? settings.xAxisLabel : curveWrapper.xAxisLabel) / scale.x;
26962715
if (EditorGUI.EndChangeCheck())
26972716
{
26982717
m_TimeWasEdited = true;
@@ -2703,10 +2722,10 @@ void EditSelectedPoints()
27032722
m_NewValue = PointFieldForSelection(
27042723
new Rect(fieldPosition.x, fieldPosition.y + kFieldHeight, kFieldWidth, kFieldHeight),
27052724
2,
2706-
m_NewValue,
2725+
m_NewValue * scale.y,
27072726
x => GetKeyframeFromSelection(x).value,
27082727
(r, id, value) => ValueField(r, id, value),
2709-
settings.yAxisLabel);
2728+
curveWrapper.yAxisLabel == null ? settings.yAxisLabel : curveWrapper.yAxisLabel) / scale.y;
27102729
if (EditorGUI.EndChangeCheck())
27112730
{
27122731
m_ValueWasEdited = true;

‎Editor/Mono/Animation/AnimationWindow/CurveRenderer/NormalCurveRenderer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public static Material curveMaterial
3737
{
3838
Shader shader = (Shader)EditorGUIUtility.LoadRequired("Editors/AnimationWindow/Curve.shader");
3939
s_CurveMaterial = new Material(shader);
40+
s_CurveMaterial.hideFlags = HideFlags.HideAndDontSave;
4041
}
4142

4243
return s_CurveMaterial;

‎Editor/Mono/Annotation/SceneViewCameraWindow.cs‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Copyright (c) Unity Technologies. For terms of use, see
33
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
44

5-
using System;
65
using UnityEngine;
76

87
namespace UnityEditor
@@ -33,12 +32,13 @@ public static void Init()
3332
GUIContent m_CameraSpeedSliderContent;
3433
GUIContent[] m_CameraSpeedMinMax;
3534
GUIContent m_FieldOfView;
35+
GUIContent m_DynamicClip;
3636

37-
const int k_FieldCount = 8;
38-
const int k_WindowWidth = 280;
37+
const int k_FieldCount = 9;
38+
const int k_WindowWidth = 300;
3939
const int k_WindowHeight = ((int)EditorGUI.kSingleLineHeight) * k_FieldCount + kFrameWidth * 2;
4040
const int kFrameWidth = 10;
41-
const float k_PrefixLabelWidth = 100f;
41+
const float k_PrefixLabelWidth = 120f;
4242
const float kMinMaxSpeedLabelWidth = 26f;
4343
const float k_NearClipMin = .01f;
4444

@@ -60,6 +60,8 @@ public SceneViewCameraWindow(SceneView sceneView)
6060
EditorGUIUtility.TrTextContent("Max", "The maximum speed of the camera in the Scene view. Valid values are between [0.02, 99].")
6161
};
6262
m_FieldOfView = EditorGUIUtility.TrTextContent("Field of View", "The height of the Camera's view angle. Measured in degrees vertically, or along the local Y axis.");
63+
m_DynamicClip = EditorGUIUtility.TrTextContent("Dynamic Clipping",
64+
"Check this to enable camera's near and far clipping planes to be calculated relative to the viewport size of the Scene.");
6365
}
6466

6567
public override void OnGUI(Rect rect)
@@ -103,16 +105,19 @@ private void Draw(Rect rect)
103105
settings.fieldOfView = EditorGUILayout.Slider(m_FieldOfView, settings.fieldOfView, 4f, 179f);
104106
}
105107

108+
settings.dynamicClip = EditorGUILayout.Toggle(m_DynamicClip, settings.dynamicClip);
106109

107-
float near = settings.nearClip, far = settings.farClip;
108-
ClipPlanesField(EditorGUI.s_ClipingPlanesLabel, ref near, ref far, EditorGUI.kNearFarLabelsWidth);
109-
settings.nearClip = near;
110-
settings.farClip = far;
111-
112-
settings.nearClip = Mathf.Max(k_NearClipMin, settings.nearClip);
110+
using (new EditorGUI.DisabledScope(settings.dynamicClip))
111+
{
112+
float near = settings.nearClip, far = settings.farClip;
113+
ClipPlanesField(EditorGUI.s_ClipingPlanesLabel, ref near, ref far, EditorGUI.kNearFarLabelsWidth);
114+
settings.nearClip = near;
115+
settings.farClip = far;
116+
settings.nearClip = Mathf.Max(k_NearClipMin, settings.nearClip);
117+
if (settings.nearClip > settings.farClip)
118+
settings.farClip = settings.nearClip + k_NearClipMin;
119+
}
113120

114-
if (settings.nearClip > settings.farClip)
115-
settings.farClip = settings.nearClip + k_NearClipMin;
116121

117122
if (EditorGUI.EndChangeCheck())
118123
m_SceneView.Repaint();

‎Editor/Mono/Annotation/SceneViewSettingsProvider.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Styles
1414
static bool s_Initialized;
1515

1616
public static GUIContent cameraMovementEasingEnabled = new GUIContent("Camera Easing", "Check this to enable camera movement easing. This makes the Camera ease in when it starts moving, and ease out when it stops.");
17-
public static GUIContent cameraMovementEasingDuration = new GUIContent("Camera Easing Duration", "How long it takes for the Camera speed to accelerate to full speed. Measured in seconds.");
17+
public static GUIContent cameraMovementEasingDuration = new GUIContent("Duration", "How long it takes for the Camera speed to accelerate to full speed. Measured in seconds.");
1818

1919
public static GUIStyle settings;
2020

@@ -62,8 +62,10 @@ public override void OnGUI(string searchContext)
6262

6363
using (new EditorGUI.DisabledScope(!SceneViewMotion.movementEasingEnabled))
6464
{
65+
EditorGUI.indentLevel += 1;
6566
if (!searching || SearchUtils.MatchSearch(searchContext, Styles.cameraMovementEasingDuration.text))
6667
SceneViewMotion.movementEasingDuration = EditorGUILayout.Slider(Styles.cameraMovementEasingDuration, SceneViewMotion.movementEasingDuration, 0.001f, 3f);
68+
EditorGUI.indentLevel -= 1;
6769
}
6870

6971
GUILayout.EndVertical();

0 commit comments

Comments
 (0)