Skip to content

Commit 109dd10

Browse files
author
Unity Technologies
committed
Unity 2018.3.0a6 C# reference source code
1 parent a1977c9 commit 109dd10

650 files changed

Lines changed: 19479 additions & 8896 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/Common/TexturePlatformSettingsController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public bool HandleDefaultSettings(List<TextureImporterPlatformSettings> platform
6363
if (allCompression != TextureImporterCompression.Uncompressed && (!mixedCompression || compressionChanged))
6464
{
6565
allUseCrunchedCompression = view.DrawUseCrunchedCompression(allUseCrunchedCompression,
66-
mixedUseCrunchedCompression, false, out useCrunchedCompressionChanged);
66+
mixedUseCrunchedCompression, false, out useCrunchedCompressionChanged);
6767

6868
if (allUseCrunchedCompression && (!mixedUseCrunchedCompression || useCrunchedCompressionChanged))
6969
{
7070
allCompressionQuality = view.DrawCompressionQualitySlider(allCompressionQuality,
71-
mixedCompressionQuality, false, out compressionQualityChanged);
71+
mixedCompressionQuality, false, out compressionQualityChanged);
7272
}
7373
}
7474
}

‎Editor/Mono/2D/Common/TexturePlatformSettingsView.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public virtual TextureImporterCompression DrawCompression(TextureImporterCompres
7070
EditorGUI.BeginChangeCheck();
7171
EditorGUI.showMixedValue = isMixedValue;
7272
defaultValue = (TextureImporterCompression)EditorGUILayout.IntPopup(s_Styles.compressionLabel,
73-
(int)defaultValue, s_Styles.kTextureCompressionOptions, s_Styles.kTextureCompressionValues);
73+
(int)defaultValue, s_Styles.kTextureCompressionOptions, s_Styles.kTextureCompressionValues);
7474
EditorGUI.showMixedValue = false;
7575
changed = EditorGUI.EndChangeCheck();
7676
return defaultValue;
@@ -107,7 +107,7 @@ public virtual int DrawMaxSize(int defaultValue, bool isMixedValue, bool isDisab
107107
EditorGUI.BeginChangeCheck();
108108
EditorGUI.showMixedValue = isMixedValue;
109109
defaultValue = EditorGUILayout.IntPopup(s_Styles.maxTextureSizeLabel, defaultValue,
110-
s_Styles.kMaxTextureSizeStrings, s_Styles.kMaxTextureSizeValues);
110+
s_Styles.kMaxTextureSizeStrings, s_Styles.kMaxTextureSizeValues);
111111
EditorGUI.showMixedValue = false;
112112
changed = EditorGUI.EndChangeCheck();
113113
return defaultValue;
@@ -134,7 +134,7 @@ public virtual int DrawCompressionQualityPopup(int defaultValue, bool isMixedVal
134134
EditorGUI.BeginChangeCheck();
135135
EditorGUI.showMixedValue = isMixedValue;
136136
defaultValue = EditorGUILayout.Popup(s_Styles.compressionQualityLabel, defaultValue,
137-
s_Styles.kMobileCompressionQualityOptions);
137+
s_Styles.kMobileCompressionQualityOptions);
138138
EditorGUI.showMixedValue = false;
139139
changed = EditorGUI.EndChangeCheck();
140140
return defaultValue;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public override void OnInspectorGUI()
291291
HandlePackableListUI();
292292

293293
bool spriteAtlasPackignEnabled = (EditorSettings.spritePackerMode == SpritePackerMode.BuildTimeOnlyAtlas
294-
|| EditorSettings.spritePackerMode == SpritePackerMode.AlwaysOnAtlas);
294+
|| EditorSettings.spritePackerMode == SpritePackerMode.AlwaysOnAtlas);
295295
if (spriteAtlasPackignEnabled)
296296
{
297297
if (GUILayout.Button(s_Styles.packButton, GUILayout.ExpandWidth(false)))

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public RequireSpriteDataProviderAttribute(params Type[] types)
5555
internal bool ContainsAllType(ISpriteEditorDataProvider provider)
5656
{
5757
return provider == null ? false : m_Types.Where(x =>
58-
{
59-
return provider.HasDataProvider(x);
60-
}).Count() == m_Types.Length;
58+
{
59+
return provider.HasDataProvider(x);
60+
}).Count() == m_Types.Length;
6161
}
6262
}
6363
}

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

Lines changed: 111 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -109,174 +109,174 @@ private void AddMainUI(VisualElement mainView)
109109
m_NameElement = m_SelectedFrameInspector.Q("name");
110110
m_NameField = m_SelectedFrameInspector.Q<PropertyControl<string>>("spriteName");
111111
m_NameField.OnValueChanged((evt) =>
112+
{
113+
if (hasSelected)
112114
{
113-
if (hasSelected)
114-
{
115-
selectedSpriteName = evt.newValue;
116-
}
117-
});
115+
selectedSpriteName = evt.newValue;
116+
}
117+
});
118118

119119
m_PositionElement = m_SelectedFrameInspector.Q("position");
120120
m_PositionFieldX = m_PositionElement.Q<PropertyControl<long>>("positionX");
121121
m_PositionFieldX.OnValueChanged((evt) =>
122+
{
123+
if (hasSelected)
122124
{
123-
if (hasSelected)
124-
{
125-
var rect = selectedSpriteRect;
126-
rect.x = evt.newValue;
127-
selectedSpriteRect = rect;
128-
m_PositionFieldX.SetValueWithoutNotify((long)selectedSpriteRect.x);
129-
}
130-
});
125+
var rect = selectedSpriteRect;
126+
rect.x = evt.newValue;
127+
selectedSpriteRect = rect;
128+
m_PositionFieldX.SetValueWithoutNotify((long)selectedSpriteRect.x);
129+
}
130+
});
131131

132132
m_PositionFieldY = m_PositionElement.Q<PropertyControl<long>>("positionY");
133133
m_PositionFieldY.OnValueChanged((evt) =>
134+
{
135+
if (hasSelected)
134136
{
135-
if (hasSelected)
136-
{
137-
var rect = selectedSpriteRect;
138-
rect.y = evt.newValue;
139-
selectedSpriteRect = rect;
140-
m_PositionFieldY.SetValueWithoutNotify((long)selectedSpriteRect.y);
141-
}
142-
});
137+
var rect = selectedSpriteRect;
138+
rect.y = evt.newValue;
139+
selectedSpriteRect = rect;
140+
m_PositionFieldY.SetValueWithoutNotify((long)selectedSpriteRect.y);
141+
}
142+
});
143143

144144
m_PositionFieldW = m_PositionElement.Q<PropertyControl<long>>("positionW");
145145
m_PositionFieldW.OnValueChanged((evt) =>
146+
{
147+
if (hasSelected)
146148
{
147-
if (hasSelected)
148-
{
149-
var rect = selectedSpriteRect;
150-
rect.width = evt.newValue;
151-
selectedSpriteRect = rect;
152-
m_PositionFieldW.SetValueWithoutNotify((long)selectedSpriteRect.width);
153-
}
154-
});
149+
var rect = selectedSpriteRect;
150+
rect.width = evt.newValue;
151+
selectedSpriteRect = rect;
152+
m_PositionFieldW.SetValueWithoutNotify((long)selectedSpriteRect.width);
153+
}
154+
});
155155

156156
m_PositionFieldH = m_PositionElement.Q<PropertyControl<long>>("positionH");
157157
m_PositionFieldH.OnValueChanged((evt) =>
158+
{
159+
if (hasSelected)
158160
{
159-
if (hasSelected)
160-
{
161-
var rect = selectedSpriteRect;
162-
rect.height = evt.newValue;
163-
selectedSpriteRect = rect;
164-
m_PositionFieldH.SetValueWithoutNotify((long)selectedSpriteRect.height);
165-
}
166-
});
161+
var rect = selectedSpriteRect;
162+
rect.height = evt.newValue;
163+
selectedSpriteRect = rect;
164+
m_PositionFieldH.SetValueWithoutNotify((long)selectedSpriteRect.height);
165+
}
166+
});
167167

168168
var borderElement = m_SelectedFrameInspector.Q("border");
169169
m_BorderFieldL = borderElement.Q<PropertyControl<long>>("borderL");
170170
m_BorderFieldL.OnValueChanged((evt) =>
171+
{
172+
if (hasSelected)
171173
{
172-
if (hasSelected)
173-
{
174-
var border = selectedSpriteBorder;
175-
border.x = evt.newValue;
176-
selectedSpriteBorder = border;
177-
m_BorderFieldL.SetValueWithoutNotify((long)selectedSpriteBorder.x);
178-
}
179-
});
174+
var border = selectedSpriteBorder;
175+
border.x = evt.newValue;
176+
selectedSpriteBorder = border;
177+
m_BorderFieldL.SetValueWithoutNotify((long)selectedSpriteBorder.x);
178+
}
179+
});
180180

181181
m_BorderFieldT = borderElement.Q<PropertyControl<long>>("borderT");
182182
m_BorderFieldT.OnValueChanged((evt) =>
183+
{
184+
if (hasSelected)
183185
{
184-
if (hasSelected)
185-
{
186-
var border = selectedSpriteBorder;
187-
border.y = evt.newValue;
188-
selectedSpriteBorder = border;
189-
m_BorderFieldT.SetValueWithoutNotify((long)selectedSpriteBorder.y);
190-
}
191-
});
186+
var border = selectedSpriteBorder;
187+
border.y = evt.newValue;
188+
selectedSpriteBorder = border;
189+
m_BorderFieldT.SetValueWithoutNotify((long)selectedSpriteBorder.y);
190+
}
191+
});
192192

193193
m_BorderFieldR = borderElement.Q<PropertyControl<long>>("borderR");
194194
m_BorderFieldR.OnValueChanged((evt) =>
195+
{
196+
if (hasSelected)
195197
{
196-
if (hasSelected)
197-
{
198-
var border = selectedSpriteBorder;
199-
border.z = evt.newValue;
200-
selectedSpriteBorder = border;
201-
m_BorderFieldR.SetValueWithoutNotify((long)selectedSpriteBorder.z);
202-
}
203-
});
198+
var border = selectedSpriteBorder;
199+
border.z = evt.newValue;
200+
selectedSpriteBorder = border;
201+
m_BorderFieldR.SetValueWithoutNotify((long)selectedSpriteBorder.z);
202+
}
203+
});
204204

205205
m_BorderFieldB = borderElement.Q<PropertyControl<long>>("borderB");
206206
m_BorderFieldB.OnValueChanged((evt) =>
207+
{
208+
if (hasSelected)
207209
{
208-
if (hasSelected)
209-
{
210-
var border = selectedSpriteBorder;
211-
border.w = evt.newValue;
212-
selectedSpriteBorder = border;
213-
m_BorderFieldB.SetValueWithoutNotify((long)selectedSpriteBorder.w);
214-
}
215-
});
210+
var border = selectedSpriteBorder;
211+
border.w = evt.newValue;
212+
selectedSpriteBorder = border;
213+
m_BorderFieldB.SetValueWithoutNotify((long)selectedSpriteBorder.w);
214+
}
215+
});
216216

217217
m_PivotField = m_SelectedFrameInspector.Q<EnumField>("pivotField");
218218
m_PivotField.Init(SpriteAlignment.Center);
219219
m_PivotField.OnValueChanged((evt) =>
220+
{
221+
if (hasSelected)
220222
{
221-
if (hasSelected)
222-
{
223-
SpriteAlignment alignment = (SpriteAlignment)evt.newValue;
224-
SetSpritePivotAndAlignment(selectedSpritePivot, alignment);
225-
m_CustomPivotElement.SetEnabled(selectedSpriteAlignment == SpriteAlignment.Custom);
226-
Vector2 pivot = selectedSpritePivotInCurUnitMode;
227-
m_CustomPivotFieldX.SetValueWithoutNotify(pivot.x);
228-
m_CustomPivotFieldY.SetValueWithoutNotify(pivot.y);
229-
}
230-
});
223+
SpriteAlignment alignment = (SpriteAlignment)evt.newValue;
224+
SetSpritePivotAndAlignment(selectedSpritePivot, alignment);
225+
m_CustomPivotElement.SetEnabled(selectedSpriteAlignment == SpriteAlignment.Custom);
226+
Vector2 pivot = selectedSpritePivotInCurUnitMode;
227+
m_CustomPivotFieldX.SetValueWithoutNotify(pivot.x);
228+
m_CustomPivotFieldY.SetValueWithoutNotify(pivot.y);
229+
}
230+
});
231231

232232

233233
m_PivotUnitModeField = m_SelectedFrameInspector.Q<EnumField>("pivotUnitModeField");
234234
m_PivotUnitModeField.Init(PivotUnitMode.Normalized);
235235
m_PivotUnitModeField.OnValueChanged((evt) =>
236+
{
237+
if (hasSelected)
236238
{
237-
if (hasSelected)
238-
{
239-
m_PivotUnitMode = (PivotUnitMode)evt.newValue;
239+
m_PivotUnitMode = (PivotUnitMode)evt.newValue;
240240

241-
Vector2 pivot = selectedSpritePivotInCurUnitMode;
242-
m_CustomPivotFieldX.SetValueWithoutNotify(pivot.x);
243-
m_CustomPivotFieldY.SetValueWithoutNotify(pivot.y);
244-
}
245-
});
241+
Vector2 pivot = selectedSpritePivotInCurUnitMode;
242+
m_CustomPivotFieldX.SetValueWithoutNotify(pivot.x);
243+
m_CustomPivotFieldY.SetValueWithoutNotify(pivot.y);
244+
}
245+
});
246246

247247

248248
m_CustomPivotElement = m_SelectedFrameInspector.Q("customPivot");
249249
m_CustomPivotFieldX = m_CustomPivotElement.Q<PropertyControl<double>>("customPivotX");
250250
m_CustomPivotFieldX.OnValueChanged((evt) =>
251+
{
252+
if (hasSelected)
251253
{
252-
if (hasSelected)
253-
{
254-
float newValue = (float)evt.newValue;
255-
float pivotX = m_PivotUnitMode == PivotUnitMode.Pixels
256-
? ConvertFromRectToNormalizedSpace(new Vector2(newValue, 0.0f), selectedSpriteRect).x
257-
: newValue;
258-
259-
var pivot = selectedSpritePivot;
260-
pivot.x = pivotX;
261-
SetSpritePivotAndAlignment(pivot, selectedSpriteAlignment);
262-
}
263-
});
254+
float newValue = (float)evt.newValue;
255+
float pivotX = m_PivotUnitMode == PivotUnitMode.Pixels
256+
? ConvertFromRectToNormalizedSpace(new Vector2(newValue, 0.0f), selectedSpriteRect).x
257+
: newValue;
258+
259+
var pivot = selectedSpritePivot;
260+
pivot.x = pivotX;
261+
SetSpritePivotAndAlignment(pivot, selectedSpriteAlignment);
262+
}
263+
});
264264

265265
m_CustomPivotFieldY = m_CustomPivotElement.Q<PropertyControl<double>>("customPivotY");
266266
m_CustomPivotFieldY.OnValueChanged((evt) =>
267+
{
268+
if (hasSelected)
267269
{
268-
if (hasSelected)
269-
{
270-
float newValue = (float)evt.newValue;
271-
float pivotY = m_PivotUnitMode == PivotUnitMode.Pixels
272-
? ConvertFromRectToNormalizedSpace(new Vector2(0.0f, newValue), selectedSpriteRect).y
273-
: newValue;
274-
275-
var pivot = selectedSpritePivot;
276-
pivot.y = pivotY;
277-
SetSpritePivotAndAlignment(pivot, selectedSpriteAlignment);
278-
}
279-
});
270+
float newValue = (float)evt.newValue;
271+
float pivotY = m_PivotUnitMode == PivotUnitMode.Pixels
272+
? ConvertFromRectToNormalizedSpace(new Vector2(0.0f, newValue), selectedSpriteRect).y
273+
: newValue;
274+
275+
var pivot = selectedSpritePivot;
276+
pivot.y = pivotY;
277+
SetSpritePivotAndAlignment(pivot, selectedSpriteAlignment);
278+
}
279+
});
280280

281281
//// Force an update of all the fields.
282282
PopulateSpriteFrameInspectorField();

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,27 @@ public override void DoToolbarGUI(Rect toolbarRect)
6363

6464
drawArea.width = skin.CalcSize(SpriteFrameModuleStyles.sliceButtonLabel).x;
6565
SpriteUtilityWindow.DrawToolBarWidget(ref drawArea, ref toolbarRect, (adjustedDrawArea) =>
66+
{
67+
if (GUI.Button(adjustedDrawArea, SpriteFrameModuleStyles.sliceButtonLabel, skin))
6668
{
67-
if (GUI.Button(adjustedDrawArea, SpriteFrameModuleStyles.sliceButtonLabel, skin))
68-
{
69-
if (SpriteEditorMenu.ShowAtPosition(adjustedDrawArea, this, m_TextureDataProvider))
70-
GUIUtility.ExitGUI();
71-
}
72-
});
69+
if (SpriteEditorMenu.ShowAtPosition(adjustedDrawArea, this, m_TextureDataProvider))
70+
GUIUtility.ExitGUI();
71+
}
72+
});
7373

7474
using (new EditorGUI.DisabledScope(!hasSelected))
7575
{
7676
drawArea.x += drawArea.width;
7777
drawArea.width = skin.CalcSize(SpriteFrameModuleStyles.trimButtonLabel).x;
7878
SpriteUtilityWindow.DrawToolBarWidget(ref drawArea, ref toolbarRect, (adjustedDrawArea) =>
79+
{
80+
if (GUI.Button(adjustedDrawArea, SpriteFrameModuleStyles.trimButtonLabel, EditorStyles.toolbarButton) ||
81+
(string.IsNullOrEmpty(GUI.GetNameOfFocusedControl()) && k_SpriteEditorTrim.activated))
7982
{
80-
if (GUI.Button(adjustedDrawArea, SpriteFrameModuleStyles.trimButtonLabel, EditorStyles.toolbarButton) ||
81-
(string.IsNullOrEmpty(GUI.GetNameOfFocusedControl()) && k_SpriteEditorTrim.activated))
82-
{
83-
TrimAlpha();
84-
Repaint();
85-
}
86-
});
83+
TrimAlpha();
84+
Repaint();
85+
}
86+
});
8787
}
8888
}
8989
}

0 commit comments

Comments
 (0)