Skip to content

Commit dba3f74

Browse files
author
Unity Technologies
committed
Unity 2018.2.0a2 C# reference source code
1 parent 02f8e8c commit dba3f74

105 files changed

Lines changed: 5349 additions & 4598 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/Animation/AnimationWindow/AnimationWindow.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,17 @@ public void OnDestroy()
8585

8686
public void Update()
8787
{
88+
if (m_AnimEditor == null)
89+
return;
90+
8891
m_AnimEditor.Update();
8992
}
9093

9194
public void OnGUI()
9295
{
96+
if (m_AnimEditor == null)
97+
return;
98+
9399
Profiler.BeginSample("AnimationWindow.OnGUI");
94100
titleContent = m_AnimEditor.state.recording ? m_RecordTitleContent : m_DefaultTitleContent;
95101
m_AnimEditor.OnAnimEditorGUI(this, position);

‎Editor/Mono/AssembleEditorSkin.cs‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
// ADD_NEW_PLATFORM_HERE
99
[assembly: InternalsVisibleTo("UnityEditor.Advertisements")]
10-
[assembly: InternalsVisibleTo("UnityEditor.UIAutomation")]
1110
[assembly: InternalsVisibleTo("Unity.Burst")]
1211
[assembly: InternalsVisibleTo("Unity.PackageManager")]
1312
[assembly: InternalsVisibleTo("Unity.PackageManagerStandalone")]
@@ -84,6 +83,6 @@
8483
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.003")]
8584
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.004")]
8685
[assembly: InternalsVisibleTo("Unity.InternalAPIEditorBridgeDev.005")]
87-
86+
[assembly: InternalsVisibleTo("com.unity.editor.resources-testable")]
8887

8988
[assembly: AssemblyIsEditorAssembly]

‎Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,15 @@ protected virtual void CopyVariationFolderIntoStagingArea(BuildPostProcessArgs a
296296
var playerFolder = args.playerPackage + "/Variations/" + GetVariationName(args);
297297
FileUtil.CopyDirectoryFiltered(playerFolder, args.stagingArea, true, f => CopyPlayerFilter(f, args), recursive: true);
298298

299+
RecordCommonFiles(args, playerFolder, args.stagingAreaData);
300+
}
301+
302+
protected static void RecordCommonFiles(BuildPostProcessArgs args, string variationSourceFolder, string monoFolderRoot)
303+
{
299304
// Mark all the managed DLLs in Data/Managed as engine API assemblies
300305
// Data/Managed may already contain managed DLLs in the UnityEngine.*.dll naming scheme from the extensions
301306
// So we find the files in the source Variations directory and mark the corresponding files in the output
302-
foreach (var file in Directory.GetFiles(Path.Combine(playerFolder, "Data/Managed"), "*.dll"))
307+
foreach (var file in Directory.GetFiles(Path.Combine(variationSourceFolder, "Data/Managed"), "*.dll"))
303308
{
304309
var filename = Path.GetFileName(file);
305310
if (!filename.StartsWith("UnityEngine"))
@@ -310,13 +315,16 @@ protected virtual void CopyVariationFolderIntoStagingArea(BuildPostProcessArgs a
310315
}
311316

312317
// Mark the default resources file
313-
args.report.RecordFileAdded(Path.Combine(args.stagingArea, "Data/Resources/unity default resources"), CommonRoles.builtInResources);
318+
args.report.RecordFileAdded(Path.Combine(args.stagingArea, "Data/Resources/unity default resources"),
319+
CommonRoles.builtInResources);
314320

315321
// Mark up each mono runtime
316-
foreach (var monoName in new[] { "Mono", "MonoBleedingEdge" })
322+
foreach (var monoName in new[] {"Mono", "MonoBleedingEdge"})
317323
{
318-
args.report.RecordFilesAddedRecursive(Path.Combine(args.stagingArea, "Data/" + monoName + "/EmbedRuntime"), CommonRoles.monoRuntime);
319-
args.report.RecordFilesAddedRecursive(Path.Combine(args.stagingArea, "Data/" + monoName + "/etc"), CommonRoles.monoConfig);
324+
args.report.RecordFilesAddedRecursive(Path.Combine(monoFolderRoot, monoName + "/EmbedRuntime"),
325+
CommonRoles.monoRuntime);
326+
args.report.RecordFilesAddedRecursive(Path.Combine(monoFolderRoot, monoName + "/etc"),
327+
CommonRoles.monoConfig);
320328
}
321329
}
322330

‎Editor/Mono/Collab/CollabAnalytics.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Unity C# reference source
2+
// Copyright (c) Unity Technologies. For terms of use, see
3+
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
4+
5+
using System;
6+
using System.IO;
7+
using System.Collections.Generic;
8+
using System.Linq;
9+
using UnityEngine;
10+
using UnityEngine.Scripting;
11+
using UnityEditor;
12+
using UnityEditorInternal;
13+
14+
namespace UnityEditor.Collaboration
15+
{
16+
internal static class CollabAnalytics
17+
{
18+
[Serializable]
19+
private struct CollabUserActionAnalyticsEvent
20+
{
21+
public string category;
22+
public string action;
23+
}
24+
25+
public static void SendUserAction(string category, string action)
26+
{
27+
EditorAnalytics.SendCollabUserAction(new CollabUserActionAnalyticsEvent() { category = category, action = action });
28+
}
29+
30+
public static string historyCategoryString = "History";
31+
};
32+
}

‎Editor/Mono/Collab/Views/CollabHistoryDropDown.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ void ToggleDropdown()
4444
{
4545
if (Contains(m_FilesContainer))
4646
{
47+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "CollapseAssets");
4748
Remove(m_FilesContainer);
4849
m_ToggleLabel.text = ToggleText(false);
4950
}
5051
else
5152
{
53+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "ExpandAssets");
5254
Add(m_FilesContainer);
5355
m_ToggleLabel.text = ToggleText(true);
5456
}
@@ -67,6 +69,7 @@ private void ShowAllClick()
6769
var org = UnityConnect.instance.GetOrganizationId();
6870
var proj = UnityConnect.instance.GetProjectGUID();
6971
var url = string.Format("{0}/collab/orgs/{1}/projects/{2}/commits?commit={3}", host, org, proj, m_RevisionId);
72+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "ShowAllOnDashboard");
7073
Application.OpenURL(url);
7174
}
7275
}

‎Editor/Mono/Collab/Views/CollabHistoryItem.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public void SetInProgressStatus(string revisionIdInProgress)
143143

144144
void ShowBuildForCommit()
145145
{
146+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "ShowBuild");
146147
if (s_OnShowBuild != null)
147148
{
148149
s_OnShowBuild(m_RevisionId);
@@ -151,6 +152,7 @@ void ShowBuildForCommit()
151152

152153
void ShowServicePage()
153154
{
155+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "ShowServices");
154156
if (s_OnShowServices != null)
155157
{
156158
s_OnShowServices();
@@ -159,6 +161,7 @@ void ShowServicePage()
159161

160162
void Restore()
161163
{
164+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "Restore");
162165
if (s_OnRestore != null)
163166
{
164167
s_OnRestore(m_RevisionId, false);
@@ -167,6 +170,7 @@ void Restore()
167170

168171
void GoBackTo()
169172
{
173+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "GoBackTo");
170174
if (s_OnGoBack != null)
171175
{
172176
s_OnGoBack(m_RevisionId, false);
@@ -175,6 +179,7 @@ void GoBackTo()
175179

176180
void UpdateTo()
177181
{
182+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "Update");
178183
if (s_OnUpdate != null)
179184
{
180185
s_OnUpdate(m_RevisionId, true);
@@ -206,12 +211,14 @@ void ToggleDescription()
206211
{
207212
if (m_Expanded)
208213
{
214+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "CollapseDescription");
209215
m_Expanded = false;
210216
m_ExpandCollapseButton.text = "Show More";
211217
m_Description.text = GetTruncatedDescription(m_FullDescription);
212218
}
213219
else
214220
{
221+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "ExpandDescription");
215222
m_Expanded = true;
216223
m_ExpandCollapseButton.text = "Show Less";
217224
m_Description.text = m_FullDescription;

‎Editor/Mono/Collab/Views/PagedListView.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ private void OnPageDownClicked()
6060
if (m_CurPage <= 0)
6161
return;
6262

63+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "NewerPage");
64+
6365
m_CurPage--;
6466

6567
if (OnPageChange != null)
@@ -73,6 +75,8 @@ private void OnPageUpClicked()
7375
if (m_CurPage >= m_TotalPages)
7476
return;
7577

78+
CollabAnalytics.SendUserAction(CollabAnalytics.historyCategoryString, "OlderPage");
79+
7680
m_CurPage++;
7781

7882
if (OnPageChange != null)

0 commit comments

Comments
 (0)